cloud-web-corejs 1.0.54-dev.66 → 1.0.54-dev.660

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

@@ -4,12 +4,28 @@
       <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>
+    <el-form-item label="弹框自定义参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('dialogCustomParam', ['dataId', 'formCode','rows'], option3)">
+        <span>{{ eventConfig.dialogCustomParam }}</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 +37,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>
@@ -40,6 +56,13 @@
         }}
       </el-button>
     </el-form-item>
+    <el-form-item label="确认回调">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option1)">
+        <span>{{ eventConfig.confirmCallback }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
 
     <el-dialog
       custom-class="dialog-style list-dialog"
@@ -51,7 +74,7 @@
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
       top="5vh"
-      width="500px"
+      width="600px"
       v-dialog-drag
     >
       <div class="cont">
@@ -69,6 +92,11 @@
               <el-input v-model="scope.row.targetField"></el-input>
             </template>
           </el-table-column>
+          <el-table-column label="目标数据属性名称" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetFormField"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="来源字段" width="150" prop="sourceField">
             <template slot-scope="scope">
               <el-input v-model="scope.row.sourceField"></el-input>
@@ -107,6 +135,7 @@
         </el-table>
       </div>
       <div class="dialog-footer" slot="footer">
+        <span class="fl tips">注：'目标字段'与'目标数据属性名称'只需要维护一个即可。</span>
         <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
           {{ i18nt('designer.hint.cancel') }}
         </el-button>
@@ -120,9 +149,12 @@
 
 <script>
 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],
+  mixins: [i18n, eventMixin, propertyMixin],
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -133,6 +165,33 @@ export default {
     return {
       showDialog: false,
       tableData: [],
+      option1: {
+        customCode: () => {
+          return this.eventConfig.confirmCallback;
+        },
+        callback: (code) => {
+          this.eventConfig.confirmCallback = code;
+          this.$forceUpdate()
+        }
+      },
+      option2: {
+        customCode: () => {
+          return this.eventConfig.dialogQueryParam;
+        },
+        callback: (code) => {
+          this.eventConfig.dialogQueryParam = code;
+          this.$forceUpdate()
+        }
+      },
+      option3: {
+        customCode: () => {
+          return this.eventConfig.dialogCustomParam;
+        },
+        callback: (code) => {
+          this.eventConfig.dialogCustomParam = code;
+          this.$forceUpdate()
+        }
+      },
     }
   },
   computed: {

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

@@ -0,0 +1,157 @@
+<template>
+  <div>
+    <el-form-item label="关联开始字段">
+      <el-select
+        v-if="dateFieldOptions.length"
+        v-model="optionModel.limitStartField"
+        filterable
+        clearable
+        placeholder="不能小于该字段值"
+      >
+        <el-option
+          v-for="item in dateFieldOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select>
+      <el-input
+        v-else
+        v-model="optionModel.limitStartField"
+        placeholder="请输入开始字段属性名"
+        clearable
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="关联结束字段">
+      <el-select
+        v-if="dateFieldOptions.length"
+        v-model="optionModel.limitEndField"
+        filterable
+        clearable
+        placeholder="不能大于该字段值"
+      >
+        <el-option
+          v-for="item in dateFieldOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select>
+      <el-input
+        v-else
+        v-model="optionModel.limitEndField"
+        placeholder="请输入结束字段属性名"
+        clearable
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="最小日期">
+      <el-date-picker
+        v-model="optionModel.minDate"
+        :type="pickerType"
+        :format="optionModel.format"
+        :value-format="optionModel.valueFormat"
+        style="width: 100%"
+        clearable
+        placeholder="留空则不限制"
+      ></el-date-picker>
+    </el-form-item>
+    <el-form-item label="最大日期">
+      <el-date-picker
+        v-model="optionModel.maxDate"
+        :type="pickerType"
+        :format="optionModel.format"
+        :value-format="optionModel.valueFormat"
+        style="width: 100%"
+        clearable
+        placeholder="留空则不限制"
+      ></el-date-picker>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import { loopHandleWidget } from "../../../../../../components/xform/utils/util";
+
+export default {
+  name: "date-dateLimit-editor",
+  mixins: [i18n, propertyMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+    tableColumns: Array,
+  },
+  computed: {
+    pickerType() {
+      return this.optionModel.type || "date";
+    },
+    currentFieldKey() {
+      return this.getFieldKeyByOptions(this.optionModel);
+    },
+    dateFieldOptions() {
+      let options = [];
+      if (this.tableColumns && this.tableColumns.length) {
+        this.collectDateFieldsFromColumns(this.tableColumns, options);
+      } else if (this.designer && this.designer.widgetList) {
+        loopHandleWidget(this.designer.widgetList, (widget) => {
+          if (widget.type !== "date" || widget.id === this.selectedWidget.id) {
+            return;
+          }
+          let fieldKey = this.getFieldKeyByOptions(widget.options);
+          if (fieldKey && fieldKey !== this.currentFieldKey) {
+            options.push({
+              value: fieldKey,
+              label: widget.options.label || fieldKey,
+            });
+          }
+        });
+      }
+      return options;
+    },
+  },
+  methods: {
+    getFieldKeyByOptions(options) {
+      if (!options) {
+        return "";
+      }
+      return (options.keyNameEnabled && options.keyName) || options.name || "";
+    },
+    collectDateFieldsFromColumns(columns, options) {
+      columns.forEach((col) => {
+        if (col.children && col.children.length) {
+          this.collectDateFieldsFromColumns(col.children, options);
+          return;
+        }
+        if (!this.isDateColumn(col)) {
+          return;
+        }
+        let fieldKey = col.prop;
+        if (col.columnOption) {
+          fieldKey = this.getFieldKeyByOptions(col.columnOption) || fieldKey;
+        }
+        if (col.editColumnOption) {
+          fieldKey =
+            this.getFieldKeyByOptions(col.editColumnOption) || fieldKey;
+        }
+        if (fieldKey && fieldKey !== this.currentFieldKey) {
+          options.push({
+            value: fieldKey,
+            label: col.label || fieldKey,
+          });
+        }
+      });
+    },
+    isDateColumn(col) {
+      return (
+        col.formatS === "date" ||
+        col.formatS === "editDate" ||
+        col.editFormatS === "editDate" ||
+        col.widget?.type === "date" ||
+        col.editWidget?.type === "date"
+      );
+    },
+  },
+};
+</script>

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-gantt/gantt-editor.vue

@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-form-item label="自定义甘特图配置" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('ganttConfig', ganttConfigParams)"
+      >
+        <span>{{ optionModel.ganttConfig }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </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";
+
+export default {
+  name: "gantt-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      ganttConfigParams: ["dataId", "formCode"],
+    };
+  },
+};
+</script>
+
+<style scoped></style>

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", "close"],
+      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', "close"],
+      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>