cloud-web-corejs 1.0.54-dev.194 → 1.0.54-dev.196

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.194",
+  "version": "1.0.54-dev.196",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/wf/content.vue

@@ -437,6 +437,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title">{{ $t2('流程转办', 'components.wf.wfTransfer') }}<span
@@ -592,6 +593,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title">{{ $t2('流程加签', 'components.wf.wfAddIncreaseSign') }}<span

package/src/components/wf/setCandidateDialog.vue

@@ -10,6 +10,7 @@
       @close="closeWin"
       v-el-drag-dialog
       v-el-dialog-center
+      :append-to-body="true"
     >
       <template #title>
         <span class="el-dialog__title">

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -79,7 +79,7 @@ modules = {
     this.initValueWatchEvent();
     if (this.field.options.searchDialogConfig) {
       if (this.field.options.searchDialogConfig.multipleChoices === void 0) {
-        if (this.field.type == "vabsearch") {
+        if (this.hasVabsearchFlag()) {
           this.$set(
             this.field.options.searchDialogConfig,
             "multipleChoices",
@@ -243,8 +243,7 @@ modules = {
         } else {
           if (!dataId) {
             //新增
-            // targetType: "vabsearch",
-            if (this.field.type == "vabsearch" && !this.field.options.multipleChoices) {
+            if (!this.designState && this.hasVabsearchFlag() && !this.field.options.multipleChoices) {
               let searchDialogConfig = this.field.options.searchDialogConfig || {};
               if (this.field.options.userDefaultVabSearch) {
                 let userInfo = this.getFormRef().getUserInfo();
@@ -920,7 +919,7 @@ modules = {
       let formModel = this.formModel;
 
       let rows = [];
-      if (this.field.type == "vabsearch") {
+      if (this.hasVabsearchFlag()) {
         if (this.field.options.multipleChoices) {
           let fieldKeyName = this.fieldKeyName;
           let valueField = this.field.options.valueField || fieldKeyName;
@@ -947,40 +946,6 @@ modules = {
         multiple: searchDialogConfig.multipleChoices || false,
         confirm: (rows) => {
           this.handleConfirmSearchDialog(rows, false, flag);
-          /*if(rows.length){
-            let row = rows[0];
-            if(this.field.type == "vabsearch"){
-              let fieldKeyName = this.fieldKeyName;
-              let vabSearchName = this.field.options.vabSearchName || fieldKeyName;
-              if(tableParam){
-                let rowData = tableParam.row;
-                rowData[fieldKeyName] = row[searchDialogConfig.valueSourceField]
-                if(searchDialogConfig.labelSourceField)rowData[vabSearchName] = row[searchDialogConfig.labelSourceField]
-                tableData.forEach(item=>{
-                  rowData[item.targetField] = row[item.sourceField]
-                })
-              }else{
-                this.fieldModel = row[searchDialogConfig.valueSourceField];
-                if(searchDialogConfig.labelSourceField)this.showValue  = row[searchDialogConfig.labelSourceField];
-                tableData.forEach(item=>{
-                  // formModel[item.targetField] = row[item.sourceField]
-                  this.getWidgetRef(item.targetField).setValue(row[item.sourceField]??null)
-                })
-              }
-            }else{
-              if(searchDialogConfig.tableEnabled){
-                if(!searchDialogConfig.tableRef || !tableData.length)return
-                let addRows = rows.map(rowData=>{
-                  let itemData = {};
-                  tableData.forEach(item=>{
-                    itemData[item.targetField] = rowData[item.sourceField]
-                  })
-                  return itemData;
-                });
-                this.getWidgetRef(searchDialogConfig.tableRef).addTableData(addRows,searchDialogConfig.tableUniqueKey);
-              }
-            }
-          }*/
         },
       });
     },
@@ -994,6 +959,9 @@ modules = {
       let multipleChoices = this.field.options.multipleChoices;
       return multipleChoices;
     },
+    hasVabsearchFlag() {
+      return this.field.type == "vabsearch" || this.field.type == "singerSearch" || this.field.type == "multiSearch"
+    },
     handleConfirmSearchDialog(rows, isClear, flag) {
       if (!isClear && !rows.length) return;
       let optionModel = !flag ? this.field.options : (this.field.options.widgetTextLinkConfig?.options || {});
@@ -1006,7 +974,7 @@ modules = {
       let row = rows && rows.length ? rows[0] : null;
       let multipleChoices =
         optionModel.searchDialogConfig.multipleChoices || false;
-      if (this.field.type == "vabsearch") {
+      if (this.hasVabsearchFlag()) {
         let fieldKeyName = this.fieldKeyName;
         let valueField = this.field.options.valueField || fieldKeyName;
         let vabSearchName = this.field.options.vabSearchName || fieldKeyName;

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

@@ -152,10 +152,13 @@ export default {
           [tagFormLabelField]: item[tagLabelField] ?? null,
         }
       })*/
-      let tagFormParam = this.handleCustomEvent(this.field.options.tagFormParam)
+      let queryParam = null;
+      if (this.field.options.tagFormParam) {
+        queryParam = this.handleCustomEvent(this.field.options.tagFormParam)
+      }
       this.getFormRef().openSearchDialog({
         formCode,
-        param: tagFormParam,
+        queryParam,
         // rows: checkRows,
         multiple: true,
         confirm: (rows) => {

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

@@ -20,183 +20,12 @@
 </template>
 
 <script>
-import FormItemWrapper from './form-item-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
-import i18n from "../../../../../components/xform/utils/i18n";
-import {deepClone} from "../../../../../components/xform/utils/util";
-import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
+import mixins from "@base/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin";
 
 export default {
   name: "vabsearch-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
-    },
-    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;
-    },
-  }
+  mixins: [mixins],
 }
 </script>
 

package/src/components/xform/form-designer/indexMixin.js

@@ -610,7 +610,7 @@ modules = {
               tableType: 2
             };
             formTemplateTableDTOs.push(formTemplateTable);
-          } else if (widget.tableField && widget.type == 'vabsearch') {
+          } else if (widget.tableField && this.isVabsearchFlagWidget(widget)) {
             fields.push({
               fieldDesc: widget.options.label + "ID",
               fieldName: widgetName
@@ -661,6 +661,10 @@ modules = {
 
       return formTemplateTableDTOs;
     },
+    isVabsearchFlagWidget(widget) {
+      let type = widget?.type;
+      return type == "vabsearch" || type == "singerSearch" || type == "multiSearch";
+    },
     getTableFileds() {
       let fields = [];
       let fJson = this.getFormJson();

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -879,14 +879,6 @@ export default {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
-
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
         columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -1205,14 +1205,6 @@ export default {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
-
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
         // columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));

package/src/components/xform/form-designer/setting-panel/property-editor/container-list-h5/list-h5-editor.vue

@@ -694,14 +694,6 @@ export default {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
-
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
         columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));