Merge branch 'master' of github.com:JSON-Drived-Configurable-Platform/form-generator-iview

zhengxkq · zhengxkq · commit d12db94473c6 · 2020-06-02T17:40:10.000+08:00
diff --git a/src/fields/fieldTimeCycleSelect.vue b/src/fields/fieldTimeCycleSelect.vue
@@ -196,7 +196,7 @@ export default {
                     this.timeList[i] = '0';
                 }
             }
-            this.$emit('triggertime', this.timeList.join(''));
+            this.$emit('on-change', this.field.model, this.timeList.join(''), null, this.field);
             this.clearBubble(e);
         },
         setcurrent(item, index) {

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ export default {`
`196`	`196`	`this.timeList[i] = '0';`
`197`	`197`	`}`
`198`	`198`	`}`
`199`		`- this.$emit('triggertime', this.timeList.join(''));`
	`199`	`+ this.$emit('on-change', this.field.model, this.timeList.join(''), null, this.field);`
`200`	`200`	`this.clearBubble(e);`
`201`	`201`	`},`
`202`	`202`	`setcurrent(item, index) {`