cloud-web-corejs 1.0.54-dev.646 → 1.0.54-dev.648

package/package.json

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

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

@@ -140,78 +140,82 @@
     </el-dialog>
 
     <el-dialog
-      :title="i18nt('配置编辑')"
-      v-if="showDateConfigDialog"
-      :visible.sync="showDateConfigDialog"
+      v-for="dlg in widgetPropertyDialogs"
+      :key="dlg.id"
+      :title="dlg.title || i18nt('配置编辑')"
+      :visible.sync="dlg.visible"
       :modal="false"
       :show-close="!0"
       custom-class="dialog-style list-dialog"
       :close-on-click-modal="!1"
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
+      append-to-body
       v-el-drag-dialog
       v-el-dialog-center
+      :before-close="(done) => handleWidgetPropertyDialogBeforeClose(dlg, done)"
+      @mousedown.native="setActivePropertyDialog(dlg.id)"
     >
       <div class="cont" style="height: auto;max-height: 500px;">
         <el-scrollbar class="setting-scrollbar">
-          <el-form :model="columnSelectedWidget.options" size="mini" label-position="left" label-width="120px" class="setting-form"
+          <el-form :model="dlg.columnSelectedWidget.options" size="mini" label-position="left" label-width="120px" class="setting-form"
                    @submit.native.prevent>
-            <el-collapse v-model="widgetActiveCollapseName1s" class="setting-collapse">
-              <el-collapse-item name="1" v-if="showCollapse1(commonProps)"
+            <el-collapse v-model="dlg.widgetActiveCollapseName1s" class="setting-collapse">
+              <el-collapse-item name="1" v-if="showCollapseForDialog(dlg, commonProps)"
                                 :title="i18nt('designer.setting.commonSetting')">
                 <template v-for="(editorName, propName) in commonProps">
                   <component
-                    v-if="hasPropEditor1(propName, editorName)"
-                    :is="getPropEditor1(propName, editorName)"
+                    v-if="hasPropEditorForDialog(dlg, propName, editorName)"
+                    :is="getPropEditorForDialog(dlg, propName, editorName)"
                     :designer="designer"
-                    :selected-widget="columnSelectedWidget"
-                    :option-model="columnSelectedWidget.options"
-                    :tableColumns="tableColumns"
-                    :key="propName"
+                    :selected-widget="dlg.columnSelectedWidget"
+                    :option-model="dlg.columnSelectedWidget.options"
+                    :tableColumns="dlg.tableColumns"
+                    :key="dlg.id + '-common-' + propName"
                   ></component>
                 </template>
               </el-collapse-item>
 
-              <el-collapse-item name="2" v-if="showCollapse1(advProps)"
+              <el-collapse-item name="2" v-if="showCollapseForDialog(dlg, advProps)"
                                 :title="i18nt('designer.setting.advancedSetting')">
                 <template v-for="(editorName, propName) in advProps">
                   <component
-                    v-if="hasPropEditor1(propName, editorName)"
-                    :is="getPropEditor1(propName, editorName)"
+                    v-if="hasPropEditorForDialog(dlg, propName, editorName)"
+                    :is="getPropEditorForDialog(dlg, propName, editorName)"
                     :designer="designer"
-                    :selected-widget="columnSelectedWidget"
-                    :option-model="columnSelectedWidget.options"
-                    :tableColumns="tableColumns"
-                    :key="propName"
+                    :selected-widget="dlg.columnSelectedWidget"
+                    :option-model="dlg.columnSelectedWidget.options"
+                    :tableColumns="dlg.tableColumns"
+                    :key="dlg.id + '-adv-' + propName"
                   ></component>
                 </template>
               </el-collapse-item>
-              <el-collapse-item name="4" v-if="showCollapse1(wfProps)"
+              <el-collapse-item name="4" v-if="showCollapseForDialog(dlg, wfProps)"
                                 :title="i18nt('流程属性')">
                 <template v-for="(editorName, propName) in wfProps">
                   <component
-                    v-if="hasPropEditor1(propName, editorName)"
-                    :is="getPropEditor1(propName, editorName)"
+                    v-if="hasPropEditorForDialog(dlg, propName, editorName)"
+                    :is="getPropEditorForDialog(dlg, propName, editorName)"
                     :designer="designer"
