cloud-web-corejs 1.0.54-dev.24 → 1.0.54-dev.240

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-pie-mixin.js

@@ -9,6 +9,7 @@ import {CanvasRenderer} from 'echarts/renderers';
 import {PieChart} from 'echarts/charts';
 import {TitleComponent, TooltipComponent, LegendComponent} from 'echarts/components';
 import {THEME_KEY} from 'vue-echarts';
+import {extendDeeply} from "@base/utils/index.js";
 
 use([CanvasRenderer, PieChart, TitleComponent, TooltipComponent, LegendComponent]);
 
@@ -53,6 +54,7 @@ modules = {
       requestAccess: null,
       serieClone: {},
       showChart: true,
+      colors:[]
     };
   },
   computed: {
@@ -77,6 +79,9 @@ modules = {
         return height;
       }
       return '';
+    },
+    chartOption() {
+      return this.field.options.echarPieOption
     }
   },
   beforeCreate() {
@@ -91,6 +96,7 @@ modules = {
     this.initEventHandler();
 
     this.handleOnCreated();
+    this.initOption();
     this.serieClone = deepClone(this.field.options.echarPieOption.series[0]);
     // this.loadData();
   },
@@ -104,6 +110,10 @@ modules = {
   },
 
   methods: {
+    initOption() {
+      let echartConfig = this.handleCustomEvent(this.field.options.echartConfig) || {};
+      this.field.options.echarPieOption = extendDeeply(this.field.options.echarPieOption, echartConfig);
+    },
     /*async loadData() {
       if (this.designState) {
         return;
@@ -188,6 +198,9 @@ modules = {
       this.$nextTick(() => {
         this.showChart = true;
       })
+    },
+    getChart() {
+      return this.$refs.chart;
     }
   }
 };

package/src/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin.js

@@ -0,0 +1,176 @@
+import FormItemWrapper from '@base/components/xform/form-designer/form-widget/field-widget/form-item-wrapper'
+import emitter from '@base/components/xform/utils/emitter'
+import i18n from "@base/components/xform/utils/i18n";
+import {deepClone} from "@base/components/xform/utils/util";
+import fieldMixin from "@base/components/xform/form-designer/form-widget/field-widget/fieldMixin";
+
+export default {
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false
+    },
+    columnConfig: {
+      type: Object,
+      default: null
+    },
+    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
+      type: String,
+      default: ''
+    }
+  },
+  components: {
+    FormItemWrapper
+  },
+  data() {
+    let multipleChoices = this.field.options.multipleChoices || false;
+    let defaultValue = !multipleChoices ? null : [];
+    return {
+      oldFieldValue: defaultValue, //field组件change之前的值
+      fieldModel: defaultValue,
+      showValue2: null,
+      rules: [],
+      showSearchialog: false,
+      dialogContent: null,
+      showSysSearchialog: false,
+      systemDialogParam: {},
+      showVformDialog: false,
+      code: null,
+      formDialogOption: {}
+    }
+  },
+  watch: {
+    fieldModel(val) {
+      this.handleChangeEvent(val);
+    },
+    showValue(val) {
+      this.setShowValue(val);
+    }
+  },
+  computed: {
+    showValue() {
+      let currentData = this.currentData;
+      let fieldKeyName = this.fieldKeyName;
+      let vabSearchName = this.field.options.vabSearchName;
+      let multipleChoices = this.field.options.multipleChoices || false;
+      let labelField = this.field.options.vabSearchName || fieldKeyName;
+      let value = null;
+      if (!multipleChoices) {
+        value = currentData[labelField] ?? null;
+      } else {
+        if (this.fieldModel) {
+          value = this.fieldModel.map(item => item[labelField]).join(",");
+        }
+      }
+      this.showValue2 = value;
+      return value
+    },
+    tableRow() {
+      let tableParam = this.tableParam;
+      return tableParam && tableParam.row ? tableParam.row : null;
+    },
+    currentData() {
+      let tableParam = this.tableParam;
+      return tableParam && tableParam.row ? tableParam.row : this.formModel;
+    }
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    if (this.field.options.readonly == undefined) {
+      this.$set(this.field.options, "readonly", true);
+    }
+    this.initFieldModel()
+    this.registerToRefList()
+    this.initEventHandler()
+    this.buildFieldRules()
+
+    this.handleOnCreated()
+    // this.initValue();
+  },
+
+  mounted() {
+    this.handleOnMounted()
+
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+  methods: {
+    setShowValue(val = null) {
+      let multipleChoices = this.field.options.multipleChoices || false;
+      if (!multipleChoices) {
+        let fieldKeyName = this.fieldKeyName;
+        let labelField = this.field.options.vabSearchName || fieldKeyName;
+        // this.$set(this.currentData, labelField, val)
+
+        this.currentData[labelField] = val
+        this.showValue2 = val;
+      }
+    },
+    setValue: function (e) {
+      if (this.field.formItemFlag) {
+        let data = this.tableRow || this.formModel;
+        var t = deepClone(this.fieldModel);
+        this.fieldModel = e,
+          this.initFileList(),
+          this.syncUpdateFormModel(e),
+          this.emitFieldDataChange(e, t);
+      }
+    },
+    clearHandle() {
+      let multipleChoices = this.field.options.multipleChoices || false;
+      let defaultValue = !multipleChoices ? null : [];
+      this.setShowValue(null)
+      this.setValue(defaultValue)
+      if (this.field.options.onSearchClear) {
+        let tableParam = this.tableParam;
+        let eventParamNames = [];
+        let eventParamValues = [];
+        if (tableParam) {
+          eventParamNames = ['rowData', 'rowIndex'];
+          eventParamValues = [tableParam.row, tableParam.rowIndex];
+        }
+        this.handleCustomEvent(this.field.options.onSearchClear, eventParamNames, eventParamValues)
+
+        /* var e = new Function(this.field.options.onSearchClear);
+         e.call(this);*/
+      }
+      this.handleClearSearchDialog();
+    },
+    changeShowValue2(val) {
+      if (this.field.options.readonly === false) {
+        let multipleChoices = this.field.options.multipleChoices || false;
+        if (!multipleChoices) {
+          let fieldKeyName = this.fieldKeyName;
+          let vabSearchName = this.field.options.vabSearchName;
+          let labelField = this.field.options.vabSearchName || fieldKeyName;
+          this.currentData[labelField] = val;
+        }
+      }
+    },
+    fieldModelLabel() {
+      return this.showValue;
+    },
+  }
+}

