cloud-web-corejs 1.0.276 → 1.0.277

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

@@ -1,87 +1,97 @@
 <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"
-                     :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-button ref="fieldEditor" :type="field.options.type" :size="field.options.size" class="button-sty"
-               :plain="field.options.plain" :round="field.options.round"
-               :circle="field.options.circle" :icon="field.options.icon"
-               :disabled="!designState &&field.options.disabled"
-               @click.native="handleButtonWidgetClick">
-      {{ getI18nLabel(field.options.label)}}</el-button>
+  <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"
+    :sub-form-row-index="subFormRowIndex"
+    :sub-form-col-index="subFormColIndex"
+    :sub-form-row-id="subFormRowId"
+  >
+    <el-button
+      ref="fieldEditor"
+      :type="field.options.type"
+      :size="field.options.size"
+      class="button-sty"
+      :plain="field.options.plain"
+      :round="field.options.round"
+      :circle="field.options.circle"
+      :icon="field.options.icon"
+      :disabled="!designState && field.options.disabled"
+      @click.native="handleButtonWidgetClick"
+    >
+      {{ getI18nLabel(field.options.label) }}</el-button
+    >
   </static-content-wrapper>
 </template>
 
 <script>
-  import StaticContentWrapper from './static-content-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 StaticContentWrapper from "./static-content-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";
 
-  export default {
-    name: "button-widget",
-    componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-    mixins: [emitter, fieldMixin, i18n],
-    props: {
-      field: Object,
-      parentWidget: Object,
-      parentList: Array,
-      indexOfParentList: Number,
-      designer: Object,
+export default {
+  name: "button-widget",
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
 
-      designState: {
-        type: Boolean,
-        default: false
-      },
-
-      subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-        type: Number,
-        default: -1
-      },
-      subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-        type: Number,
-        default: -1
-      },
-      subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-        type: String,
-        default: ''
-      },
-
-    },
-    components: {
-      StaticContentWrapper,
+    designState: {
+      type: Boolean,
+      default: false,
     },
-    computed: {
 
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    beforeCreate() {
-      /* 这里不能访问方法和属性！！ */
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-
-    created() {
-      /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
-         需要在父组件created中初始化！！ */
-      this.registerToRefList()
-      this.initEventHandler()
-
-      this.handleOnCreated()
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
+  },
+  components: {
+    StaticContentWrapper,
+  },
+  computed: {},
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
 
-    mounted() {
-      this.handleOnMounted()
-    },
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+         需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
 
-    beforeDestroy() {
-      this.unregisterFromRefList()
-    },
+    this.handleOnCreated();
+  },
 
-    methods: {
+  mounted() {
+    this.handleOnMounted();
+  },
 
-    }
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
 
-  }
+  methods: {},
+};
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

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

@@ -1,151 +1,235 @@
 <template>
-  <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
-                     :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
-                     :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-cascader ref="fieldEditor" :options="field.options.optionItems"
-                  v-model="fieldModel" class="full-width-input"
-                  v-show="!isReadMode"
-                 :disabled="field.options.disabled"
-                 :size="field.options.size"
-                 :clearable="field.options.clearable"
-                 :filterable="field.options.filterable"
-                 :collapse-tags="!field.options.flatCollapseTags"
-                 :show-all-levels="showFullPath"
-                 :props="{ checkStrictly: field.options.checkStrictly, multiple: field.options.multiple, expandTrigger: 'hover',
-                           value: valueKey, label: labelKey, children: childrenKey }"
-                 @visible-change="hideDropDownOnClick" @expand-change="hideDropDownOnClick"
-                 :placeholder="getI18nLabel(field.options.placeholder || '请选择')"
-                 @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
-                 @change="handleChangeEvent">
+  <form-item-wrapper
+    :designer="designer"
+    :field="field"
+    :rules="rules"
+    :design-state="designState"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+    :sub-form-row-index="subFormRowIndex"
+    :sub-form-col-index="subFormColIndex"
+    :sub-form-row-id="subFormRowId"
+  >
+    <el-cascader
+      ref="fieldEditor"
+      :options="field.options.optionItems"
+      v-model="fieldModel"
+      v-show="!isReadMode"
+      class="full-width-input"
+      :disabled="field.options.disabled || isReadMode"
+      :clearable="field.options.clearable"
+      :filterable="field.options.filterable"
+      :collapse-tags="!field.options.flatCollapseTags"
+      :placeholder="
+        field.options.placeholder || i18nt('render.hint.selectPlaceholder')
+      "
+      :show-all-levels="showFullPath"
+      :props="{
+        checkStrictly: field.options.checkStrictly,
+        multiple: field.options.multiple,
+        expandTrigger: 'hover',
+        value: valueKey,
+        label: labelKey,
+        children: childrenKey,
+      }"
+      @visible-change="hideDropDownOnClick"
+      @expand-change="hideDropDownOnClick"
+      @focus="handleFocusCustomEvent"
+      @blur="handleBlurCustomEvent"
+      @clear="handleClearEvent"
+      @change="onFieldChangeEvent"
+    >
     </el-cascader>
     <template v-if="isReadMode">
