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

package/package.json

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

package/src/components/xform/form-designer/form-widget/dialog/importDialog.vue

@@ -63,7 +63,8 @@
       custom-class="dialog-style"
       width="501px"
       height="250px"
-      @close="dialogClose2"
+      :beforeClose="handleBeforeClose"
+      @close="handleClose2"
       v-el-drag-dialog
     >
       <div>

package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js

@@ -176,7 +176,7 @@ tmixins = {
     },
     dialogClose1() {
       this.importLoading = false;
-      if (!this.showImportDialog2) {
+      if(!this.showImportDialog2){
         this.$emit("update:visiable", false);
         this.showContent = false;
       }
@@ -267,20 +267,63 @@ tmixins = {
       })
       return
     },
-    dialogClose2(flag) {
+    handleBeforeClose(hide) {
+      this.option.onCancel && this.option.onCancel(this.getCallbackData(), this.fileRaw);
+      let importOption = this.option.importOption;
+      this.parentTarget.handleCustomEvent(importOption.onSuccessImport, ['resultData', 'file'], [this.getCallbackData(), this.fileRaw])
+      this.handleTableCallback();
+      hide();
+    },
+    dialogClose2() {
+      this.showImportDialog2 = false;
+      this.option.onBeforeCancel && this.option.onBeforeCancel(this.getCallbackData(), this.fileRaw);
+      let importOption = this.option.importOption;
+      this.parentTarget.handleCustomEvent(importOption.onSuccessImport, ['resultData', 'file'], [this.getCallbackData(), this.fileRaw])
+      this.handleTableCallback();
+    },
+    handleClose2() {
+      this.clearImportTimer();
+      this.showImportDialog2 = false;
+      this.showContent = false;
+      this.option.onClose && this.option.onClose(this.getCallbackData(), this.fileRaw);
+      this.option.callback && this.option.callback(this.getCallbackData(), this.fileRaw);
+      this.dialogClose1();
+    },
+    dialogPrimary2() {
+      let importOption = this.option.importOption;
+      this.showImportDialog2 = false;
+      this.option.onBeforeConfirm && this.option.onBeforeConfirm(this.getCallbackData(), this.fileRaw);
+      this.parentTarget.handleCustomEvent(importOption.onSuccessImport, ['resultData', 'file'], [this.getCallbackData(), this.fileRaw])
+      this.handleTableCallback();
+    },
+    getCallbackData() {
+      return {
+        ...this.resultData,
+        'successRows': this.successRows,
+        "failRows": this.failRows
+      };
+    },
+
+
+    /*dialogClose2(flag) {
+      let importOption = this.option.importOption;
       this.clearImportTimer();
       this.showImportDialog2 = false;
       this.dialogClose1();
       this.handleTableCallback(flag);
-      this.option.callback && this.option.callback();
+      this.parentTarget.handleCustomEvent(importOption.onSuccessImport, ['resultData', 'file'], [this.resultData, this.fileRaw])
+      this.option.callback && this.option.callback(this.resultData, this.fileRaw);
     },
     dialogPrimary2() {
+      let importOption = this.option.importOption;
       this.clearImportTimer();
       this.showImportDialog2 = false;
       this.dialogClose1()
       this.handleTableCallback();
-      this.option.callback && this.option.callback(this.resultData);
-    },
+      let fileRaw = this.fileRaw;
+      this.parentTarget.handleCustomEvent(importOption.onSuccessImport, ['resultData', 'file'], [this.resultData, this.fileRaw])
+      this.option.callback && this.option.callback(this.resultData, this.fileRaw);
+    },*/
     handleTableCallback(flag) {
       if (flag === 0) return;
       let importOption = this.option.importOption;
@@ -312,7 +355,7 @@ tmixins = {
             that.showContent = false;
             that.clearImportTimer();*/
             that.$baseAlert(this.$t2('请使用正确的导入模版！', 'components.excelImport.warmMsg2'));
-            that.dialogClose2(0);
+            that.handleClose2();
             return false;
           }
           var range = configUtil.XLSX.utils.decode_range(sheet['!ref']);
@@ -378,7 +421,7 @@ tmixins = {
             // that.showContent = false;
             // that.clearImportTimer();
             that.$baseAlert(this.$t2('请使用正确的导入模版！', 'components.excelImport.warmMsg2'));
-            that.dialogClose2(0);
+            that.handleClose2();
             return false;
           }
 
@@ -393,7 +436,7 @@ tmixins = {
                 // that.showContent = false;
                 // that.clearImportTimer();
                 that.$baseAlert(this.$t2('请使用正确的导入模版！', 'components.excelImport.warmMsg2'));
-                that.dialogClose2(0);
+                that.handleClose2();
                 return false;
               }
               let t = title.substr(-1);
@@ -448,6 +491,7 @@ tmixins = {
                       lineNo: (j + 4),
                       title: oriCol.title
                     }));
