cloud-web-corejs 1.0.276 → 1.0.277

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

@@ -154,15 +154,10 @@ export default {
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam);
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam,
-            id: dataId,
-          },
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam,
+          id: dataId,
+        }),
         callback: (res) => {
           let rows = res.objx || [];
           this.setValue(rows);

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

@@ -74,6 +74,9 @@ export default {
       if (this.designState) return true;
       const formRef = this.getFormRef();
       if (!formRef?.formConfig?.wfEnabled) return false;
+      // 配置优先：表单设置里已启用「保存并提交流程」内建按钮时，本遗留组件让位，
+      // 否则同一模板会出现两个按钮。组件本身保留，只为老模板兼容。
+      if (formRef.formConfig.saveSubmitEnabled === true) return false;
       if (this.isWfStarted(formRef)) return false;
       return !this.field.options.hidden;
     },

package/src/components/xform/form-designer/form-widget/field-widget/select-export-item-button-widget.vue

@@ -1,120 +1,120 @@
-<template>
-  <static-content-wrapper
-    :designer="designer"
-    :field="field"
-    :design-state="designState"
-    :display-style="field.options.displayStyle"
-    :parent-widget="parentWidget"
-    :parent-list="parentList"
-    :index-of-parent-list="indexOfParentList"
-  >
-    <el-dropdown
-      v-if="field.options.exportItemConditionEnabled"
-      trigger="hover"
-      :disabled="field.options.disabled"
-    >
-      <el-button :type="field.options.type" class="button-sty" size="mini">
-        <span>{{ getI18nLabel(field.options.label) }}</span
-        ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
-      </el-button>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item icon="el-icon-upload2" @click.native="toConditionExport">
-          {{ getI18nLabel("条件导出") }}
-        </el-dropdown-item>
-        <el-dropdown-item icon="el-icon-upload2" @click.native="toSelectedExport">
-          {{ getI18nLabel("选择导出") }}
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <el-button
-      v-else
-      :type="field.options.type"
-      class="button-sty"
-      size="mini"
-      icon="el-icon-upload2"
-      @click="toSelectedExport"
-      :disabled="field.options.disabled"
-      >{{ getI18nLabel(field.options.label) }}
-    </el-button>
-  </static-content-wrapper>
-</template>
-<script>
-import emitter from "../../../utils/emitter";
-import i18n from "../../../utils/i18n";
-import fieldMixin from "./fieldMixin";
-import StaticContentWrapper from "./static-content-wrapper.vue";
-import { EXPORT_TYPE } from "../../../../excelExport/exportType";
-
-export default {
-  name: "select-export-item-button-widget",
-  components: { StaticContentWrapper },
-  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-  mixins: [emitter, fieldMixin, i18n],
-  props: {
-    field: Object,
-    parentWidget: Object,
-    parentList: Array,
-    indexOfParentList: Number,
-    designer: Object,
-    designState: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {};
-  },
-  beforeCreate() {
-    /* 这里不能访问方法和属性！！ */
-  },
-
-  created() {
-    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
-       需要在父组件created中初始化！！ */
-    this.registerToRefList();
-    this.initEventHandler();
-
-    this.handleOnCreated();
-  },
-
-  mounted() {
-    this.handleOnMounted();
-  },
-
-  beforeDestroy() {
-    this.unregisterFromRefList();
-  },
-
-  methods: {
-    /** 明细·条件导出：按当前搜索条件导出，无需勾选。仅在开启「支持条件导出」时可达。 */
-    toConditionExport() {
-      this.toDo(EXPORT_TYPE.ITEM_CONDITION);
-    },
-    /** 明细·选择导出：以勾选行为范围，历史默认行为。 */
-    toSelectedExport() {
-      this.toDo(EXPORT_TYPE.ITEM_SELECTED);
-    },
-    toDo(type = null) {
-      if (this.designState) {
-        return;
-      }
-      let opt = {
-        title: this.field.options.exportFileName || null,
-        targetRef: this.field.options.tableRef || null,
-        pageSize: this.field.options.exportPageSize || null,
-        showImageAtTable: this.field.options.showImageAtTable || null,
-      };
-      let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
-      let options = { ...opt, ...tableExportParam, type: type };
-      let tableRef = options?.targetRef;
-      delete options.targetRef;
-      let tableWidget = this.getWidgetRef(tableRef);
-      tableWidget.exportData(options);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-</style>
+<template>
+  <static-content-wrapper
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+  >
+    <el-dropdown
+      v-if="field.options.exportItemConditionEnabled"
+      trigger="hover"
+      :disabled="field.options.disabled"
+    >
+      <el-button :type="field.options.type" class="button-sty" size="mini">
+        <span>{{ getI18nLabel(field.options.label) }}</span
+        ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toConditionExport">
+          {{ getI18nLabel("条件导出") }}
+        </el-dropdown-item>
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toSelectedExport">
+          {{ getI18nLabel("选择导出") }}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-button
+      v-else
+      :type="field.options.type"
+      class="button-sty"
+      size="mini"
+      icon="el-icon-upload2"
+      @click="toSelectedExport"
+      :disabled="field.options.disabled"
+      >{{ getI18nLabel(field.options.label) }}
+    </el-button>
+  </static-content-wrapper>
+</template>
+<script>
+import emitter from "../../../utils/emitter";
+import i18n from "../../../utils/i18n";
+import fieldMixin from "./fieldMixin";
+import StaticContentWrapper from "./static-content-wrapper.vue";
+import { EXPORT_TYPE } from "../../../../excelExport/exportType";
+
+export default {
+  name: "select-export-item-button-widget",
+  components: { StaticContentWrapper },
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+    designState: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {};
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
+
+    this.handleOnCreated();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    /** 明细·条件导出：按当前搜索条件导出，无需勾选。仅在开启「支持条件导出」时可达。 */
+    toConditionExport() {
+      this.toDo(EXPORT_TYPE.ITEM_CONDITION);
+    },
+    /** 明细·选择导出：以勾选行为范围，历史默认行为。 */
+    toSelectedExport() {
+      this.toDo(EXPORT_TYPE.ITEM_SELECTED);
+    },
+    toDo(type = null) {
+      if (this.designState) {
+        return;
+      }
+      let opt = {
+        title: this.field.options.exportFileName || null,
+        targetRef: this.field.options.tableRef || null,
+        pageSize: this.field.options.exportPageSize || null,
+        showImageAtTable: this.field.options.showImageAtTable || null,
+      };
+      let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
+      let options = { ...opt, ...tableExportParam, type: type };
+      let tableRef = options?.targetRef;
+      delete options.targetRef;
+      let tableWidget = this.getWidgetRef(tableRef);
+      tableWidget.exportData(options);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+</style>

package/src/components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue

@@ -87,6 +87,10 @@ export default {
         result = result && !hasWf;
       }*/
       if(!this.designState){
+        // 表格行内嵌组件不走表单字段 dispermissions 校验
+        if (this.$parent?.tableParam) {
+          return result;
+        }
         let authCode = this.$parent.getAuthCode ? this.$parent.getAuthCode() : null
         if(authCode){
           let dispermissions = this.$store.getters.dispermissions;

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

@@ -149,6 +149,17 @@ export default {
       }
       return label;
     },
+    // 对比展示：按 statusParam 做 value→label（status 用 statusParam 而非 optionItems）
+    resolveDisplayValue(rawValue) {
+      if (rawValue === null || rawValue === undefined || rawValue === "") {
+        return rawValue;
+      }
+      let valueField = this.valueField;
+      let labelField = this.labelField;
+      let list = this.field.options.statusParam || [];
+      let item = list.find((it) => it[valueField] === rawValue);
+      return item ? this.getI18nLabel(item[labelField]) : rawValue;
+    },
   },
 };
 </script>

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

@@ -86,7 +86,15 @@
     },
 
     methods: {
-
+      // 对比展示：布尔值 → activeText/inactiveText
+      resolveDisplayValue(rawValue) {
+        if (rawValue === null || rawValue === undefined || rawValue === "") {
+          return rawValue;
+        }
+        return rawValue
+          ? this.field.options.activeText
+          : this.field.options.inactiveText;
+      },
     }
   }
 </script>

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

@@ -11,7 +11,7 @@
     :sub-form-col-index="subFormColIndex"
     :sub-form-row-id="subFormRowId"
   >
-    <span class="button-sty" v-if="designState">
+    <span class="button-sty nobg" v-if="designState">
       <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" plain
         >暂存</el-button
       >

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

@@ -11,7 +11,9 @@
     :sub-form-col-index="subFormColIndex"
     :sub-form-row-id="subFormRowId"
   >
-    <span class="text-area" :class="field.options.colorClass">{{ showVaule }}</span>
+    <span class="text-area" :class="field.options.colorClass">{{
+      showVaule
+    }}</span>
   </form-item-wrapper>
 </template>
 
@@ -20,12 +22,13 @@ import FormItemWrapper from "./form-item-wrapper";
 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 utcTransformMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/utc-transform-mixin";
 import * as formatUtil from "../../../../../components/xform/utils/format.js";
 
 export default {
   name: "text-widget",
   componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-  mixins: [emitter, fieldMixin, i18n],
+  mixins: [emitter, fieldMixin, i18n, utcTransformMixin],
   props: {
     field: Object,
     parentWidget: Object,
@@ -98,7 +101,8 @@ export default {
     formatterValue() {
       let formatType = this.field.options.formatType;
       let cellValue = this.fieldModel;
-      if (formatType === null || formatType === undefined) return cellValue;
+      if (formatType === null || formatType === undefined || formatType === "")
+        return cellValue;
       if (formatType)
         switch (formatType) {
           case "render":

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

@@ -20,11 +20,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 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: "time-range-widget",
     componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-    mixins: [emitter, fieldMixin, i18n],
+    mixins: [emitter, fieldMixin, i18n, utcTransformMixin, relativeDefaultMixin],
     props: {
       field: Object,
       parentWidget: Object,
@@ -72,7 +74,7 @@
     created() {
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
-      this.initFieldModel()
+      this.initRelativeFieldModel()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -8,8 +8,9 @@
                     :clearable="field.options.clearable" :editable="field.options.editable"
                     :format="field.options.format" value-format="HH:mm:ss"
                     :placeholder="getI18nLabel(field.options.placeholder || '选择时间')"
-                    @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
-                    @change="handleChangeEvent">
+                    :picker-options="pickerOptions"
+                    @focus="handleTimeFocusEvent" @blur="handleBlurCustomEvent"
+                    @change="handleTimeChangeEvent">
     </el-time-picker>
   </form-item-wrapper>
 </template>
@@ -19,11 +20,14 @@
   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 timeLimitMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/time-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: "time-widget",
     componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-    mixins: [emitter, fieldMixin, i18n],
+    mixins: [emitter, fieldMixin, i18n, timeLimitMixin, utcTransformMixin, relativeDefaultMixin],
     props: {
       field: Object,
       parentWidget: Object,
@@ -59,10 +63,19 @@
         oldFieldValue: null, //field组件change之前的值
         fieldModel: null,
         rules: [],
+        pickerOptions: {},
       }
     },
     computed: {
 
+    },
+    watch: {
+      "field.options.minTime"() {
+        this.initTimeLimitPickerOptions()
+      },
+      "field.options.minTimeType"() {
+        this.initTimeLimitPickerOptions()
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -71,12 +84,13 @@
     created() {
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
-      this.initFieldModel()
+      this.initRelativeFieldModel()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()
 
       this.handleOnCreated()
+      this.initTimeLimitPickerOptions()
     },
 
     mounted() {
@@ -88,7 +102,24 @@
     },
 
     methods: {
-
+      handleTimeFocusEvent(event) {
+        /* 最小时间为「当前时间」时，每次展开面板都需按当前时刻重新计算 */
+        if (this.isNowTimeValueType(this.field.options.minTimeType)) {
+          this.initTimeLimitPickerOptions()
+        }
+        this.handleFocusCustomEvent(event)
+      },
+      handleTimeChangeEvent(value) {
+        if (this.isTimeLimitViolated(value)) {
+          this.$message.warning(this.getTimeLimitViolationMessage())
+          this.fieldModel = this.oldFieldValue
+          return
+        }
+        this.handleChangeEvent(value)
+      },
+      setNow() {
+        this.setValue(this.getNowTimeValue())
+      },
     }
   }
 </script>