cloud-web-corejs 1.0.54-dev.77 → 1.0.54-dev.770

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

@@ -1,22 +1,43 @@
 <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">
-    <status-tag ref="statusTag" :statusType="field.options.statusType" :param="statusParam"
-                :value="fieldModel"></status-tag>
+  <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"
+  >
+    <template v-for="(item, index) in field.options.statusParam">
+      <template v-if="fieldModel === item[valueField]">
+        <span
+          v-if="
+            field.options.formScriptEnabled ||
+            field.options.commonAttributeEnabled
+          "
+          :key="index"
+          >{{ getI18nLabel(item[labelField]) }}</span
+        >
+        <span v-else :key="index" class="list-tag" :class="item.type">{{
+          getI18nLabel(item[labelField])
+        }}</span>
+      </template>
+    </template>
   </form-item-wrapper>
 </template>
 
 <script>
-import emitter from '../../../../../components/xform/utils/emitter'
+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 FormItemWrapper from "../../../../../components/xform/form-designer/form-widget/field-widget/form-item-wrapper.vue";
 
 export default {
   name: "status-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -27,84 +48,84 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-
   },
   components: {
-    FormItemWrapper
-
+    FormItemWrapper,
   },
-  inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
+  inject: ["refList", "globalOptionData", "globalModel", "getFormConfig"],
   data() {
     return {
       oldFieldValue: [], //field组件change之前的值
       fieldModel: null,
       rules: [],
       isH5: false,
-      option: {}
-    }
+      option: {},
+      statusParam: [],
+    };
+  },
+  computed: {
+    labelField() {
+      return this.getOptionItemLabelKey();
+    },
+    valueField() {
+      return this.getOptionItemValueKey();
+    },
   },
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
-    }
-  },
-  computed: {
-    statusParam() {
-      return this.field.options.statusParam ? this.field.options.statusParam.map(item => {
-        return {
-          ...item,
-          label: this.getI18nLabel(item.label)
-        }
-      }) : [];
-    }
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },
 
   created() {
-
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
     this.initStatusForDesign();
 
-    this.initFieldModel()
-    this.registerToRefList()
-    this.initEventHandler()
-    this.buildFieldRules()
+    this.initFieldModel();
+    this.registerToRefList();
+    this.initEventHandler();
+    this.buildFieldRules();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
+    this.initOptionItemsHandle();
+    // this.initStatusParam();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
   methods: {
     initStatusForDesign() {
       if (this.designState) {
         let value = null;
         let statusParam = this.field.options.statusParam;
+        let valueField = this.valueField;
         if (statusParam.length) {
-          value = statusParam[0].value ?? 0
+          value =
+            this.field.options.defaultValue ?? statusParam[0][valueField] ?? 0;
         } else {
           value = 0;
         }
@@ -113,11 +134,34 @@ export default {
     },
     refreshWidget() {
       this.initStatusForDesign();
-      this.$refs.statusTag.init();
-    }
-
-  }
-}
+      // this.$refs.statusTag.init();
+    },
+    getFieldModelLabel() {
+      let label = null;
+      let fieldModel = this.fieldModel;
+      let valueField = this.valueField;
+      let labelField = this.labelField;
+      let item = this.field.options.statusParam.find(
+        (item) => item[valueField] === fieldModel
+      );
+      if (item) {
+        label = this.getI18nLabel(item[labelField]);
+      }
+      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>
 
 <style lang="scss" scoped>

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/table-export-button-widget.vue

@@ -1,40 +1,42 @@
 <template>
   <static-content-wrapper
-    :designer="designer" :field="field" :design-state="designState"
+    :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 trigger="hover">
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+  >
+    <el-dropdown trigger="hover" :disabled="field.options.disabled">
       <el-button type="primary" class="button-sty" size="mini">
-        <span>{{ getI18nLabel('列表导出') }}</span><span class="line"></span> <i
-        class="el-icon-arrow-down el-icon--right"></i>
+        <span>{{ getI18nLabel("列表导出") }}</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="toDo()">
-          {{ getI18nLabel('条件导出') }}
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toDo()">
+          {{ getI18nLabel("条件导出") }}
         </el-dropdown-item>
-        <el-dropdown-item icon="el-icon-upload2"
-                          @click.native="toDo('selected')">
-          {{ getI18nLabel('选择导出') }}
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toDo('selected')">
+          {{ getI18nLabel("选择导出") }}
         </el-dropdown-item>
-
+        <!-- <el-dropdown-item icon="el-icon-upload2" @click.native="toDo('exportItem')">
+          {{ getI18nLabel("选择导出明细") }}
+        </el-dropdown-item> -->
       </el-dropdown-menu>
     </el-dropdown>
   </static-content-wrapper>
-
 </template>
 <script>
-import emitter from '../../../../../components/xform/utils/emitter'
+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 "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
+import StaticContentWrapper from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
 
 export default {
   name: "table-export-button-widget",
-  components: {StaticContentWrapper},
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  components: { StaticContentWrapper },
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -44,11 +46,11 @@ export default {
     designer: Object,
     designState: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
-    return {}
+    return {};
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -57,44 +59,42 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.registerToRefList()
-    this.initEventHandler()
+    this.registerToRefList();
+    this.initEventHandler();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
   methods: {
     toDo(type = null) {
       if (this.designState) {
-        return
+        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
+        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 options = { ...opt, ...tableExportParam, type: type };
       let tableRef = options?.targetRef;
-      delete options.targetRef
+      delete options.targetRef;
       let tableWidget = this.getWidgetRef(tableRef);
-      tableWidget.exportData(options)
-    }
-  }
-
-}
+      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/tempStorage-widget.vue

@@ -0,0 +1,147 @@
+<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"
+  >
+    <span class="button-sty nobg" v-if="designState">
+      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" plain
+        >暂存</el-button
+      >
+      <el-button
+        class="btn-connect"
+        icon="iconfont icon-chakanshuju"
+        type="success"
+      ></el-button>
+    </span>
+    <temp-storage-button
+      v-else
+      :option="tempStorageOption"
+      :disabled="!designState && field.options.disabled"
+    ></temp-storage-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 tempStorageButton from "@base/components/tempStorage/index.vue";
+
+export default {
+  name: "tempStorage-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,
+    tempStorageButton,
+  },
+  computed: {},
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  data() {
+    return {
+      tempStorageOption: {},
+    };
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+         需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
+
+    this.handleOnCreated();
+    this.init();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    init() {
+      if (this.designer) return;
+      let dataId = this.getFormRef().dataId;
+      if (dataId) {
+        this.setHidden(true);
+      }
+
+      this.initConfig();
+    },
+    initConfig() {
+      let formCode = this.getFormRef()?.reportTemplate?.formCode;
+      let tempStorageCode = this.field.options.tempStorageCode || formCode;
+      let vue = this.getFormRef();
+      this.tempStorageOption = {
+        vue,
+        storageType: tempStorageCode,
+        data: () => {
+          return this.formModel;
+        },
+        chooseConfirm: (tempStorageData) => {
+          vue.showFormContent = false;
+          this.$nextTick(() => {
+            this.getFormRef().setFormData(tempStorageData);
+            this.$nextTick(() => {
+              vue.showFormContent = true;
+              this.$nextTick(() => {
+                this.handleCustomEvent(
+                  this.field.options.tempStorageConfirm,
+                  ["tempStorageData"],
+                  [tempStorageData]
+                );
+              });
+            });
+          });
+          // this.getFormRef().setFormData(tempStorageData);
+        },
+        saveConfirm: () => {},
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+</style>