cloud-web-corejs 1.0.54-dev.50 → 1.0.54-dev.501

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

@@ -1,54 +1,108 @@
 <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>
     </el-form-item>
-    <el-form-item label="选择导入模板文件">
+    <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"
+        :value="optionModel.importAttachCode"
         clearable
+        @clear="
+          optionModel.importAttachCode = null;
+          optionModel.importAttachName = null;
+        "
       >
-        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
+        <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 label="导入模板文件名称">
+      <span>{{ optionModel.importAttachName }}</span>
     </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="多sheet导入">
+      <el-switch v-model="optionModel.multipleSheet"></el-switch>
+    </el-form-item>
+    <el-form-item label="批量导入">
+      <el-switch v-model="optionModel.importMultiple"></el-switch>
+    </el-form-item>
+    <el-form-item label="批量导入大小">
+      <base-input-number
+        v-model="optionModel.importMultiSize"
+        :max="200"
+      ></base-input-number>
+    </el-form-item>
+    <el-form-item label="点击前置事件" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onBeforeClickButton', eventParams)">
+        <span>{{ optionModel.onBeforeClickButton }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </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)">
+      <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>
-    <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
-                           @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
+
+    <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>
+    <el-form-item label="隐藏取消按钮" label-width="150px">
+      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
+    </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 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: "import-button-editor",
-  components: {bdAttachSettingDialog},
+  components: { bdAttachSettingDialog },
   mixins: [i18n, eventMixin],
   props: {
     designer: Object,
@@ -57,19 +111,22 @@ export default {
   },
   data() {
     return {
-      eventParams: [],
+      eventParams: ["dataId", "formCode", "done"],
       showBdAttachSettingDialog: false,
-      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done']
+      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.importAttachName = row.name;
         this.optionModel.importAttachCode = row.code;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 

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

@@ -0,0 +1,96 @@
+<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"
+        :value="optionModel.importAttachCode"
+        clearable
+        @clear="optionModel.importAttachCode=null;optionModel.importAttachName=null;"
+      >
+        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
+      </el-input>
+    </el-form-item>
+    <el-form-item label="导入模板文件名称">
+      <span>{{ optionModel.importAttachName }}</span>
+    </el-form-item>
+
+    <el-form-item label="关联表格唯一名称">
+      <el-input v-model="optionModel.tableRef"></el-input>
+    </el-form-item>
+    <el-form-item label="点击前置事件" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onBeforeClickButton', eventParams)">
+        <span>{{ optionModel.onBeforeClickButton }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </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>
+    <el-form-item label="隐藏取消按钮" label-width="150px">
+      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
+    </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: ["dataId", "formCode", "done"],
+      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.importAttachName = row.name;
+        this.optionModel.importAttachCode = row.code;
+      }
+    }
+  }
+};
+</script>
+
+<style scoped></style>

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

@@ -3,23 +3,53 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider">打印设置</el-divider>
     </el-form-item>
+    <!-- <el-form-item label="启用自定义按钮名称">
+      <el-switch v-model="optionModel.customLabelEnabled"></el-switch>
+    </el-form-item> -->
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.printTableRef"></el-input>
     </el-form-item>
+    <!-- <el-form-item label="打印自定义条件参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('printCustomCondition', printConditionParams)">
+        <span>{{ optionModel.printCustomCondition }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item> -->
     <el-form-item label="输出模板编码"></el-form-item>
     <el-form-item label-width="0">
-      <draggable tag="ul" class="draggable-box" :list="optionModel.printItems"
-                 v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }">
+      <draggable
+        tag="ul"
+        class="draggable-box"
+        :list="optionModel.printItems"
+        v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+      >
         <li v-for="(item, index) in optionModel.printItems" :key="index" class="col-item">
           <i class="el-icon-s-operation drag-option"></i>
-          <el-input v-model="item.code" class="cell-span-input" style="width: 160px !important;"></el-input>
-          <el-button circle plain size="mini" type="danger" @click="deleteItem(index)"
-                     icon="el-icon-minus" class="col-delete-button" style="position: unset;"></el-button>
+          <el-input
+            v-model="item.code"
+            class="cell-span-input"
+            style="width: 160px !important"
+          ></el-input>
+          <el-button
+            circle
+            plain
+            size="mini"
+            type="danger"
+            @click="deleteItem(index)"
+            icon="el-icon-minus"
+            class="col-delete-button"
+            style="position: unset"
+          ></el-button>
         </li>
       </draggable>
       <div>
-        <el-button type="text" @click="addItem" icon="el-icon-circle-plus-outline"
-                   class="add-option">
+        <el-button
+          type="text"
+          @click="addItem"
+          icon="el-icon-circle-plus-outline"
+          class="add-option"
+        >
           新增
         </el-button>
       </div>