package/src/components/xform/form-designer/form-widget/field-widget/multiSearch-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: "multiSearch-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/number-widget.vue

@@ -73,8 +73,8 @@
     created() {
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
-      this.initFieldModel()
       this.registerToRefList()
+      this.initFieldModel()
       this.initEventHandler()
       this.buildFieldRules()
 

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

@@ -4,7 +4,21 @@
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
     <el-button icon="el-icon-plus" type="warning" class="el-button-tag" v-if="designState"></el-button>
-    <projectTagView v-else v-model="fieldModel" :readonly="field.options.readonly"></projectTagView>
+    <div v-else>
+      <el-tag
+        v-for="(tag,index) in fieldModel"
+        :key="index"
+        type="warning"
+        :disable-transitions="false"
+        :closable="!field.options.disabled && field.options.tabDeleteEnabled"
+        @close="deleteCallback(index)"
+      >
+        {{ tag[field.options.tagLabelField] }}
+      </el-tag>
+      <el-button icon="el-icon-plus" type="warning" class="el-button-tag" @click="openProjectTagDialog"
+                 v-if="!field.options.disabled"></el-button>
+    </div>
+
   </form-item-wrapper>
 </template>
 
@@ -13,7 +27,6 @@ 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 projectTagView from "../../../../../components/projectTag/view.vue";
 
 export default {
   name: "project-tag-widget",
@@ -45,7 +58,6 @@ export default {
     }
   },
   components: {
-    projectTagView,
     FormItemWrapper,
   },
   inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
@@ -124,6 +136,61 @@ export default {
       });
 
     },