+                    that.handleClose2();
                     return false;
                   }
                 }
@@ -834,6 +878,9 @@ tmixins = {
     clearImportTimer() {
       clearInterval(importTimer);
       loadingObj && loadingObj.close();
+    },
+    getWidgetTarget() {
+
     },
     async dialogPrimary3() {
       if (!(this.fileRaw)) {
@@ -846,13 +893,27 @@ tmixins = {
         target: document.body,
         background: 'unset'
       });
-      let done = () => {
-        that.showImportDialog = false;
-      }
+
+      let importOption = option.importOption;
       this.readExcel(this.fileRaw, function (resultData) {
+        let file = that.fileRaw;
+        let flag = false;
+        let done = () => {
+          if (flag) return
+          flag = true;
+          that.showImportDialog = false;
+          that.parentTarget.handleCustomEvent(importOption.onSuccessImport, ['resultData', 'file'], [resultData, file])
+        }
         try {
-          if (option.callback && option.callback(resultData, that.fileRaw, done) !== false) {
-            that.showImportDialog = false;
+
+          if (importOption.onConfirmImportEnabled) {
+            if (that.parentTarget.handleCustomEvent(importOption.onConfirmImport, ['resultData', 'file', 'done'], [resultData, file, done]) !== false) {
+              done();
+            }
+          } else if (importOption.tableRef) {
+            let tableRef = that.parentTarget.getWidgetRef(importOption.tableRef);
+            tableRef && tableRef.addTableData(resultData.data)
+            done()
           }
         } catch (et) {
           console.error(et);

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,
-        importFrontOnly: !!this.field.options.importFrontOnly,
+        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/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -1,12 +1,9 @@
 <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-switch v-model="optionModel.importFrontOnly"></el-switch>
-    </el-form-item>
-    <el-form-item label="导入数据表名" v-if="!optionModel.importFrontOnly">
+    <el-form-item label="导入数据表名">
       <el-input v-model="optionModel.importEntity"></el-input>
     </el-form-item>
     <el-form-item label="文件大小限制（M）">
@@ -22,28 +19,27 @@
         <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
       </el-input>
     </el-form-item>
-    <template v-if="!optionModel.importFrontOnly">
-      <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-switch v-model="optionModel.enabledImportPreHandle"></el-switch>
-      </el-form-item>
-      <el-form-item label="导入前数据处理" label-width="150px">
-        <a href="javascript:void(0);" class="a-link link-oneLind"
-           @click="editEventHandler('onBeforeImport', onBeforeImportParams)">
-          <span>{{ optionModel.onBeforeImport }}</span>
-          <i class="el-icon-edit"></i>
-        </a>
-      </el-form-item>
-    </template>
-    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.importFrontOnly">
+    <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="导入前数据处理" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onBeforeImport', onBeforeImportParams)">
+        <span>{{ optionModel.onBeforeImport }}</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('onConfirmImport', onConfirmImportParams)">
-        <span>{{ optionModel.onConfirmImport }}</span>
+         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
+        <span>{{ optionModel.onSuccessImport }}</span>
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
@@ -73,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: "",
 
-      importFrontOnly: 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: "级联选择",