cloud-web-corejs 1.0.94 → 1.0.96

package/src/components/xform/form-designer/setting-panel/option-items-setting.vue

@@ -8,9 +8,14 @@
       </el-radio-group>
     </el-form-item>
 
-<!--    <el-form-item label="选项值为数值">
-      <el-switch v-model="optionModel.isNumericOptionItemValue" @change="changeValueType"></el-switch>
-    </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: 100px" v-if="optionModel.optionItemValueType==1" />
+      <el-select v-model="optionModel.defaultValue" style="width: 100px" 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-radio-group
 			v-if="selectedWidget.type === 'radio' || (selectedWidget.type === 'select' && !selectedWidget.options.multiple)"
 			v-model="optionModel.defaultValue"

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

@@ -3,7 +3,7 @@
     <el-form-item :label="i18nt('显示下划线')">
       <el-switch v-model="optionModel.underline"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('表单值显示')">
+    <el-form-item :label="i18nt('表单值显示')" v-if="selectedWidget.type!=='a-link2'">
       <el-switch v-model="optionModel.isFormLabel"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('颜色')">

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

@@ -6,7 +6,7 @@
     <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
       <el-tab-pane :label="$t1('设计器')" name="first">
         <designer ref="designer" :formTemplate="formTemplate" @customConfirm="customConfirm" :columnFlag="true"
-                  :widgetList="widgetList"></designer>
+                  :widgetList="widgetList" :sourceData="sourceData"></designer>
       </el-tab-pane>
     </el-tabs>
     <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