-                    :selected-widget="columnSelectedWidget"
-                    :option-model="columnSelectedWidget.options"
-                    :tableColumns="tableColumns"
-                    :key="propName"
+                    :selected-widget="dlg.columnSelectedWidget"
+                    :option-model="dlg.columnSelectedWidget.options"
+                    :tableColumns="dlg.tableColumns"
+                    :key="dlg.id + '-wf-' + propName"
                   ></component>
                 </template>
               </el-collapse-item>
 
-              <el-collapse-item name="3" v-if="showEventCollapse1() && showCollapse1(eventProps)"
+              <el-collapse-item name="3" v-if="showEventCollapse1() && showCollapseForDialog(dlg, eventProps)"
                                 :title="i18nt('designer.setting.eventSetting')">
                 <template v-for="(editorName, propName) in eventProps">
                   <component
-                    v-if="hasPropEditor1(propName, editorName)"
-                    :is="getPropEditor1(propName, editorName)"
+                    v-if="hasPropEditorForDialog(dlg, propName, editorName)"
+                    :is="getPropEditorForDialog(dlg, propName, editorName)"
                     :designer="designer"
-                    :selected-widget="columnSelectedWidget"
-                    :option-model="columnSelectedWidget.options"
-                    :tableColumns="tableColumns"
-                    :key="propName"
+                    :selected-widget="dlg.columnSelectedWidget"
+                    :option-model="dlg.columnSelectedWidget.options"
+                    :tableColumns="dlg.tableColumns"
+                    :key="dlg.id + '-event-' + propName"
                   ></component>
                 </template>
               </el-collapse-item>
@@ -220,10 +224,10 @@
         </el-scrollbar>
       </div>
       <div class="dialog-footer" slot="footer">
-        <el-button @click="showDateConfigDialog = !1" class="button-sty" icon="el-icon-close">
+        <el-button @click="closeWidgetPropertyDialog(dlg.id)" class="button-sty" icon="el-icon-close">
           {{ i18nt('designer.hint.cancel') }}
         </el-button>
-        <el-button type="primary" class="button-sty" @click="confirmWidgetPropertyDialog">
+        <el-button type="primary" class="button-sty" @click="confirmWidgetPropertyDialog(dlg)">
           {{ i18nt('designer.hint.confirm') }}
         </el-button>
       </div>
@@ -236,6 +240,7 @@ import PropertyEditors from './property-editor/index';
 import FormSetting from './form-setting';
 import dataSourceSetting from './dataSource-setting';
 import indexMixin from './indexMixin';
+import widgetPropertyDialogMixin from './widgetPropertyDialogMixin';
 
 export default {
   name: 'SettingPanel',
@@ -244,7 +249,7 @@ export default {
     dataSourceSetting,
     ...PropertyEditors
   },
-  mixins: [indexMixin],
+  mixins: [indexMixin, widgetPropertyDialogMixin],
 };
 </script>
 

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

@@ -136,10 +136,7 @@
       <el-divider class="custom-divider-margin-top">编辑表格设置</el-divider>
     </el-form-item>
     <el-form-item :label="i18nt('编辑表格')">
-      <el-switch
-        v-model="optionModel.isEditTable"
-        @change="onIsEditTableChange"
-      ></el-switch>
+      <el-switch v-model="optionModel.isEditTable"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('树表格')">
       <el-switch v-model="optionModel.isTreeTable"></el-switch>
@@ -150,88 +147,6 @@
     <el-form-item :label="i18nt('排序脚本编码')" v-if="optionModel.isEditTable">
       <el-input v-model="optionModel.sortScriptCode"></el-input>
     </el-form-item>
