cloud-web-corejs 1.0.276 → 1.0.277

package/src/components/xform/form-designer/form-widget/field-widget/date-widget.vue

@@ -9,8 +9,8 @@
                     :clearable="field.options.clearable" :editable="field.options.editable"
                     :format="field.options.format" :value-format="field.options.valueFormat"
                     :placeholder="getI18nLabel(field.options.placeholder || '选择日期')"
-                    @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
-                    @change="handleChangeEvent"
+                    @focus="handleDateFocusEvent" @blur="handleBlurCustomEvent"
+                    @change="handleDateChangeEvent"
                     :picker-options="pickerOptions"
     >
     </el-date-picker>
@@ -26,11 +26,13 @@ import emitter from '../../../../../components/xform/utils/emitter'
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
 import dateLimitMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/date-limit-mixin";
+import utcTransformMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/utc-transform-mixin";
+import relativeDefaultMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/relative-default-mixin";
 
 export default {
   name: "date-widget",
   componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-  mixins: [emitter, fieldMixin, i18n, dateLimitMixin],
+  mixins: [emitter, fieldMixin, i18n, dateLimitMixin, utcTransformMixin, relativeDefaultMixin],
   props: {
     field: Object,
     parentWidget: Object,
@@ -71,7 +73,27 @@ export default {
   },
   computed: {
     contentForReadMode() {
-      return this.fieldModel ? this.fieldModel : ''
+      if (!this.fieldModel) {
+        return '';
+      }
+      return this.fieldModel;
+    },
+  },
+  watch: {
+    "field.options.limitStartField"() {
+      this.initDateLimitPickerOptions();
+    },
+    "field.options.limitEndField"() {
+      this.initDateLimitPickerOptions();
+    },
+    "field.options.minDate"() {
+      this.initDateLimitPickerOptions();
+    },
+    "field.options.maxDate"() {
+      this.initDateLimitPickerOptions();
+    },
+    "field.options.minDateType"() {
+      this.initDateLimitPickerOptions();
     },
   },
   beforeCreate() {
@@ -81,28 +103,18 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.initFieldModel()
+    this.initRelativeFieldModel()
     this.registerToRefList()
     this.initEventHandler()
     this.buildFieldRules()
 
     this.handleOnCreated()
-
-    if(['year','month','date'].includes(this.field.options.type)){
-      this.pickerOptions.shortcuts = [{
-        text: this.$t1('此刻'),
-        onClick(picker) {
-          picker.$emit('pick', new Date());
-        }
-      }]
-    }
-
-    //须在 handleOnCreated 之后：脚本里设的 field.options.minDate 不是响应式的，靠此处顺序读取
     this.initDateLimitPickerOptions()
   },
 
   mounted() {
     this.handleOnMounted()
+    this.initDateLimitWatch()
   },
 
   beforeDestroy() {
@@ -110,11 +122,23 @@ export default {
   },
 
   methods: {
+    handleDateFocusEvent(event) {
+      /* 最小日期为「当前时间」时，每次展开面板都需按当前时刻重新计算 */
+      if (this.isNowDateValueType(this.field.options.minDateType)) {
+        this.initDateLimitPickerOptions();
+      }
+      this.handleFocusCustomEvent(event);
+    },
+    handleDateChangeEvent(value) {
+      if (this.isDateLimitViolated(value)) {
+        this.$message.warning(this.getDateLimitViolationMessage());
+        this.fieldModel = this.oldFieldValue;
+        return;
+      }
+      this.handleChangeEvent(value);
+    },
     setNow() {
       this.$refs.fieldEditor.panel.changeToNow()
-      /*this.selectedDate = new Date();
-      // 可选：点击后自动关闭弹窗
-      this.$refs.datePicker.pickerVisible = false;*/
     }
   }
 }