cloud-web-corejs 1.0.54-dev.33 → 1.0.54-dev.331

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

@@ -12,14 +12,15 @@
                :default-first-option="allowDefaultFirstOption"
                :automatic-dropdown="field.options.automaticDropdown"
                :multiple="field.options.multiple" :multiple-limit="field.options.multipleLimit"
+               :collapse-tags="!field.options.flatCollapseTags"
                :placeholder="getI18nLabel(field.options.placeholder || '请选择')"
                :remote="field.options.remote" :remote-method="remoteQuery"
                @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
                @change="handleChangeEvent"
                :style="'width:'+field.options.widgetWidth+' !important;'"
                :class="{'custom-width':field.options.widgetWidth!=null}">
-      <el-option v-for="item in field.options.optionItems" :key="item.value" :label="getI18nLabel(item.label)"
-                 :value="item.value" :disabled="item.disabled">
+      <el-option v-for="(item,index) in optionItems" :key="index" :label="getI18nLabel(item[labelField])"
+                 :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>
     <span v-else>{{ fieldModelLabel }}</span>
@@ -73,14 +74,25 @@ export default {
     }
   },
   computed: {
+    labelField(){
+      return this.getOptionItemLabelKey();
+    },
+    valueField(){
+      return this.getOptionItemValueKey();
+    },
     allowDefaultFirstOption() {
       return (!!this.field.options.filterable && !!this.field.options.allowCreate)
     },
     fieldModelLabel() {
       let fieldModel = this.fieldModel;
       let optionItems = this.field.options.optionItems;
-      let optionItem = optionItems.find(item => item.value === fieldModel)
-      return optionItem && optionItem.label ? optionItem.label : null;
+      let valueField = this.valueField;
+      let labelField = this.labelField;
+      let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+      return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+    },
+    optionItems() {
+      return this.getOptionItems();
     }
 
   },