-      <span class="readonly-mode-field">{{contentForReadMode}}</span>
+      <span class="readonly-mode-field">{{ contentForReadMode }}</span>
     </template>
   </form-item-wrapper>
 </template>
 
 <script>
-  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";
-
-  export default {
-    name: "cascader-widget",
-    componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-    mixins: [emitter, fieldMixin, i18n],
-    props: {
-      field: Object,
-      parentWidget: Object,
-      parentList: Array,
-      indexOfParentList: Number,
-      designer: Object,
-
-      designState: {
-        type: Boolean,
-        default: false
-      },
-
-      subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-        type: Number,
-        default: -1
-      },
-      subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-        type: Number,
-        default: -1
-      },
-      subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-        type: String,
-        default: ''
-      },
+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";
+
+export default {
+  name: "cascader-widget",
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false,
+    },
 
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    components: {
-      FormItemWrapper,
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    inject: ['refList', 'globalOptionData', 'globalModel'],
-    data() {
-      return {
-        oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
-        rules: [],
-      }
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-    computed: {
-      labelKey() {
-        return this.field.options.labelKey || 'label'
-      },
-
-      valueKey() {
-        return this.field.options.valueKey || 'value'
-      },
-
-      childrenKey() {
-        return this.field.options.childrenKey || 'children'
-      },
-
-      showFullPath() {
-        return this.field.options.showAllLevels === undefined || !!this.field.options.showAllLevels
-      },
-
-      contentForReadMode() {
-        if (!!this.field.options.multiple) {
-          const curTags = this.$refs.fieldEditor.presentTags
-          if (!curTags || (curTags.length <= 0)) {
-            return '--'
-          } else {
-            return curTags.map(tagItem => tagItem.text).join(', ')
-          }
-        } else {
-          return this.$refs.fieldEditor.presentText || '--'
-        }
-      },
-    },
-    beforeCreate() {
-      /* 这里不能访问方法和属性！！ */
+  },
+  components: {
+    FormItemWrapper,
+  },
+  inject: ["refList", "globalOptionData", "globalModel"],
+  data() {
+    return {
+      oldFieldValue: null, //field组件change之前的值
+      fieldModel: null,
+      rules: [],
+    };
+  },
+  computed: {
+    labelKey() {
+      return this.field.options.labelKey || "label";
     },
 
-    created() {
-      /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
-         需要在父组件created中初始化！！ */
-      this.registerToRefList()
-      this.initOptionItems()
-      this.initFieldModel()
-      this.initEventHandler()
-      this.buildFieldRules()
+    valueKey() {
+      return this.field.options.valueKey || "value";
+    },
 
-      this.handleOnCreated()
+    childrenKey() {
+      return this.field.options.childrenKey || "children";
     },
 
-    mounted() {
-      this.handleOnMounted()
+    showFullPath() {
+      return (
+        this.field.options.showAllLevels === undefined ||
+        !!this.field.options.showAllLevels
+      );
     },
 
-    beforeDestroy() {
-      this.unregisterFromRefList()
+    contentForReadMode() {
+      if (!!this.field.options.multiple) {
+        //console.log('test======', this.$refs.fieldEditor.presentTags)
+        const curTags = this.$refs.fieldEditor.presentTags;
+        if (!curTags || curTags.length <= 0) {
+          return "--";
+        } else {
+          return curTags.map((tagItem) => tagItem.text).join(", ");
+        }
+      } else {
+        return this.$refs.fieldEditor.presentText || "--";
+      }
     },
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
 
-    methods: {
-      /* 开启任意级节点可选后，点击radio隐藏下拉框 */
-      hideDropDownOnClick() {
-        setTimeout(() => {
-          document.querySelectorAll(".el-cascader-panel .el-radio").forEach((el) => {
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+         需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initOptionItems();
+    this.initFieldModel();
+    this.initEventHandler();
+    this.buildFieldRules();
+
+    this.handleOnCreated();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    // 对比展示：级联值(叶子value 或 value路径数组) → 逐级 label 路径
+    resolveDisplayValue(rawValue) {
+      if (rawValue === null || rawValue === undefined || rawValue === "") {
+        return rawValue;
+      }
+      let options = this.field.options.optionItems || [];
+      let vk = this.valueKey;
+      let lk = this.labelKey;
+      let ck = this.childrenKey;
+      // 在树里查找某 value 的 label 路径
+      let findPath = (nodes, val, path) => {
+        for (let n of nodes || []) {
+          let next = path.concat(this.$t1 ? this.$t1(n[lk]) : n[lk]);
+          if (n[vk] === val) return next;
+          if (n[ck] && n[ck].length) {
+            let r = findPath(n[ck], val, next);
+            if (r) return r;
+          }
+        }
+        return null;
+      };
+      // rawValue 可能是 value 路径数组、叶子 value、或多选的数组集合
+      let resolveOne = (v) => {
+        if (Array.isArray(v)) {
+          // value 路径：取每一级 label
+          let labels = [];
+          let nodes = options;
+          for (let seg of v) {
+            let node = (nodes || []).find((n) => n[vk] === seg);
+            if (!node) break;
+            labels.push(this.$t1 ? this.$t1(node[lk]) : node[lk]);
+            nodes = node[ck] || [];
+          }
+          return labels.join("/");
+        }
+        let path = findPath(options, v, []);
+        return path ? path.join("/") : v;
+      };
+      // 多选：rawValue 是若干条路径/值
+      if (
+        this.field.options.multiple &&
+        Array.isArray(rawValue) &&
+        rawValue.some((x) => Array.isArray(x))
+      ) {
+        return rawValue.map(resolveOne).join(",");
+      }
+      return resolveOne(rawValue);
+    },
+    /* 开启任意级节点可选后，点击radio隐藏下拉框 */
+    hideDropDownOnClick() {
+      setTimeout(() => {
+        document
+          .querySelectorAll(".el-cascader-panel .el-radio")
+          .forEach((el) => {
             el.onclick = () => {
-              this.$refs.fieldEditor.dropDownVisible = false  //单选框部分点击隐藏下拉框
-            }
-          })
-        }, 100)
-      },
-
-    }
-  }
+              this.$refs.fieldEditor.dropDownVisible = false; //单选框部分点击隐藏下拉框
+            };
+          });
+      }, 100);
+    },
+
+    handleClearEvent() {
+      if (!!this.designState) {
+        //设计状态不触发事件
+        return;
+      }
+
+      this.fieldModel = null;
+      this.onFieldChangeEvent(null);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
-
-  .full-width-input {
-    width: 100% !important;
-  }
+@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
+.full-width-input {
+  width: 100% !important;
+}
 </style>

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

@@ -137,18 +137,12 @@ export default {
       let scriptCode = this.field.options.formScriptCode;
       if (!scriptCode) return;
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam);
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam,
-          },
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam,
+        }),
         callback: (res) => {
           let data = res.objx || {};
           this.fieldModel = data;

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

@@ -71,12 +71,21 @@
     },
 
     methods: {
-      clickHandle(){
+      async clickHandle(){
         if(this.designState || this.field.options.disabled)return
+        const formRef = this.getFormRef()
+        try {
+          if (typeof formRef.prepareTreeTablesForCopy === "function") {
+            await formRef.prepareTreeTablesForCopy()
+          }
+        } catch (error) {
+          this.$message.error(error?.message || "树表数据尚未准备完成")
+          return
+        }
         let copyData = this.$baseLodash.cloneDeep(this.formModel);
 
         const done = () => {
-          this.getFormRef().openCopyEditTab(copyData);
+          formRef.openCopyEditTab(copyData);
         }
         let result = this.handleCustomEvent(this.field.options.copyDataHandle, ["copyData",'done'], [copyData,done])
         if(result === false){

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

@@ -25,11 +25,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 relativeDefaultMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/relative-default-mixin";
 
 export default {
   name: "date-range-widget",
   componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-  mixins: [emitter, fieldMixin, i18n],
+  mixins: [emitter, fieldMixin, i18n, utcTransformMixin, relativeDefaultMixin],
   props: {
     field: Object,
     parentWidget: Object,
@@ -69,11 +71,10 @@ export default {
   },
   computed: {
     contentForReadMode() {
-      if (!this.fieldModel) {
-        return ''
-      } else {
-        return this.fieldModel[0] + ' - ' + this.fieldModel[1]
+      if (!this.fieldModel || !this.fieldModel.length) {
+        return '';
       }
+      return this.fieldModel[0] + ' - ' + this.fieldModel[1];
     },
   },
   beforeCreate() {
@@ -83,7 +84,7 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.initFieldModel()
+    this.initRelativeFieldModel()
     this.registerToRefList()
     this.initEventHandler()
     this.buildFieldRules()