cloud-web-corejs 1.0.54-dev.164 → 1.0.54-dev.166

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

@@ -6,12 +6,12 @@
                        :disabled="field.options.disabled" :size="field.options.size"
                        @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-checkbox-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-checkbox-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-checkbox-button>
       </template>
       <template v-else>
-        <el-checkbox v-for="(item, index) in field.options.optionItems" :key="index" :label="item[valueField]"
+        <el-checkbox 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[labelField]) }}</el-checkbox>
       </template>
@@ -73,6 +73,9 @@
       valueField(){
         return this.field.options.valueKey || "value";
       },
+      optionItems(){
+        return this.getOptionItems();
+      }
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */

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

@@ -134,7 +134,7 @@ modules = {
       if (null === this.fieldModel) return "--";
       var t = "--";
       return (
-        this.field.options.optionItems.forEach(function (i) {
+        this.getOptionItems().forEach(function (i) {
           (i.value !== e.fieldModel &&
             -1 === e.findInArray(e.fieldModel, i.value)) ||
           (t = "--" === t ? i.label : t + " " + i.label);
@@ -467,6 +467,10 @@ modules = {
           : delete this.refList[e];
       }
     },
+    getOptionKey(){
+      let key =  +"optionItems-"+ this.field.options.name
+      return key;
+    },
     async initOptionItems(keepSelected) {
       var t = this;
       if (this.designState) {
@@ -483,12 +487,17 @@ modules = {
         let formCode = reportTemplate.formCode;
         let formScriptEnabled = this.field.options.formScriptEnabled || false;
         let scriptCode = this.field.options.formScriptCode || "getList";
+        let tableParam = this.tableParam;
         if (formScriptEnabled) {
-          let tableParam = this.tableParam;
-          /*if(tableParam && tableParam.column.params.optionItems){
-            this.field.options.optionItems = this.$baseLodash.cloneDeep(tableParam.column.params.optionItems);
-            return
-          }*/
+          if(tableParam){
+            // tableParam.column.params.optionItems
+            let key =  this.getOptionKey();
+            let optionItems = tableParam.column.params[key];
+            if(optionItems!==undefined){
+              return
+            }
+            tableParam.column.params[key] = null
+          }
           let accessParam = this.handleCustomEvent(
             this.field.options.formScriptParam
           );
@@ -515,6 +524,15 @@ modules = {
         } else if (this.field.options.commonAttributeEnabled) {
           let commonAttributeCode = this.field.options.commonAttributeCode;
           if (!commonAttributeCode) return;
+          if(tableParam){
+            // tableParam.column.params.optionItems
+            let key =  this.getOptionKey();
+            let optionItems = tableParam.column.params[key];
+            if(optionItems!==undefined){
+              return
+            }
+            tableParam.column.params[key] = null
+          }
           this.$getBaseDicts({
             code: commonAttributeCode,
             success: ({dicts, dictMap}) => {
@@ -526,6 +544,16 @@ modules = {
               );
             },
           });
+        }else{
+          if(tableParam){
+            // tableParam.column.params.optionItems
+            let key =  this.getOptionKey();
+            let optionItems = tableParam.column.params[key];
+            if(optionItems!==undefined){
+              return
+            }
+            tableParam.column.params[key] = this.$baseLodash.cloneDeep(this.field.options.optionItems);
+          }
         }
 
         return;
@@ -1100,7 +1128,9 @@ modules = {
       this.field.options.optionItems = optionItems
       let tableParam = this.tableParam;
       if(tableParam){
-        tableParam.column.params.optionItems = optionItems;
+        let key =  this.getOptionKey()
+        tableParam.column.params[key] = optionItems;
+        // tableParam.column.params.optionItems = optionItems;
       }
     },
     reloadOptions: function (e) {
@@ -1110,18 +1140,34 @@ modules = {
         this.field.options.labelKey || "label",
         this.field.options.valueKey || "value"
       );
+      let tableParam = this.tableParam;
+      if(tableParam){
+        let key = this.getOptionKey();
+        tableParam.column.params[key] = optionItems;
+        // tableParam.column.params.optionItems = optionItems;
+      }
     },
     getOptions: function () {
-      return this.field.options.optionItems;
+      return this.getOptionItems();
     },
     disableOption: function (e) {
-      this.disableOptionOfList(this.field.options.optionItems, e);
+      this.disableOptionOfList(this.getOptionItems(), e);
     },
     enableOption: function (e) {
-      this.enableOptionOfList(this.field.options.optionItems, e);
+      this.enableOptionOfList(this.getOptionItems(), e);
     },
     getOptionItems: function () {
-      return this.field.options.optionItems;
+      // return this.field.options.optionItems;
+      let tableParam = this.tableParam;
+      let optionItems = this.field.options.optionItems;
+      if(tableParam){
+        let key =  this.getOptionKey();
+        let rows = tableParam.column.params[key];
+        if(rows!==undefined){
+          optionItems = rows || []
+        }
+      }
+      return optionItems;
     },
     setUploadHeader: function (e, t) {
       this.$set(this.uploadHeaders, e, t);

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

@@ -5,7 +5,7 @@
     :parent-widget="parentWidget" :parent-list="parentList"
     :index-of-parent-list="indexOfParentList">
     <el-button type="primary" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
-               :disabled="field.options.disabled">{{ $t1('导入') }}
+               :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
     </el-button>
   </static-content-wrapper>
 
@@ -61,16 +61,11 @@ export default {
 
   methods: {
     importHandle() {
-      let scriptCode = this.field.options.importScriptCode;
-      let entity = this.field.options.importEntity;
-      let importAttachCode = this.field.options.importAttachCode;
-      // let importCodes = this.field.options.importCodes;
       this.getFormRef().openImportDialog({
         importOption: this.field.options,
-        importSaveDisabled: !!this.field.options.importSaveDisabled,
+        importFrontOnly: false,
         callback: (resultData, file, done) => {
-          // this.getWidgetRef(tableTarget).searchEvent();
-          this.handleCustomEvent(this.field.options.onConfirmImport, ['resultData', 'file', 'done'], [resultData, file, done])
+
         }
       });
     }

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

@@ -0,0 +1,80 @@
+<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">
+    <el-button type="primary" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
+               :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
+    </el-button>
+  </static-content-wrapper>
+
+</template>
+<script>
+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";
+
+export default {
+  name: "import2-button-widget",
+  components: {StaticContentWrapper},
+  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+    designState: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      exportOption: {}
+    }
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+  created() {
+
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList()
+    this.initEventHandler()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+
+  methods: {
+    importHandle() {
+      this.getFormRef().openImportDialog({
+        importOption: this.field.options,
+        importFrontOnly: true,
+        callback: (resultData, file, done) => {
+
+        }
+      });
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+
+</style>

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

@@ -6,12 +6,12 @@
                     :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[valueField]"
+        <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[labelField]) }}</el-radio>
       </template>
@@ -73,6 +73,9 @@
       valueField(){
         return this.field.options.valueKey || "value";
       },
+      optionItems(){
+        return this.getOptionItems();
+      }
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */

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

@@ -18,7 +18,7 @@
                @change="handleChangeEvent"
                :style="'width:'+field.options.widgetWidth+' !important;'"
                :class="{'custom-width':field.options.widgetWidth!=null}">
-      <el-option v-for="(item,index) in field.options.optionItems" :key="index" :label="getI18nLabel(item[labelField])"
+      <el-option v-for="(item,index) in optionItems" :key="index" :label="getI18nLabel(item[labelField])"
                  :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>
@@ -87,6 +87,9 @@ export default {
       let optionItems = this.field.options.optionItems;
       let optionItem = optionItems.find(item => item.value === fieldModel)
       return optionItem && optionItem.label ? optionItem.label : null;
+    },
+    optionItems(){
+      return this.getOptionItems();
     }
 
   },

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form-item label-width="0">
-      <el-divider class="custom-divider">导入设置</el-divider>
+      <el-divider class="custom-divider">后端导入设置</el-divider>
     </el-form-item>
     <el-form-item label="导入数据表名">
       <el-input v-model="optionModel.importEntity"></el-input>
@@ -19,18 +19,15 @@
         <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
       </el-input>
     </el-form-item>
-    <el-form-item label="执行后台脚本编码">
-      <el-input v-model="optionModel.importScriptCode"></el-input>
-    </el-form-item>
     <el-form-item label="关联表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
+    <el-form-item label="执行后台脚本编码">
+      <el-input v-model="optionModel.importScriptCode"></el-input>
+    </el-form-item>
     <el-form-item label="启用图片处理">
       <el-switch v-model="optionModel.enabledImportPreHandle"></el-switch>
     </el-form-item>
-<!--    <el-form-item label="图片处理脚本编码">
-      <el-input v-model="optionModel.importPreScriptCode"></el-input>
-    </el-form-item>-->
     <el-form-item label="导入前数据处理" label-width="150px">
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="editEventHandler('onBeforeImport', onBeforeImportParams)">
@@ -39,16 +36,13 @@
       </a>
     </el-form-item>
 
-<!--    <el-form-item label="不执行导入后台保存">
-      <el-switch v-model="optionModel.importSaveDisabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="确认回调" label-width="150px">
+    <el-form-item label="导入完成回调" label-width="150px">
       <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
-        <span>{{ optionModel.onConfirmImport }}</span>
+         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
+        <span>{{ optionModel.onSuccessImport }}</span>
         <i class="el-icon-edit"></i>
       </a>
-    </el-form-item>-->
+    </el-form-item>
 
     <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
                            @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
@@ -75,7 +69,8 @@ export default {
       eventParams: [],
       showBdAttachSettingDialog: false,
       onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
-      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done']
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done'],
+      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
     };
   },
   methods: {

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import2-button-editor.vue

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">前端导入设置</el-divider>
+    </el-form-item>
+    <el-form-item label="文件大小限制（M）">
+      <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
+    </el-form-item>
+    <el-form-item label="选择导入模板文件">
+      <el-input
+        class="search-input"
+        max="200"
+        v-model="optionModel.importAttachCode"
+        clearable
+      >
+        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
+      </el-input>
+    </el-form-item>
+    <el-form-item label="关联表格唯一名称">
+      <el-input v-model="optionModel.tableRef"></el-input>
+    </el-form-item>
+    <el-form-item label="启用确认回调">
+      <el-switch v-model="optionModel.onConfirmImportEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.onConfirmImportEnabled">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
+        <span>{{ optionModel.onConfirmImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="导入完成回调" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
+        <span>{{ optionModel.onSuccessImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+
+    <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
+                           @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import bdAttachSettingDialog from "../../../../../../views/bd/setting/bd_attach_setting/dialog.vue";
+
+export default {
+  name: "import2-button-editor",
+  components: {bdAttachSettingDialog},
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: [],
+      showBdAttachSettingDialog: false,
+      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done'],
+      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
+    };
+  },
+  methods: {
+    confirmBdAttachSettingDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.optionModel.importAttachCode = row.code;
+      }
+    }
+  }
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -140,6 +140,7 @@ const COMMON_PROPERTIES = {
 
   tableExportParam: "table-export-button-editor",
   importEntity: "import-button-editor",
+  frontImportFlag: "import2-button-editor",
   printTableRef: "print-button-editor",
   statusParam: "field-status-editor",
   // searchDialogEventEnabled: "search-dialog-event-editor"

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -2793,7 +2793,7 @@ export const advancedFields = [
       label: "导入",
       columnWidth: "200px",
       size: "",
-      importFileLimitSize: 200,
+
       // displayStyle: "block",
       disabled: !1,
       hidden: !1,
@@ -2810,14 +2810,57 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
+
+      importFileLimitSize: 200,
       importEntity: '',
       importAttachCode: '',
       importScriptCode: '',
       onBeforeImport: '',
       enabledImportPreHandle: false,
+      tableRef:'',
+      onSuccessImport:'',
+
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: []
+    },
+  },
+  {
+    type: "import2-button",
+    icon: "button",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !1,
+    options: {
+      name: "",
+      label: "明细导入",
+      columnWidth: "200px",
+      size: "",
 
-      importSaveDisabled: false,
+      // displayStyle: "block",
+      disabled: !1,
+      hidden: !1,
+      type: "primary",
+      /*plain: !1,
+      round: !1,
+      circle: !1,
+      icon: "el-icon-download",*/
+      customClass: "",
+      onCreated: "",
+      onMounted: "",
+      // clickBindEvent: null,
+      searchDialogConfig: {
+        ...defaultSearchDialogConfig
+      },
+      ...defaultWfConfig,
+
+      frontImportFlag:1,
+      importFileLimitSize: 200,
+      importAttachCode: '',
+      tableRef:'',
+      onConfirmImportEnabled:false,
       onConfirmImport: '',
+      onSuccessImport:'',
 
       showRuleFlag: 1,
       showRuleEnabled: 1,

package/src/components/xform/lang/zh-CN.js

@@ -69,6 +69,7 @@ export default {
       "export_button": "导出按钮",
       "import_button": "导入按钮",
       "import-button": "导入按钮",
+      "import2-button": "明细导入按钮",
       "print-button": "导出/打印按钮",
       "rich-editor": "富文本",
       cascader: "级联选择",