@@ -27,7 +27,8 @@
 import PopupManager from 'element-ui/src/utils/popup/popup-manager.js'
 export default {
   props: {
-    column: Object
+    column: Object,
+    sourceData:Object
   },
   components: {
     designer: () => import("@base/views/user/form/vform/designer.vue"),

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

@@ -123,7 +123,7 @@
           <template #default="scope">
             <el-select
               v-model="scope.row.formatS"
-              @change="changeFormatS(scope.row)"
+              @change="changeFormatS(scope.row,false)"
               clearable
             >
               <el-option-group
@@ -203,7 +203,7 @@
           <template #default="scope">
             <el-select
               v-model="scope.row.editFormatS"
-              @change="changeFormatS(scope.row)"
+              @change="changeFormatS(scope.row,true)"
               clearable
             >
               <el-option
@@ -341,7 +341,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <columnRenderDialog :column="currentTableColumn" v-if="showColumnRenderDialog"
+      <columnRenderDialog :column="currentTableColumn" :sourceData="sourceData" v-if="showColumnRenderDialog"
                           :visiable.sync="showColumnRenderDialog"
                           @confirm="confirmWidgetRenderDialog"></columnRenderDialog>
     </div>
@@ -499,8 +499,29 @@
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
 import Sortable from "sortablejs";
-import {generateId} from "../../../../../../components/xform/utils/util";
+import {generateId, loopHandleWidget,deepClone} from "../../../../../../components/xform/utils/util";
 import columnRenderDialog from "./columnRenderDialog.vue"
+import {businessFields} from "@base/components/xform/form-designer/widget-panel/widgetsConfig";
+
+let businessOptions = [
+  {
+    value: "_createBy",
+    label: "创建人",
+  },
+  {
+    value: "_modifyBy",
+    label: "更新人",
+  },
+  {
+    value: "create_date",
+    label: "创建时间",
+  },
+  {
+    value: "modify_date",
+    label: "更新时间",
+  },
+];
+let userFields = ["_createBy", "_modifyBy", "create_date", "modify_date"]
 
 export default {
   mixins: [i18n],
@@ -512,6 +533,7 @@ export default {
   components: {columnRenderDialog},
   inject: ["openWidgetPropertyDialog"],
   data() {
+
     return {
       pictLoading: true,
       tableColumnConfigTitle: null,
@@ -534,6 +556,8 @@ export default {
           label: "right",
         },
       ],
+      businessOptions,
+      userFields,
       op: [
         {
           label: "edit Format",
@@ -633,6 +657,11 @@ export default {
             },
           ],
         },
+
+        {
+          label: "业务模块",
+          options: businessOptions
+        },
         {
           label: "Date Format",
           options: [
@@ -721,6 +750,7 @@ export default {
       showRenderDialogFlag: !1,
       renderJson: "",
       currentTableColumn: null,
+      sourceData: null,
 
       hideAfter: 1500,
       openDelay: 500,
@@ -821,8 +851,14 @@ export default {
       this.optionModel.tableColumns = this.tableData;
       this.closeHandle();
     },
-    openWidgetRenderDialog(row) {
+    openWidgetRenderDialog(row, sourceData) {
       this.currentTableColumn = row;
+      this.sourceData = sourceData;
+
+      // this.widgetList =
+
+      // this.designer.widgetList
+
       this.showColumnRenderDialog = true
     },
     confirmWidgetRenderDialog(widgetList) {
@@ -1122,44 +1158,71 @@ export default {
       return isButtontCell;
     },
     //drag end
-    changeFormatS(row) {
-      let isButtontCell = this.getIsButtontCell(row.formatS);
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, true);
+    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;
-      if (columnSelectedWidget) {
-        row.columnOption = columnSelectedWidget.options;
-      } else {
-        row.columnOption = {};
-      }
-
-      if (row.formatS == "editTreeButtonGroup") {
-        row.prop = null;
-        row.label = null;
-        row.sortable = false;
-        row.width = 150;
-      } else if (isButtontCell) {
-        if (row.formatS == "aLink" || row.formatS == "button") {
-          if (!row.width || row.width == 47) row.width = 150;
+      if(!isEdit){
+        //格式化类型
+        if (columnSelectedWidget) {
+          row.columnOption = columnSelectedWidget.options;
+          row.widget = columnSelectedWidget;
         } else {
-          row.width = 47;
+          row.columnOption = {};
+          row.widget = null;
         }
-        row.prop = null;
-        row.label = null;
-        row.sortable = false;
-      } else {
-        let tmpId = "column" + generateId();
-        if (!row.width || row.width == 47) row.width = 150;
-        if (!row.prop) row.prop = tmpId;
-        if (!row.label) row.label = tmpId;
-        row.sortable = true;
+      }else{
+        //编辑插槽类型
+        if (columnSelectedWidget) {
+          row.columnOption = columnSelectedWidget.options;
+          row.editWidget = columnSelectedWidget;
+        } else {
+          row.editColumnOption = {};
+          row.editWidget = null;
+        }
+      }
 
-        if (row.formatS == "editAttachment") {
-          row.prop = this.designer.createAttachmentKeyName();
+      if(!isEdit){
+        if (row.formatS == "editTreeButtonGroup") {
+          row.prop = null;
+          row.label = null;
+          row.sortable = false;
+          row.width = 150;
+        } else if (isButtontCell) {
+          if (row.formatS == "aLink" || row.formatS == "button") {
+            if (!row.width || row.width == 47) row.width = 150;
+          } else {
+            row.width = 47;
+          }
+          row.prop = null;
+          row.label = null;
+          row.sortable = false;
         } else {
-          let attachmentPrefix = this.designer.getAttachmentPrefix();
-          row.prop = row.prop.replaceAll(attachmentPrefix, "");
+          let tmpId = "column" + generateId();
+          if (!row.width || row.width == 47) row.width = 150;
+          if (!row.prop) row.prop = tmpId;
+          if (!row.label) row.label = tmpId;
+
+          if (this.userFields.includes(row.formatS)) {
+            let item = this.businessOptions.find(item => item.value == row.formatS);
+            if (item) {
+              row.prop = item.value;
+              row.label = item.label;
+            }
+          }
+
+          row.sortable = true;
+
+          if (row.formatS == "editAttachment") {
+            row.prop = this.designer.createAttachmentKeyName();
+          } else {
+            let attachmentPrefix = this.designer.getAttachmentPrefix();
+            row.prop = row.prop.replaceAll(attachmentPrefix, "");
+          }
         }
       }
+
     },
     getColumnWidgetConfig(row, isChange, isEdit) {
       let formatS = isEdit ? row.editFormatS : row.formatS;
@@ -1167,14 +1230,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));
@@ -1185,6 +1240,12 @@ export default {
         let idVal = row.prop ? row.prop : (type + tmpId);*/
         /*columnSelectedWidget.id = idVal;*/
         // columnSelectedWidget.options.name = idVal;
+        /*if (isEdit) {
+          columnSelectedWidget.id = "edit_" + row.columnId;
+        } else {
+          columnSelectedWidget.id = row.columnId;
+        }*/
+        // columnSelectedWidget.id = row.columnId;
         let columnOption;
         if (!isEdit) {
           columnOption = row.columnOption;
@@ -1271,9 +1332,57 @@ export default {
       }
       return {columnSelectedWidget, columnEditFields};
     },
+    findColumnByColumnId(columnList, columnId) {
+      let result = null
+      if (columnList) {
+        let column = columnList.find(item => item.columnId == columnId);
+        if (!column) {
+
+        }
+        for (let column of columnList) {
+          if (column.columnId == columnId) {
+            result = column;
+            break
+          } else if (column.children && column.children.length) {
+            let subColumn = this.findColumnByColumnId(column.children, children)
+            if (subColumn) {
+              result = subColumn;
+              break
+            }
+          }
+
+        }
+      }
+      return result;
+    },
     openFormatConfigDialog(row, index) {
       if (row.formatS == 'widgetRender') {
-        this.openWidgetRenderDialog(row);
+        let formWidgetList = deepClone(this.designer.widgetList);
+        let tableData = deepClone(this.tableData);
+        let columnId = row.columnId;
+
+        let dataTableName = this.optionModel.name;
+
+
+        let targetColumn = null;
+        loopHandleWidget(formWidgetList, (item) => {
+          if (item.options.name == dataTableName) {
+            item.options.tableColumns = tableData;
+            targetColumn = this.findColumnByColumnId(item.options.tableColumns, columnId)
+          }
+        });
+        let getWidgetList = (subWidgetList = []) =>{
+          targetColumn.widgetList = this.$baseLodash.cloneDeep(subWidgetList);
+          return formWidgetList;
+        }
+        let sourceData = {
+          formWidgetList,
+          dataTableName,
+          columnId,
+          getWidgetList
+        }
+
+        this.openWidgetRenderDialog(row, sourceData);
         return
       }
 
@@ -1294,9 +1403,11 @@ export default {
       row.columnOption = columnOption;
       this.operateIndex = index;
 
+      let tableColumns = this.tableData;
       this.openWidgetPropertyDialog({
         row: row,
         columnSelectedWidget: selectedWidget,
+        tableColumns,
         index: index,
         columnEditFields: columnEditFields,
         callback: (columnOption) => {
@@ -1311,6 +1422,18 @@ export default {
     confirmFormatConfigDialog(columnOption, row) {
       // let row = this.tableData[this.operateIndex];
       row.columnOption = columnOption;
+
+      if(row.widget){
+        row.widget.options = columnOption;
+      }else{
+        let type = this.columnFormatMap[row.formatS];
+        let fieldWidget = this.designer.copyNewFieldWidget(
+          this.designer.getFieldWidgetByType(type)
+        )
+        fieldWidget.options = columnOption;
+        row.widget = fieldWidget;
+      }
+
       let isButtontCell = this.getIsButtontCell(row.formatS);
       if (!isButtontCell) {
         row.prop = this.getFieldKeyNameByOptions(columnOption);
@@ -1335,8 +1458,10 @@ export default {
       row.editColumnOption = columnOption;
       this.operateIndex = index;
 
+      let tableColumns = this.tableData;
       this.openWidgetPropertyDialog({
         row: row,
+        tableColumns,
         columnSelectedWidget: selectedWidget,
         index: index,
         columnEditFields: columnEditFields,
@@ -1348,6 +1473,19 @@ export default {
     confirmEditFormatConfigDialog(columnOption, row) {
       // let row = this.tableData[this.operateIndex];
       row.editColumnOption = columnOption;
+      // row.editWidget.options = columnOption;
+
+      if(row.editWidget){
+        row.editWidget.options = columnOption;
+      }else{
+        let type = this.columnFormatMap[row.editFormatS];
+        let fieldWidget = this.designer.copyNewFieldWidget(
+          this.designer.getFieldWidgetByType(type)
+        )
+        fieldWidget.options = columnOption;
+        row.editWidget = fieldWidget;
+      }
+
       /*row.prop = columnOption.name;
       row.label = columnOption.label;
       row.required = columnOption.required;*/

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));

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

@@ -4,12 +4,21 @@
       <el-divider class="custom-divider">选择弹框配置</el-divider>
     </el-form-item>
     <el-form-item label="是否多选">
-      <el-switch v-model="eventConfig.multipleChoices"></el-switch>
+      <el-switch v-model="eventConfig.multipleChoices"
+                 v-if="selectedWidget.type !== 'singerSearch' && selectedWidget.type !== 'multiSearch'"></el-switch>
+      <span v-else>{{eventConfig.multipleChoices?'是':'否'}}</span>
     </el-form-item>
     <el-form-item label="弹框表单编码">
       <el-input type="text" v-model="eventConfig.formCode"></el-input>
     </el-form-item>
-    <template v-if="selectedWidget.type == 'vabsearch'">
+    <el-form-item label="弹框参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option2)">
+        <span>{{ eventConfig.dialogQueryParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <template v-if="hasConfig('vabsearchFlag')">
       <el-form-item label="关联来源字段">
         <el-input type="text" v-model="eventConfig.valueSourceField"></el-input>
       </el-form-item>
@@ -21,7 +30,7 @@
     <!--      <el-form-item label="多选">
           <el-switch v-model="optionModel.multiple"></el-switch>
         </el-form-item>-->
-    <template v-if="selectedWidget.type != 'vabsearch'">
+    <template v-if="!hasConfig('vabsearchFlag')">
       <el-form-item label="关联表格">
         <el-switch v-model="eventConfig.tableEnabled"></el-switch>
       </el-form-item>
@@ -135,10 +144,10 @@
 import i18n from "../../../../../../components/xform/utils/i18n"
 import eventMixin
   from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
-
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
 
 export default {
-  mixins: [i18n, eventMixin],
+  mixins: [i18n, eventMixin, propertyMixin],
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -149,14 +158,23 @@ export default {
     return {
       showDialog: false,
       tableData: [],
-      option1:{
-        customCode:()=>{
+      option1: {
+        customCode: () => {
           return this.eventConfig.confirmCallback;
         },
-        callback:(code)=>{
+        callback: (code) => {
           this.eventConfig.confirmCallback = code;
           this.$forceUpdate()
         }
+      },
+      option2: {
+        customCode: () => {
+          return this.eventConfig.dialogQueryParam;
+        },
+        callback: (code) => {
+          this.eventConfig.dialogQueryParam = code;
+          this.$forceUpdate()
+        }
       }
     }
   },

package/src/components/xform/form-designer/setting-panel/property-editor/field-dropdown-menu/dropdown-item-editor.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+
+  </div>
+</template>
+<script>
+import i18n from "@base/components/xform/utils/i18n";
+
+export default {
+  name: "dropdown-menu-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <el-form-item :label="i18nt('designer.setting.tabPaneSetting')"></el-form-item>
+    <el-form-item label-width="0" class="panes-setting">
+      <draggable tag="ul" :list="selectedWidget.widgetList"
+                 v-bind="{group:'panesGroup', ghostClass: 'ghost', handle: '.drag-option'}" class="draggable-box">
+        <li v-for="(tpItem, tpIdx) in selectedWidget.widgetList" :key="tpIdx" class="col-item">
+          <el-input type="text" v-model="tpItem.options.label" style="width:calc(100% - 65px) !important;"></el-input>
+          <i class="el-icon-s-operation drag-option"></i>
+          <el-button circle plain size="mini" type="danger" @click="deleteTabPane(selectedWidget, tpIdx)"
+                     icon="el-icon-minus" class="col-delete-button"></el-button>
+        </li>
+        <div>
+          <el-button type="text" @click="addTabPane(selectedWidget)" icon="el-icon-circle-plus-outline" class="add-option">{{i18nt('designer.setting.addTabPane')}}</el-button>
+        </div>
+      </draggable>
+    </el-form-item>
+  </div>
+</template>
+<script>
+import i18n from "@base/components/xform/utils/i18n";
+import Draggable from 'vuedraggable'
+import {deepClone} from "../../../../../../components/xform/utils/util";
+
+export default {
+  name: "dropdown-menu-editor",
+  components: {Draggable},
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  methods: {
+    onTabPaneActiveChange(evt, tpItem) {
+      //TODO: !!!
+    },
+
+    addTabPane(curTabs) {
+      this.designer.addDropdownItem(curTabs)
+      this.designer.emitHistoryChange()
+    },
+
+    deleteTabPane(curTabs, tpIdx) {
+      if (curTabs.widgetList.length === 1) {
+        this.$message.info(this.i18nt('designer.hint.lastPaneCannotBeDeleted'))
+        return
+      }
+
+      this.designer.deleteDropdownItem(curTabs, tpIdx)
+      this.designer.emitHistoryChange()
+    },
+
+  }
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -9,16 +9,20 @@
     <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-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>
       </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>
@@ -77,6 +81,7 @@ export default {
     confirmBdAttachSettingDialog(rows) {
       if (rows.length) {
         let row = rows[0];
+        this.optionModel.importAttachName = row.name;
         this.optionModel.importAttachCode = row.code;
       }
     }

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

@@ -6,16 +6,21 @@
     <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-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>
       </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>
@@ -70,6 +75,7 @@ export default {
     confirmBdAttachSettingDialog(rows) {
       if (rows.length) {
         let row = rows[0];
+        this.optionModel.importAttachName = row.name;
         this.optionModel.importAttachCode = row.code;
       }
     }