cloud-web-corejs 1.0.129 → 1.0.130

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

@@ -609,6 +609,7 @@ import {
   generateId,
   loopHandleWidget,
   deepClone,
+  columnFormatMap
 } from "../../../../../../components/xform/utils/util";
 import columnRenderDialog from "./columnRenderDialog.vue";
 
@@ -865,28 +866,7 @@ export default {
       tableData: [], //树形结构数据转的数组
       tableDataArray: [],
       dragSort: null,
-      columnFormatMap: {
-        editInput: "input",
-        editNumber: "number",
-        editDate: "date",
-        editSelect: "select",
-        editSearch: "vabsearch",
-        editAttachment: "baseAttachment",
-        editStatus: "status",
-        aText: "a-text",
-        aLink: "a-link",
-        editDelete: "a-link",
-        editButton: "a-link",
-        button: "button",
-        addSiblingEditRow: "a-link",
-        addChildTreeRow: "a-link",
-        moveUpRow: "a-link",
-        moveDownRow: "a-link",
-        removeTreeRow: "a-link",
-        text: "text",
-        checkbox: "checkbox",
-        radio: "radio",
-      },
+      columnFormatMap,
 
       showFormEventDialogFlag: false,
       formEventHandlerCode: "",
@@ -1275,8 +1255,9 @@ export default {
     changeFormatS(row, isEdit) {
       let formatS = isEdit ? row.editFormatS : row.formatS;
       let isButtontCell = this.getIsButtontCell(formatS);
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, true, isEdit);
-      let { columnSelectedWidget, columnEditFields } = columnWidgetConfig;
+      // let columnWidgetConfig = this.getColumnWidgetConfig(row, true, isEdit);
+      // let { columnSelectedWidget, columnEditFields } = columnWidgetConfig;
+      let columnSelectedWidget = this.designer.createColumnWidget(row, isEdit)
       if (!isEdit) {
         //格式化类型
         if (columnSelectedWidget) {
@@ -1554,11 +1535,10 @@ export default {
         row.widget.options = columnOption;
       } else {
         let type = this.columnFormatMap[row.formatS];
-        let fieldWidget = this.designer.copyNewFieldWidget(
-          this.designer.getFieldWidgetByType(type)
-        );
+        let fieldWidget = this.designer.createColumnWidget(row, false);
         fieldWidget.options = columnOption;
         row.widget = fieldWidget;
+        this.$forceUpdate();
       }
 
       let isButtontCell = this.getIsButtontCell(row.formatS);
@@ -1569,20 +1549,7 @@ export default {
       }
     },
     openEditFormatConfigDialog(row, index) {
-      /*let option = row.columnOption;
-      let selectedWidget;
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, null, true);
-      let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
-      if (columnSelectedWidget) {
-        option = columnSelectedWidget.options;
-        selectedWidget = columnSelectedWidget;
-      } else {
-        option = {};
-        selectedWidget = {};
-      }
 
-      let columnOption = this.$baseLodash.cloneDeep(option);
-      row.editColumnOption = columnOption;*/
       let selectedWidget = row.editWidget;
       this.operateIndex = index;
 
@@ -1607,11 +1574,10 @@ export default {
         row.editWidget.options = columnOption;
       } else {
         let type = this.columnFormatMap[row.editFormatS];
-        let fieldWidget = this.designer.copyNewFieldWidget(
-          this.designer.getFieldWidgetByType(type)
-        );
+        let fieldWidget = this.designer.createColumnWidget(row, true);
         fieldWidget.options = columnOption;
         row.editWidget = fieldWidget;
+        this.$forceUpdate();
       }
 
       /*row.prop = columnOption.name;

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

@@ -29,6 +29,13 @@
     <el-form-item label="执行后台脚本编码">
       <el-input v-model="optionModel.importScriptCode"></el-input>
     </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="启用图片处理">
       <el-switch v-model="optionModel.enabledImportPreHandle"></el-switch>
     </el-form-item>

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

@@ -6,6 +6,13 @@
     <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"
@@ -47,6 +54,7 @@ export default {
   data() {
     return {
       eventParams: [],
+      printConditionParams: ["dataId", "formCode", "exportTemplate"]
     };
   },
   methods: {

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

@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">详情打印设置</el-divider>
+    </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-status/field-status-editor.vue

@@ -1,5 +1,29 @@
 <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>
@@ -15,30 +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="选项值类型" style="width: 350px;">
-          <!--          <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-form-item label="默认值" style="width: 300px;">
-          <el-input v-model="defaultValue" v-if="!optionItemValueType"></el-input>
-          <base-input-number v-model="defaultValue" ref="defaultNumberInput"
-                             v-if="optionItemValueType==1"/>
-          <el-select v-model="defaultValue" v-if="optionItemValueType===2" clearable
-                     @clear="defaultValue=null">
-            <el-option :value="true" label="true"></el-option>
-            <el-option :value="false" label="false"></el-option>
-          </el-select>
-        </el-form-item>
         <el-table
           ref="singleTable"
           width="100%"
@@ -64,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">
@@ -181,8 +187,8 @@ export default {
       })
     },
     confirmDialog() {
-      this.optionModel.optionItemValueType = this.optionItemValueType;
-      this.optionModel.defaultValue = (this.defaultValue === "" || this.defaultValue === undefined) ? null : this.defaultValue;
+      // 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(() => {
@@ -195,23 +201,24 @@ export default {
       this.tableData.splice(rowIndex, 1);
     },
     changeValueType(val) {
-      this.tableData = [];
+      // this.tableData = this.$baseLodash.cloneDeep(this.optionModel.statusParam);
+      this.optionModel.statusParam = [];
       if (val == 2) {
-        this.tableData.push({
+        this.optionModel.statusParam.push({
           label: "是",
           value: true,
           type: "success"
         });
-        this.tableData.push({
+        this.optionModel.statusParam.push({
           label: "否",
           value: false,
           type: "danger"
         });
       }
       if (val == 1) {
-        this.defaultValue = undefined
+        this.optionModel.defaultValue = undefined
       } else {
-        this.defaultValue = null
+        this.optionModel.defaultValue = null
       }
 
     }

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

@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <el-form-item label="上传信息获取脚本"></el-form-item>
+    <el-form-item label-width="0">
+      <el-input
+        v-model="optionModel.vabupload2_scriptCode"
+        placeholder="默认/intf/getHxFileUploadConfig"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="上传参数定义" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('vabupload2_uploadParam', params)"
+      >
+        <span>{{ optionModel.vabupload2_uploadParam }}</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('vabupload2_deleteParam', params)"
+      >
+        <span>{{ optionModel.vabupload2_deleteParam }}</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('vabupload2_getFileParam', params)"
+      >
+        <span>{{ optionModel.vabupload2_getFileParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n";
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+export default {
+  name: "field-vabUpload2-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      params: ["dataId", "formCode"],
+    };
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -14,7 +14,7 @@
       <el-form-item label="表单脚本编码" v-if="optionModel.formScriptEnabled">
         <el-input v-model="optionModel.formScriptCode" clearable></el-input>
       </el-form-item>
-      <el-form-item label="查询参数" v-if="optionModel.formScriptEnabled">
+      <el-form-item label="查询参数" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
         <a href="javascript:void(0);" class="a-link link-oneLind"
            @click="editEventHandler('formScriptParam', ['dataId', 'formCode'])">
           <span>{{ optionModel.formScriptParam }}</span>
@@ -29,14 +29,14 @@
       <el-form-item :label="i18nt('词汇编码')" v-if="optionModel.commonAttributeEnabled">
         <el-input type="text" v-model="optionModel.commonAttributeCode"></el-input>
       </el-form-item>
-      <el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled">
-        <el-input type="text" v-model="optionModel.labelKey"></el-input>
-      </el-form-item>
-      <el-form-item :label="i18nt('关联字段')" v-if="optionModel.formScriptEnabled">
-        <el-input type="text" v-model="optionModel.valueKey"></el-input>
+      <!-- <el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
+        <el-input type="text" v-model="optionModel.labelKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
       </el-form-item>
+      <el-form-item :label="i18nt('关联字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
+        <el-input type="text" v-model="optionModel.valueKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
+      </el-form-item> -->
     </template>
-    <el-form-item label="查询回调">
+    <el-form-item label="查询回调" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="editEventHandler('formScriptSuccess', ['dataId', 'formCode','res'])">
         <span>{{ optionModel.formScriptSuccess }}</span>
@@ -61,7 +61,7 @@ export default {
   },
   data() {
     return {
-      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census']
+      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census','status']
     }
   },
   methods: {
@@ -70,20 +70,25 @@ export default {
     },
     changeFormScriptEnabled(val){
       if(val){
-        if(this.optionModel.hasOwnProperty("commonAttributeEnabled")){
-          this.optionModel.commonAttributeEnabled = false
-        }
+        this.optionModel.commonAttributeEnabled = false
       }
+      this.handleLabelAndValueKey();
     },
     changeCommonAttributeEnabled(val){
       if(val){
         this.optionModel.formScriptEnabled = false;
+      }
+      this.handleLabelAndValueKey();
+    },
+    handleLabelAndValueKey(){
+      if(this.optionModel.commonAttributeEnabled){
         this.optionModel.labelKey = "value";
         this.optionModel.valueKey = "sn";
-      }else{
-          this.optionModel.labelKey = null;
-          this.optionModel.valueKey = null;
+      }else {
+        this.optionModel.labelKey = "label";
+        this.optionModel.valueKey = "value";
       }
+
     }
   }
 }

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

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <el-form-item :label="i18nt('脚本编码')">
+      <el-input type="text" v-model="optionModel.formScriptCode"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('日志类型')">
+      <el-input type="text" v-model="optionModel.oplogTypeCode" placeholder="默认表单模板编码"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('业务唯一字段')">
+      <el-input type="text" v-model="optionModel.oplogBusinessKey" placeholder="默认单据id"></el-input>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "../../../utils/i18n"
+
+  export default {
+    name: "oplogFlag-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -116,6 +116,8 @@ const COMMON_PROPERTIES = {
   'dropdownMenuFlag': 'dropdown-menu-editor',
   'dropdownItemFlag': 'dropdown-item-editor',
 
+  'oplogFlag': 'oplogFlag-editor',
+
   //弹框
   title: "title-editor",
   width: "width-editor",
@@ -149,11 +151,13 @@ const COMMON_PROPERTIES = {
   selectExportFlag: "select-export-button-editor",
   importEntity: "import-button-editor",
   frontImportFlag: "import2-button-editor",
-  printTableRef: "print-button-editor",
+  printButtonFlag: "print-button-editor",
+  printDetailButtonFlag: "print-detail-button-editor",
   statusParam: "field-status-editor",
   // searchDialogEventEnabled: "search-dialog-event-editor"
   clickBindEvent: "clickBindEvent-editor",
   vabUpload: "field-vabUpload-editor",
+  vabUpload2Flag: "field-vabUpload2-editor",
   "submitFlag": "submitFlag-editor",
   "aLinkFlag": "a-link-editor",
   "aTextFlag": "a-text-editor",