@@ -99,7 +111,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
-    this.initOptionItems()
+    this.initOptionItemsHandle()
   },
 
   mounted() {

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

@@ -0,0 +1,53 @@
+<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-input
+      class="search-input"
+      max="200"
+      v-model="showValue2"
+      @clear="clearHandle"
+      v-el-readonly="field.options.readonly"
+      clearable
+      :disabled="field.options.disabled"
+      @change="changeShowValue2"
+    >
+      <i slot="suffix" class="el-input__icon el-icon-search" @click="emitAppendButtonClick"></i>
+      <span v-show="false">{{ showValue }}</span>
+    </el-input>
+  </form-item-wrapper>
+</template>
+
+<script>
+import mixins from "@base/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin";
+
+export default {
+  name: "singerSearch-widget",
+  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [mixins],
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+
+.full-width-input {
+  width: 100% !important;
+}
+
+.hideUploadDiv {
+  ::v-deep div.el-upload--picture-card { /* 隐藏最后的图片上传按钮 */
+    display: none;
+  }
+
+  ::v-deep div.el-upload--text { /* 隐藏最后的文件上传按钮 */
+    display: none;
+  }
+
+  ::v-deep div.el-upload__tip { /* 隐藏最后的文件上传按钮提示 */
+    display: none;
+  }
+}
+
+</style>

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

@@ -0,0 +1,145 @@
+<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">
+    <div id="uploadImage" class="upload-img" v-if="designState">
+      <div class="el-upload el-upload--picture" style="vertical-align: middle;display: inline-block;float:left">
+        <button type="button" class=" avatar-uploader">
+          <i class="el-icon-plus avatar-uploader-icon"></i>
+        </button>
+      </div>
+    </div>
+    <baseUpload accept="file" :file.sync="fieldModel" :hidePasteArea.sync="isH5"
+                :uploadDialogCustomClass="isH5?'dialog-upload-h5':null" :pickPrivateProfile="false"
+                :multi="field.options.limit!==1"
+                :limit="field.options.limit"
+                resultType="Array"
+                :edit="!field.options.disabled"
+                @callback="submitFile"
+                :hideInfo="field.options.hideFileInfo"
+                :hideName="field.options.hideFileName"
+                :showSize="!!field.options.showFileSize"
+                :createBy="!!field.options.showFileCreateBy"
+                :createDate="!!field.options.showFileCreateDate"
+                :widgetSize="field.options.fileShowImageSize"
+                v-else></baseUpload>
+  </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: "singleUpload-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: {
+    FormItemWrapper,
+  },
+  inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
+  data() {
+    return {
+      oldFieldValue: [], //field组件change之前的值
+      fieldModel: [],
+      rules: [],
+      isH5: false
+    }
+  },
+  watch: {
+    fieldModel(val) {
+      this.handleChangeEvent(val);
+    }
+  },
+  computed: {
+    formDataId() {
+      let formRef = this.getFormRef();
+      return formRef.dataId;
+    }
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+
+    this.isH5 = this.getFormConfig().layoutType === 'H5';
+
+    this.initFieldModel()
+    this.registerToRefList()
+    this.initEventHandler()
+    this.buildFieldRules()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+  methods: {
+    submitFile(rows, fileInfos) {
+      // this.handlLineCode(fileInfos);
+      let eventParamNames = ['attachments', 'fileInfos'];
+      let eventParamValues = [rows, fileInfos];
+      this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+
+.full-width-input {
+  width: 100% !important;
+}
+
+.hideUploadDiv {
+  ::v-deep div.el-upload--picture-card { /* 隐藏最后的图片上传按钮 */
+    display: none;
+  }
+
+  ::v-deep div.el-upload--text { /* 隐藏最后的文件上传按钮 */
+    display: none;
+  }
+
+  ::v-deep div.el-upload__tip { /* 隐藏最后的文件上传按钮提示 */
+    display: none;
+  }
+}
+
+</style>

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/status-widget.vue

@@ -3,8 +3,12 @@
                      :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>
+    <template v-for="(item,index) in field.options.statusParam">
+      <span
+        v-if="fieldModel===item.value"
+        :key="index" class="list-tag"
+        :class="item.type">{{ getI18nLabel(item.label) }}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -12,7 +16,8 @@
 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";
+import FormItemWrapper
+  from "../../../../../components/xform/form-designer/form-widget/field-widget/form-item-wrapper.vue";
 
 export default {
   name: "status-widget",
@@ -55,7 +60,8 @@ export default {
       fieldModel: null,
       rules: [],
       isH5: false,
-      option: {}
+      option: {},
+      statusParam: [],
     }
   },
   watch: {
@@ -63,16 +69,6 @@ export default {
       this.handleChangeEvent(val);
     }
   },
-  computed: {
-    statusParam() {
-      return this.field.options.statusParam ? this.field.options.statusParam.map(item => {
-        return {
-          ...item,
-          label: this.getI18nLabel(item.label)
-        }
-      }) : [];
-    }
-  },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },
@@ -89,6 +85,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
+    // this.initStatusParam();
   },
 
   mounted() {
@@ -104,7 +101,7 @@ export default {
         let value = null;
         let statusParam = this.field.options.statusParam;
         if (statusParam.length) {
-          value = statusParam[0].value ?? 0
+          value = this.field.options.defaultValue ?? (statusParam[0].value ?? 0)
         } else {
           value = 0;
         }
@@ -113,9 +110,17 @@ export default {
     },
     refreshWidget() {
       this.initStatusForDesign();
-      this.$refs.statusTag.init();
+      // this.$refs.statusTag.init();
+    },
+    getFieldModelLabel() {
+      let label = null;
+      let fieldModel = this.fieldModel;
+      let item = this.field.options.statusParam.find(item => item.value === fieldModel)
+      if (item) {
+        label = this.getI18nLabel(item.label);
+      }
+      return label;
     }
-
   }
 }
 </script>

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

@@ -76,7 +76,12 @@ export default {
       if (this.designState) {
         return
       }
-      let opt = {title: this.field.options.exportFileName || null, targetRef: this.field.options.tableRef || null};
+      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;

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>

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

@@ -1,20 +1,29 @@
 <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">
-    <span>{{fieldModel}}</span>
+  <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"
+  >
+    <span :class="field.options.colorClass">{{ showVaule }}</span>
   </form-item-wrapper>
 </template>
 
 <script>
-import FormItemWrapper from './form-item-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
+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: "text-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -25,37 +34,40 @@ 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,
   },
-  inject: ['refList', 'globalOptionData', 'globalModel'],
+  inject: ["refList", "globalOptionData", "globalModel"],
   data() {
     return {
       oldFieldValue: null, //field组件change之前的值
       fieldModel: null,
       rules: [],
-    }
+    };
   },
   computed: {
-
-
+    showVaule() {
+      let value = !this.field.options.autoValueEnabled
+        ? this.fieldModel
+        : this.handleCustomEvent(this.field.options.autoValueHanlde);
+      return value;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -64,29 +76,29 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.initFieldModel()
-    this.registerToRefList()
-    this.initEventHandler()
-    this.buildFieldRules()
+    this.initFieldModel();
+    this.registerToRefList();
+    this.initEventHandler();
+    this.buildFieldRules();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
-  methods: {
-
-  }
-}
+  methods: {},
+};
 </script>
 
 <style lang="scss" scoped>
 @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
-::v-deep .el-form-item{min-height: 34px;}
+::v-deep .el-form-item {
+  min-height: 34px;
+}
 </style>

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

@@ -57,8 +57,8 @@
     inject: ['refList', 'globalOptionData', 'globalModel'],
     data() {
       return {
-        oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
+        oldFieldValue: [], //field组件change之前的值
+        fieldModel: [],
         rules: [],
       }
     },