-    <template v-if="optionModel.isEditTable">
-      <el-form-item
-        label-width="0"
-        v-if="!optionModel.rowAddAuthName || !optionModel.rowEditAuthName"
-      >
-        <el-button
-          type="text"
-          icon="el-icon-refresh-right"
-          class="add-option"
-          @click="createRandomRowAuthNames"
-        >
-          随机生成权限名称
-        </el-button>
-      </el-form-item>
-      <el-form-item label="行新增权限名称">
-        <el-input
-          v-model="optionModel.rowAddAuthName"
-          placeholder="留空则不校验权限"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="行新增权限编码" v-if="rowAddAuthCode">
-        <div style="word-break: break-all">
-          <el-tooltip effect="light" content="复制">
-            <a
-              class="a-link"
-              style="color: unset"
-              @click="copyAuthCode(rowAddAuthCode, $event)"
-            >
-              <span
-                ><i class="el-icon-copy-document" style="margin-right: 2px"></i
-                >{{ rowAddAuthCode }}</span
-              >
-            </a>
-          </el-tooltip>
-        </div>
-      </el-form-item>
-      <el-form-item label="行编辑权限名称">
-        <el-input
-          v-model="optionModel.rowEditAuthName"
-          placeholder="留空则不校验权限"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="行编辑权限编码" v-if="rowEditAuthCode">
-        <div style="word-break: break-all">
-          <el-tooltip effect="light" content="复制">
-            <a
-              class="a-link"
-              style="color: unset"
-              @click="copyAuthCode(rowEditAuthCode, $event)"
-            >
-              <span
-                ><i class="el-icon-copy-document" style="margin-right: 2px"></i
-                >{{ rowEditAuthCode }}</span
-              >
-            </a>
-          </el-tooltip>
-        </div>
-      </el-form-item>
-      <el-form-item label="行新增显示条件" label-width="150px">
-        <a
-          href="javascript:void(0);"
-          class="a-link link-oneLind"
-          @click="editEventHandler('rowAddShow', rowShowParams)"
-        >
-          <span>{{ optionModel.rowAddShow ? "已维护" : "" }}</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('rowEditShow', rowShowParams)"
-        >
-          <span>{{ optionModel.rowEditShow ? "已维护" : "" }}</span>
-          <i class="el-icon-edit"></i>
-        </a>
-      </el-form-item>
-    </template>
-
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">明细导出设置</el-divider>
     </el-form-item>
@@ -428,7 +343,6 @@ import eventMixin from "../../../../../../components/xform/form-designer/setting
 import setttingConfig from "@/settings";
 
 import exportItemColumnsDialog from "./exportItemColumns-dialog.vue";
-import Clipboard from "clipboard";
 
 export default {
   name: "data-table-editor",
@@ -638,7 +552,6 @@ export default {
       },
       defaultCheckedKeys: [],
       tableConfigParams: ["dataId", "formCode"],
-      rowShowParams: ["row", "rowIndex"],
       showExportItemColumnsDialog: false,
     };
   },
@@ -667,12 +580,6 @@ export default {
         this.optionModel.isNotShowQueryButton = !val;
       },
     },