@@ -29,9 +59,8 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin
-  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
-import Draggable from 'vuedraggable';
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import Draggable from "vuedraggable";
 
 export default {
   name: "print-button-editor",
@@ -47,16 +76,17 @@ export default {
   data() {
     return {
       eventParams: [],
+      printConditionParams: ["dataId", "formCode", "exportTemplate"],
     };
   },
   methods: {
     deleteItem(index) {
-      this.optionModel.printItems.splice(index, 1)
+      this.optionModel.printItems.splice(index, 1);
     },
     addItem() {
-      this.optionModel.printItems.push({code: null});
-    }
-  }
+      this.optionModel.printItems.push({ code: null });
+    },
+  },
 };
 </script>
 
@@ -83,4 +113,3 @@ li.ghost {
   width: 100px;
 }
 </style>
-

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

@@ -0,0 +1,115 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">详情打印设置</el-divider>
+    </el-form-item>
+    <!-- <el-form-item label="启用自定义按钮名称">
+      <el-switch v-model="optionModel.customLabelEnabled"></el-switch>
+    </el-form-item> -->
+    <el-form-item label="打印自定义条件参数">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('printCustomCondition', printConditionParams)"
+      >
+        <span>{{ optionModel.printCustomCondition }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="输出模板编码"></el-form-item>
+    <el-form-item label-width="0">
+      <draggable
+        tag="ul"
+        class="draggable-box"
+        :list="optionModel.printItems"
+        v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+      >
+        <li v-for="(item, index) in optionModel.printItems" :key="index" class="col-item">
+          <i class="el-icon-s-operation drag-option"></i>
+          <el-input
+            v-model="item.code"
+            class="cell-span-input"
+            style="width: 160px !important"
+          ></el-input>
+          <el-button
+            circle
+            plain
+            size="mini"
+            type="danger"
+            @click="deleteItem(index)"
+            icon="el-icon-minus"
+            class="col-delete-button"
+            style="position: unset"
+          ></el-button>
+        </li>
+      </draggable>
+      <div>
+        <el-button
+          type="text"
+          @click="addItem"
+          icon="el-icon-circle-plus-outline"
+          class="add-option"
+        >
+          新增
+        </el-button>
+      </div>
+    </el-form-item>
+  </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 Draggable from "vuedraggable";
+
+export default {
+  name: "print-detail-button-editor",
+  mixins: [i18n, eventMixin],
+  components: {
+    Draggable,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: [],
+      printConditionParams: ["dataId", "formCode", "exportTemplate"],
+    };
+  },
+  methods: {
+    deleteItem(index) {
+      this.optionModel.printItems.splice(index, 1);
+    },
+    addItem() {
+      this.optionModel.printItems.push({ code: null });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.option-items-pane ul {
+  padding-inline-start: 6px;
+  padding-left: 6px; /* 重置IE11默认样式 */
+}
+
+li.ghost {
+  background: #fff;
+  border: 2px dotted $--color-primary;
+}
+
+.drag-option {
+  cursor: move;
+}
+
+.small-padding-dialog ::v-deep .el-dialog__body {
+  padding: 10px 15px;
+}
+
+.dialog-footer .el-button {
+  width: 100px;
+}
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-rate/rate-defaultValue-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.defaultValue')">
-    <el-input-number v-model="optionModel.defaultValue" :min="0" :max="optionModel.max" style="width: 100%"
+    <el-input-number v-model="optionModel.defaultValue" :max="optionModel.max" style="width: 100%"
                      @change="emitDefaultValueChange">
     </el-input-number>
   </el-form-item>

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

@@ -1,8 +1,32 @@
 <template>
   <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">选项设置</el-divider>
+    </el-form-item>
+    <el-form-item label="选项值类型">
+      <el-radio-group v-model="optionModel.optionItemValueType" @change="changeValueType">
+        <el-radio :label="0">文本</el-radio>
+        <el-radio :label="1">数值</el-radio>
+        <el-radio :label="2">布尔值</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="默认值">
+        <el-input v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="!optionModel.optionItemValueType"></el-input>
+        <base-input-number v-model="optionModel.defaultValue" size="mini" style="width: 100%" v-if="optionModel.optionItemValueType==1" />
+        <el-select v-model="optionModel.defaultValue" style="width: 100%" v-if="optionModel.optionItemValueType===2" clearable @clear="optionModel.defaultValue=null">
+          <el-option :value="true" label="true"></el-option>
+          <el-option :value="false" label="false"></el-option>
+        </el-select>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示字段')" v-if="optionModel.commonAttributeEnabled || optionModel.formScriptEnabled">
+      <el-input type="text" v-model="optionModel.labelKey" placeholder="默认label" :disabled="optionModel.commonAttributeEnabled"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('关联字段')" v-if="optionModel.commonAttributeEnabled || optionModel.formScriptEnabled">
+      <el-input type="text" v-model="optionModel.valueKey" placeholder="默认value" :disabled="optionModel.commonAttributeEnabled"></el-input>
+    </el-form-item>
     <el-form-item label="状态配置">
       <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
-        <span>{{ optionModel.statusParam.length?"已维护":"" }}</span>
+        <span>{{ optionModel.statusParam.length ? "已维护" : "" }}</span>
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
@@ -15,20 +39,12 @@
       :close-on-click-modal="!1"
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
-      top="5vh"
-      width="1220px"
+      width="800px"
+      top="0px"
       v-dialog-drag
       @closed="closeHandle"
     >
       <div class="cont">
-        <el-form-item label="选项值类型">
-<!--          <el-switch v-model="optionItemValueType" @change="changeValueType"></el-switch>-->
-          <el-radio-group v-model="optionItemValueType" @change="changeValueType">
-            <el-radio :label="0">文本</el-radio>
-            <el-radio :label="1">数值</el-radio>
-            <el-radio :label="2">布尔值</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-table
           ref="singleTable"
           width="100%"
@@ -54,9 +70,9 @@
           </el-table-column>
           <el-table-column label="字段值" width="150" prop="value">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.value" v-if="optionItemValueType===0"></el-input>
-              <base-input-number v-model="scope.row.value"  v-if="optionItemValueType===1"></base-input-number>
-              <template v-if="optionItemValueType===2">{{scope.row.value}}</template>
+              <el-input v-model="scope.row.value" v-if="optionModel.optionItemValueType===0"></el-input>
+              <base-input-number v-model="scope.row.value" v-if="optionModel.optionItemValueType===1"></base-input-number>
+              <template v-if="optionModel.optionItemValueType===2">{{ scope.row.value }}</template>
             </template>
           </el-table-column>
           <el-table-column label="状态颜色" width="100" prop="type">
@@ -128,14 +144,15 @@ export default {
     selectedWidget: Object,
     optionModel: Object,
   },
-  data(){
+  data() {
     return {
-      showDialog:false,
-      tableData:[],
-      optionItemValueType:0
+      showDialog: false,
+      tableData: [],
+      optionItemValueType: 0,
+      defaultValue: null
     }
   },
-  methods:{
+  methods: {
     dragSort: function () {
       var e = this.$refs.singleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0],
         t = this.tableData;
@@ -150,51 +167,60 @@ export default {
         }
       });
     },
-    closeHandle(){
+    closeHandle() {
       this.showDialog = false;
     },
-    openDialog(){
+    openDialog() {
       this.optionItemValueType = this.optionModel.optionItemValueType
+      this.defaultValue = this.optionModel.defaultValue == null ? undefined : null
       this.tableData = this.$baseLodash.cloneDeep(this.optionModel.statusParam);
       this.showDialog = true;
       this.$nextTick(function () {
         this.dragSort();
       });
     },
-    addItem(){
+    addItem() {
       this.tableData.push({
-        value:null,
-        label:null,
-        type:null
+        value: null,
+        label: null,
+        type: null
       })
     },
-    confirmDialog(){
-      this.optionModel.optionItemValueType = this.optionItemValueType;
+    confirmDialog() {
+      // this.optionModel.optionItemValueType = this.optionItemValueType;
+      // this.optionModel.defaultValue = (this.defaultValue === "" || this.defaultValue === undefined) ? null : this.defaultValue;
       this.optionModel.statusParam = this.$baseLodash.cloneDeep(this.tableData);
       this.showDialog = false;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         let fieldWidget = this.designer.formWidget.getWidgetRef(this.optionModel.name);
         fieldWidget.refreshWidget();
       })
 
     },
-    deleteItem(rowIndex){
-      this.tableData.splice(rowIndex,1);
+    deleteItem(rowIndex) {
+      this.tableData.splice(rowIndex, 1);
     },
-    changeValueType(val){
-      this.tableData = [];
-      if(val==2){
-        this.tableData.push({
-          label:"是",
-          value:true,
-          type:"success"
+    changeValueType(val) {
+      // this.tableData = this.$baseLodash.cloneDeep(this.optionModel.statusParam);
+      this.optionModel.statusParam = [];
+      if (val == 2) {
+        this.optionModel.statusParam.push({
+          label: "是",
+          value: true,
+          type: "success"
         });
-        this.tableData.push({
-          label:"否",
-          value:false,
-          type:"danger"
+        this.optionModel.statusParam.push({
+          label: "否",
+          value: false,
+          type: "danger"
         });
       }
+      if (val == 1) {
+        this.optionModel.defaultValue = undefined
+      } else {
+        this.optionModel.defaultValue = null
+      }
+
     }
   }
 }