@panpanzhao/component-ui 1.25.818 → 1.25.822

package/lib/component-ui.common.js

@@ -5315,11 +5315,21 @@ var date_picker_default = /*#__PURE__*/__webpack_require__.n(date_picker_);
     endProp: String
   },
   watch: {
-    value: function value(val) {
-      if (["monthrange", "daterange", "datetimerange"].indexOf(this.$attrs.type) > -1 && this.startProp && this.endProp && this._form && !val) {
-        this._form.formModel[this.startProp] = null;
-        this._form.formModel[this.endProp] = null;
-      }
+    value: {
+      handler: function handler(val) {
+        if (["monthrange", "daterange", "datetimerange"].indexOf(this.$attrs.type) > -1 && this.startProp && this.endProp && this._form) {
+          if (!val) {
+            this._form.formModel[this.startProp] = null;
+            this._form.formModel[this.endProp] = null;
+            return false;
+          }
+          if ((val == null ? void 0 : val.length) === 2) {
+            this._form.formModel[this.startProp] = val[0];
+            this._form.formModel[this.endProp] = val[1];
+          }
+        }
+      },
+      immediate: true
     }
   },
   computed: {
@@ -7526,8 +7536,8 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       if (this.on && this.on[eventName]) {
         this.$emit.apply(this, [eventName, {
           trigger: this.form,
-          triggerConfig: this.form.formItemLayout[this.prop],
           triggerForm: this.form.formModel,
+          triggerConfig: this.form.formItemLayout[this.prop],
           triggerFormConfig: this.form.formItemLayout
         }].concat(arg));
       }
@@ -7547,6 +7557,7 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       itemEvent.exec && (_itemEvent$exec = itemEvent.exec).call.apply(_itemEvent$exec, [this, {
         trigger: this.form,
         triggerForm: this.form.formModel,
+        triggerFormConfig: this.form.formItemLayout,
         triggerConfig: this.form.formItemLayout[this.prop],
         targetConfig: targetConfig
       }].concat(arg));

package/lib/components/form-input.js

@@ -1820,11 +1820,21 @@ var date_picker_default = /*#__PURE__*/__webpack_require__.n(date_picker_);
     endProp: String
   },
   watch: {
-    value: function value(val) {
-      if (["monthrange", "daterange", "datetimerange"].indexOf(this.$attrs.type) > -1 && this.startProp && this.endProp && this._form && !val) {
-        this._form.formModel[this.startProp] = null;
-        this._form.formModel[this.endProp] = null;
-      }
+    value: {
+      handler: function handler(val) {
+        if (["monthrange", "daterange", "datetimerange"].indexOf(this.$attrs.type) > -1 && this.startProp && this.endProp && this._form) {
+          if (!val) {
+            this._form.formModel[this.startProp] = null;
+            this._form.formModel[this.endProp] = null;
+            return false;
+          }
+          if ((val == null ? void 0 : val.length) === 2) {
+            this._form.formModel[this.startProp] = val[0];
+            this._form.formModel[this.endProp] = val[1];
+          }
+        }
+      },
+      immediate: true
     }
   },
   computed: {

package/lib/components/form-item.js

@@ -268,8 +268,8 @@ var external_lodash_ = __webpack_require__(2);
       if (this.on && this.on[eventName]) {
         this.$emit.apply(this, [eventName, {
           trigger: this.form,
-          triggerConfig: this.form.formItemLayout[this.prop],
           triggerForm: this.form.formModel,
+          triggerConfig: this.form.formItemLayout[this.prop],
           triggerFormConfig: this.form.formItemLayout
         }].concat(arg));
       }
@@ -289,6 +289,7 @@ var external_lodash_ = __webpack_require__(2);
       itemEvent.exec && (_itemEvent$exec = itemEvent.exec).call.apply(_itemEvent$exec, [this, {
         trigger: this.form,
         triggerForm: this.form.formModel,
+        triggerFormConfig: this.form.formItemLayout,
         triggerConfig: this.form.formItemLayout[this.prop],
         targetConfig: targetConfig
       }].concat(arg));