-    rowAddAuthCode() {
-      return this.getRowAuthCode(this.getRowAddAuthName());
-    },
-    rowEditAuthCode() {
-      return this.getRowAuthCode(this.getRowEditAuthName());
-    },
   },
   created: function () {
     // this.reportTemplate = this.getReportTemplate();
@@ -774,9 +681,9 @@ export default {
     handleShowButtonsColumnChange: function (e) {
       if (e) {
         var t = this.designer.formWidget.getSelectedWidgetRef();
-        t &&
-          t.refreshLayout &&
-          this.$nextTick(function () {
+        t
+          && t.refreshLayout
+          && this.$nextTick(function () {
             t.refreshLayout();
           });
       }
@@ -789,8 +696,8 @@ export default {
       this.optionModel.operationButtons.map(function (n, o) {
         n.name === e && o !== t && (i = !0);
       }),
-        i &&
-          (this.$message.error(
+        i
+          && (this.$message.error(
             this.i18nt("designer.setting.operationButtonDuplicatedNameError")
           ),
           (this.optionModel.operationButtons[t].name = this.oldButtonName));
@@ -831,9 +738,9 @@ export default {
     },
     refreshTableLayout: function () {
       var e = this.designer.formWidget.getSelectedWidgetRef();
-      e &&
-        e.refreshLayout &&
-        this.$nextTick(function () {
+      e
+        && e.refreshLayout
+        && this.$nextTick(function () {
           e.refreshLayout();
         });
     },
@@ -891,9 +798,9 @@ export default {
         columnSelectedWidget.id = idVal;
         columnSelectedWidget.options.name = idVal;
         if (
-          !isChange &&
-          row.columnOption &&
-          Object.keys(row.columnOption).length
+          !isChange
+          && row.columnOption
+          && Object.keys(row.columnOption).length
         ) {
           row.columnOption.required = row.required || false;
           columnSelectedWidget.options = row.columnOption;
@@ -1009,8 +916,8 @@ export default {
       this.treeData.forEach((item1) => {
         item1.children.forEach((item2) => {
           if (
-            fields.includes(item2.name) &&
-            !defaultCheckedKeys.includes(item2.name)
+            fields.includes(item2.name)
+            && !defaultCheckedKeys.includes(item2.name)
           ) {
             defaultCheckedKeys.push(item2.name);
           }
@@ -1054,10 +961,10 @@ export default {
       this.showTableConfigDialog = true;
     },
     downloadExcel() {
-      let defaultUrl =
-        "http://file.sc.5mall.com/download/repo1/b/mk1/2024/12/13/b2aea548-a9a8-4dca-bba7-8d9c6134ebe3.xlsx";
-      let xformImportTemplateFile =
-        setttingConfig.xformImportTemplateFile || defaultUrl;
+      let defaultUrl
+        = "http://file.sc.5mall.com/download/repo1/b/mk1/2024/12/13/b2aea548-a9a8-4dca-bba7-8d9c6134ebe3.xlsx";
+      let xformImportTemplateFile
+        = setttingConfig.xformImportTemplateFile || defaultUrl;
       if (!xformImportTemplateFile) return;
       this.$commonFileUtil.downloadFile(
         xformImportTemplateFile,
@@ -1073,73 +980,6 @@ export default {
     openExportItemColumnsDialog() {
       this.showExportItemColumnsDialog = true;
     },
-    getRowAddAuthName() {
-      return this.optionModel.rowAddAuthName ?? this.optionModel.treeRowAddName;
-    },
-    getRowEditAuthName() {
-      return (
-        this.optionModel.rowEditAuthName ?? this.optionModel.treeRowEditName
-      );
-    },
-    getRowAuthCode(authName) {
-      if (!authName || !this.reportTemplate?.formCode) {
-        return "";
-      }
-      return this.reportTemplate.formCode + ":" + authName;
-    },
-    createRowAuthName(type) {
-      return `row${type}` + generateId();
-    },
-    onIsEditTableChange(enabled) {
-      if (!enabled) {
-        return;
-      }
-      if (!this.getRowAddAuthName()) {
-        this.createRandomRowAddAuthName();
-      }
-      if (!this.getRowEditAuthName()) {
-        this.createRandomRowEditAuthName();
-      }
-    },
-    createRandomRowAddAuthName() {
-      this.$set(
-        this.optionModel,
-        "rowAddAuthName",
-        this.createRowAuthName("Add")
-      );
-    },
-    createRandomRowEditAuthName() {
-      this.$set(
-        this.optionModel,
-        "rowEditAuthName",
-        this.createRowAuthName("Edit")
-      );
-    },
-    createRandomRowAuthNames() {
-      // this.createRandomRowAddAuthName();
-      // this.createRandomRowEditAuthName();
-      if (!this.getRowAddAuthName()) {
-        this.createRandomRowAddAuthName();
-      }
-      if (!this.getRowEditAuthName()) {
-        this.createRandomRowEditAuthName();
-      }
-      this.$message.success("生成成功");
-    },
-    copyAuthCode(content, clickEvent) {
-      const clipboard = new Clipboard(clickEvent.target, {
-        text: () => content,
-      });
-      clipboard.on("success", () => {
-        this.$message.success("复制成功");
-        clipboard.destroy();
-      });
-      clipboard.on("error", () => {
-        this.$message.error("复制失败");
-        clipboard.destroy();
-      });
-      clipboard.onClick(clickEvent);
-    },
   },
 };
 </script>