cloud-web-corejs 1.0.115 → 1.0.117

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

@@ -68,10 +68,10 @@
     },
     computed: {
       labelField(){
-        return this.field.options.labelKey || "label";
+        return this.getOptionItemLabelKey();
       },
       valueField(){
-        return this.field.options.valueKey || "value";
+        return this.getOptionItemValueKey();
       },
       optionItems(){
         return this.getOptionItems();

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

@@ -74,11 +74,11 @@ export default {
     }
   },
   computed: {
-    labelField() {
-      return this.field.options.labelKey || "label";
+    labelField(){
+      return this.getOptionItemLabelKey();
     },
-    valueField() {
-      return this.field.options.valueKey || "value";
+    valueField(){
+      return this.getOptionItemValueKey();
     },
     allowDefaultFirstOption() {
       return (!!this.field.options.filterable && !!this.field.options.allowCreate)

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

@@ -76,7 +76,8 @@ export default {
       return !!this.field.options.customClass ? this.field.options.customClass.join(' ') : ''
     },
     computedStyle() {
-      return {display: this.displayStyle, height: this.heightStyle};
+      let displayStyle = !this.designState && this.field.options.hidden ? "none !important":this.displayStyle
+      return {display: displayStyle, height: this.heightStyle};
     },
     isShow() {
       let result = !this.field.options.hidden || (this.designState === true);

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

@@ -0,0 +1,127 @@
+<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" 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) => {
+          this.getFormRef().setFormData(tempStorageData);
+        },
+        saveConfirm: () => {},
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+</style>