+    openProjectTagDialog() {
+      if (this.field.options.onClick) {
+        this.handleCustomEvent(this.field.options.onClick);
+        return
+      }
+      let formCode = this.field.options.tagFormCode;
+      let tagLabelField = this.field.options.tagLabelField;
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let tagFormLabelField = this.field.options.tagFormLabelField;
+      let tagFormUniqueField = this.field.options.tagFormUniqueField;
+      /*let checkRows = this.fieldModel.map(item => {
+        return {
+          [tagFormUniqueField]: item[tagUniqueField] ?? null,
+          [tagFormLabelField]: item[tagLabelField] ?? null,
+        }
+      })*/
+      let queryParam = null;
+      if (this.field.options.tagFormParam) {
+        queryParam = this.handleCustomEvent(this.field.options.tagFormParam)
+      }
+      this.getFormRef().openSearchDialog({
+        formCode,
+        queryParam,
+        // rows: checkRows,
+        multiple: true,
+        confirm: (rows) => {
+          if (!this.field.options.tagConfirmCallback) {
+            let tagFillConfig = this.field.options.tagFillConfig || [];
+            let items = rows.map(item => {
+              let newData = {
+                [tagUniqueField]: item[tagFormUniqueField],
+                [tagLabelField]: item[tagFormLabelField],
+              }
+              tagFillConfig.forEach(item1 => {
+                newData[item1.targetField] = item[item1.sourceField]
+              })
+              return newData
+            });
+            this.addTagData(items);
+          } else {
+            this.handleCustomEvent(this.field.options.tagConfirmCallback, ['rows'], [rows])
+          }
+        }
+      });
+    },
+    addTagData(rows) {
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let keys = this.fieldModel.map(item => item[tagUniqueField]);
+      let items = rows.filter(item => !keys.includes(item[tagUniqueField]))
+      this.fieldModel.push(...items);
+    },
+    deleteCallback(index) {
+      this.fieldModel.splice(index, 1)
+      this.handleCustomEvent(this.field.options.tagDeleteCallback)
+    }
   }
 }
 </script>

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

@@ -6,14 +6,14 @@
                     :disabled="field.options.disabled" :size="field.options.size"
                     @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-radio-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio-button v-for="(item, index) in optionItems" :key="index" :label="item.value"
                          :disabled="item.disabled" :border="field.options.border"
                          :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio-button>
       </template>
       <template v-else>
-        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio v-for="(item, index) in optionItems" :key="index" :label="item[valueField]"
                   :disabled="item.disabled" :border="field.options.border"
-                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio>
+                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
     </el-radio-group>
   </form-item-wrapper>
@@ -67,7 +67,23 @@
       }
     },
     computed: {
-
+      labelField(){
+        return this.field.options.labelKey || "label";
+      },
+      valueField(){
+        return this.field.options.valueKey || "value";
+      },
+      optionItems(){
+        return this.getOptionItems();
+      },
+      fieldModelLabel() {
+        let fieldModel = this.fieldModel;
+        let optionItems = this.field.options.optionItems;
+        let valueField = this.valueField;
+        let labelField = this.labelField;
+        let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+        return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +94,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItemsHandle()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -5,7 +5,7 @@
                           :index-of-parent-list="indexOfParentList"
                           :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                           :sub-form-row-id="subFormRowId">
-    <el-button class="button-sty" @click="handleButtonWidgetClick" icon="el-icon-search">
+    <el-button class="button-sty" @click="handleButtonWidgetClick" icon="el-icon-search" :disabled="!designState &&field.options.disabled">
       {{ field.options.label }}
     </el-button>
   </static-content-wrapper>

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.field.options.labelKey || "label";
+    },
+    valueField() {
+      return this.field.options.valueKey || "value";
+    },
     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/status-widget.vue

@@ -12,7 +12,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",
@@ -104,7 +105,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;
         }
@@ -114,6 +115,9 @@ export default {
     refreshWidget() {
       this.initStatusForDesign();
       this.$refs.statusTag.init();
+    },
+    getFieldModelLabel(){
+      return this.$refs.statusTag.getShowLabel();
     }
 
   }

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;