cloud-web-corejs 1.0.276 → 1.0.278

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/select-export-item-button-editor.vue

@@ -1,74 +1,74 @@
-<template>
-  <div>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider export-divider">列表导出(明细)设置</el-divider>
-    </el-form-item>
-    <el-form-item label="导出文件名称">
-      <el-input v-model="optionModel.exportFileName"></el-input>
-    </el-form-item>
-    <el-form-item label="表格唯一名称">
-      <el-input v-model="optionModel.tableRef"></el-input>
-    </el-form-item>
-    <el-form-item label="支持条件导出">
-      <el-switch v-model="optionModel.exportItemConditionEnabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="导出列表显示图片">
-      <el-switch
-        v-model="optionModel.showImageAtTable"
-        @change="changeShowImageAtTable"
-      ></el-switch>
-    </el-form-item>
-    <el-form-item label="导出每页查询数量">
-      <base-input-number
-        v-model="optionModel.exportPageSize"
-        :max="optionModel.showImageAtTable ? 150 : 1000"
-      ></base-input-number>
-    </el-form-item>
-    <el-form-item label="导出参数" label-width="150px">
-      <a
-        href="javascript:void(0);"
-        class="a-link link-oneLind"
-        @click="editEventHandler('tableExportParam', eventParams)"
-      >
-        <span>{{ optionModel.tableExportParam }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-  </div>
-</template>
-
-<script>
-import i18n from "../../../../utils/i18n";
-import eventMixin from "../event-handler/eventMixin";
-
-export default {
-  name: "select-export-item-button-editor",
-  mixins: [i18n, eventMixin],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  data() {
-    return {
-      eventParams: [],
-    };
-  },
-  methods: {
-    changeShowImageAtTable(val) {
-      if (val) {
-        let exportPageSize = this.optionModel.exportPageSize || 0;
-        if (exportPageSize > 150) {
-          this.optionModel.exportPageSize = 150;
-        }
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-::v-deep.export-divider .el-divider__text.is-center {
-  width: 162px;
-}
-</style>
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider export-divider">列表导出(明细)设置</el-divider>
+    </el-form-item>
+    <el-form-item label="导出文件名称" class="form-item-label-top">
+      <el-input v-model="optionModel.exportFileName"></el-input>
+    </el-form-item>
+    <el-form-item label="表格唯一名称" class="form-item-label-top">
+      <el-input v-model="optionModel.tableRef"></el-input>
+    </el-form-item>
+    <el-form-item label="支持条件导出">
+      <el-switch v-model="optionModel.exportItemConditionEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item label="导出列表显示图片">
+      <el-switch
+        v-model="optionModel.showImageAtTable"
+        @change="changeShowImageAtTable"
+      ></el-switch>
+    </el-form-item>
+    <el-form-item label="导出每页查询数量" class="form-item-label-top">
+      <base-input-number
+        v-model="optionModel.exportPageSize"
+        :max="optionModel.showImageAtTable ? 150 : 1000"
+      ></base-input-number>
+    </el-form-item>
+    <el-form-item label="导出参数" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('tableExportParam', eventParams)"
+      >
+        <span>{{ optionModel.tableExportParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n";
+import eventMixin from "../event-handler/eventMixin";
+
+export default {
+  name: "select-export-item-button-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: [],
+    };
+  },
+  methods: {
+    changeShowImageAtTable(val) {
+      if (val) {
+        let exportPageSize = this.optionModel.exportPageSize || 0;
+        if (exportPageSize > 150) {
+          this.optionModel.exportPageSize = 150;
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+::v-deep.export-divider .el-divider__text.is-center {
+  width: 162px;
+}
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/table-export-button-editor.vue

@@ -3,16 +3,16 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider">列表导出设置</el-divider>
     </el-form-item>
-    <el-form-item label="导出文件名称">
+    <el-form-item label="导出文件名称" class="form-item-label-top">
       <el-input v-model="optionModel.exportFileName"></el-input>
     </el-form-item>
-    <el-form-item label="表格唯一名称">
+    <el-form-item label="表格唯一名称" class="form-item-label-top">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
     <el-form-item label="导出列表显示图片">
       <el-switch v-model="optionModel.showImageAtTable" @change="changeShowImageAtTable"></el-switch>
     </el-form-item>
-    <el-form-item label="导出每页查询数量">
+    <el-form-item label="导出每页查询数量" class="form-item-label-top">
       <base-input-number v-model="optionModel.exportPageSize"
                          :max="optionModel.showImageAtTable?150:1000"></base-input-number>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-defaultValue-editor.vue

@@ -1,26 +1,42 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.defaultValue')">
-    <el-time-picker v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
-                    :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
-    </el-time-picker>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="time"
+      @change="emitDefaultValueChange"
+    >
+      <el-time-picker
+        v-model="optionModel.defaultValue"
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        value-format="HH:mm:ss"
+        style="width: 100%"
+      >
+      </el-time-picker>
+    </relative-default-block>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
 
-  export default {
-    name: "time-defaultValue-editor",
-    mixins: [i18n, propertyMixin],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "time-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-format-editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.format')">
+  <el-form-item :label="i18nt('designer.setting.format')" class="form-item-label-top">
     <el-select v-model="optionModel.format" filterable allow-create>
       <el-option label="HH:mm:ss" value="HH:mm:ss"></el-option>
       <el-option label="HH时mm分ss秒" value="HH时mm分ss秒"></el-option>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-timeLimit-editor.vue

@@ -0,0 +1,53 @@
+<template>
+  <div>
+    <el-form-item label="最小时间" class="form-item-label-top">
+      <el-checkbox v-model="nowMinTime">当前时间</el-checkbox>
+      <el-time-picker v-if="!nowMinTime" v-model="minTime"
+                      :format="optionModel.format" value-format="HH:mm:ss"
+                      style="width: 100%"
+                      clearable placeholder="留空则不限制">
+      </el-time-picker>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "../../../../../../components/xform/utils/i18n"
+  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+
+  export default {
+    name: "time-timeLimit-editor",
+    mixins: [i18n, propertyMixin],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+    computed: {
+      /* 老表单的options可能没有这些属性，统一用$set赋值，保证响应式 */
+      nowMinTime: {
+        get() {
+          return this.optionModel.minTimeType === 'now'
+        },
+        set(checked) {
+          this.$set(this.optionModel, 'minTimeType', checked ? 'now' : '')
+          if (checked) {
+            this.$set(this.optionModel, 'minTime', null)
+          }
+        },
+      },
+      minTime: {
+        get() {
+          return this.optionModel.minTime || null
+        },
+        set(value) {
+          this.$set(this.optionModel, 'minTime', value || null)
+        },
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time-range/time-range-defaultValue-editor.vue

@@ -1,26 +1,43 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.defaultValue')">
-    <el-time-picker v-model="optionModel.defaultValue" is-range @change="emitDefaultValueChange"
-                    :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
-    </el-time-picker>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="time-range"
+      @change="emitDefaultValueChange"
+    >
+      <el-time-picker
+        v-model="optionModel.defaultValue"
+        is-range
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        value-format="HH:mm:ss"
+        style="width: 100%"
+      >
+      </el-time-picker>
+    </relative-default-block>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
 
-  export default {
-    name: "time-range-defaultValue-editor",
-    mixins: [i18n, propertyMixin],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "time-range-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time-range/time-range-format-editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.format')">
+  <el-form-item :label="i18nt('designer.setting.format')" class="form-item-label-top">
     <el-select v-model="optionModel.format" filterable allow-create>
       <el-option label="HH:mm:ss" value="HH:mm:ss"></el-option>
       <el-option label="HH时mm分ss秒" value="HH时mm分ss秒"></el-option>

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabSearch/vabSearchField-editor.vue

@@ -4,7 +4,7 @@
       <el-divider class="custom-divider-margin-top">弹框设置</el-divider>
     </el-form-item>
 
-    <el-form-item :label="i18nt('表单编码')">
+    <el-form-item :label="i18nt('表单编码')" class="form-item-label-top">
       <el-input
         class="search-input"
         max="200"
@@ -23,7 +23,7 @@
     <el-form-item :label="i18nt('表单名称')">
       {{ optionModel.formName }}
     </el-form-item>
-    <el-form-item :label="i18nt('单据展示key')">
+    <el-form-item :label="i18nt('单据展示key')" class="form-item-label-top">
       <el-input
         class="search-input"
         max="200"

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabSearch/vabSearchName-editor.vue

@@ -5,10 +5,10 @@
                  v-if="selectedWidget.type !== 'singerSearch' && selectedWidget.type !== 'multiSearch'"></el-switch>
       <span v-else>{{ optionModel.multipleChoices ? '是' : '否' }}</span>
     </el-form-item>
-    <el-form-item label="关联字段" v-if="optionModel.multipleChoices">
+    <el-form-item label="关联字段" v-if="optionModel.multipleChoices" class="form-item-label-top">
       <el-input type="text" v-model="optionModel.valueField"></el-input>
     </el-form-item>
-    <el-form-item label="展示字段">
+    <el-form-item label="展示字段" class="form-item-label-top">
       <el-input type="text" v-model="optionModel.vabSearchName"></el-input>
     </el-form-item>
     <template v-if="!optionModel.multipleChoices">

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload/field-vabUpload-editor.vue

@@ -18,7 +18,7 @@
     <el-form-item :label="i18nt('显示创建时间')">
       <el-switch v-model="optionModel.showFileCreateDate"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('缩略图大小')">
+    <el-form-item :label="i18nt('缩略图大小')" class="form-item-label-top">
       <el-select v-model="optionModel.fileShowImageSize">
         <el-option :value="1" label="1"></el-option>
         <el-option :value="2" label="2"></el-option>

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload2/field-vabUpload2-editor.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form-item label="上传信息获取脚本"></el-form-item>
-    <el-form-item label-width="0">
+    <el-form-item label-width="0" class="form-item-label-top">
       <el-input
         v-model="optionModel.vabupload2_scriptCode"
         placeholder="默认/intf/getHxFileUploadConfig"

package/src/components/xform/form-designer/setting-panel/property-editor/field-vue-page/vue-page-editor.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <el-form-item label="Vue页面路径">
+    <el-form-item label="Vue页面路径" class="form-item-label-top">
       <el-input
         v-model="optionModel.componentPath"
         placeholder="如 @base/views/user/form/view/list 或 /user/form/view/list"
       ></el-input>
     </el-form-item>
-    <el-form-item label="页面高度">
+    <el-form-item label="页面高度" class="form-item-label-top">
       <el-input
         v-model="optionModel.componentHeight"
         placeholder="如 500px，留空则自适应"

package/src/components/xform/form-designer/setting-panel/property-editor/fileMaxSize-editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.fileMaxSize')">
+  <el-form-item :label="i18nt('designer.setting.fileMaxSize')" class="form-item-label-top">
     <el-input-number v-model="optionModel.fileMaxSize" :min="1" class="hide-spin-button" style="width: 100%"></el-input-number>
   </el-form-item>
 </template>