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

package/package.json

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

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

@@ -44,7 +44,11 @@
       <el-switch v-model="isQueryAllPage"></el-switch>
     </el-form-item>
     <el-form-item label="默认每页查询数">
-      <base-input-number v-model="optionModel.gridPageSize" size="mini" :max="10000" />
+      <base-input-number
+        v-model="optionModel.gridPageSize"
+        size="mini"
+        :max="10000"
+      />
     </el-form-item>
     <el-form-item :label="i18nt('可选择每页查询数')"></el-form-item>
     <el-form-item label-width="0">
@@ -132,7 +136,10 @@
       <el-divider class="custom-divider-margin-top">编辑表格设置</el-divider>
     </el-form-item>
     <el-form-item :label="i18nt('编辑表格')">
-      <el-switch v-model="optionModel.isEditTable"></el-switch>
+      <el-switch
+        v-model="optionModel.isEditTable"
+        @change="onIsEditTableChange"
+      ></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('树表格')">
       <el-switch v-model="optionModel.isTreeTable"></el-switch>
@@ -143,6 +150,87 @@
     <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>
@@ -208,7 +296,11 @@
           </el-button>
         </div>
       </template>
-      <code-editor mode="json" :readonly="!1" v-model="tableDataOptions"></code-editor>
+      <code-editor
+        mode="json"
+        :readonly="!1"
+        v-model="tableDataOptions"
+      ></code-editor>
     </el-dialog>
     <el-dialog
       v-if="showSqlEditDialog"
@@ -294,7 +386,11 @@
           <i class="el-icon-close el-icon"></i>
           取 消
         </el-button>
-        <el-button type="primary" @click="confirmFieldTreeDialog" class="button-sty">
+        <el-button
+          type="primary"
+          @click="confirmFieldTreeDialog"
+          class="button-sty"
+        >
           <i class="el-icon-check el-icon"></i>
           确 定
         </el-button>
@@ -320,7 +416,10 @@
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
 import Draggable from "vuedraggable";
-import { deepClone, generateId } from "../../../../../../components/xform/utils/util";
+import {
+  deepClone,
+  generateId,
+} from "../../../../../../components/xform/utils/util";
 import Sortable from "sortablejs";
 import requestaccessDialog from "../../../../../../views/user/form/report_requestaccess/dialog.vue";
 // import conditionEditor from "./condition-editor.vue";
@@ -329,6 +428,7 @@ 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",
@@ -346,7 +446,11 @@ export default {
     selectedWidget: Object,
     optionModel: Object,
   },
-  inject: ["getReportTemplate", "showEventCollapse", "openWidgetPropertyDialog"],
+  inject: [
+    "getReportTemplate",
+    "showEventCollapse",
+    "openWidgetPropertyDialog",
+  ],
   data: function () {
     return {
       showTableConfigDialog: false,
@@ -534,6 +638,7 @@ export default {
       },
       defaultCheckedKeys: [],
       tableConfigParams: ["dataId", "formCode"],
+      rowShowParams: ["row", "rowIndex"],
       showExportItemColumnsDialog: false,
     };
   },
@@ -562,6 +667,12 @@ export default {
         this.optionModel.isNotShowQueryButton = !val;
       },
     },
+    rowAddAuthCode() {
+      return this.getRowAuthCode(this.getRowAddAuthName());
+    },
+    rowEditAuthCode() {
+      return this.getRowAuthCode(this.getRowEditAuthName());
+    },
   },
   created: function () {
     // this.reportTemplate = this.getReportTemplate();
@@ -601,14 +712,20 @@ export default {
     },
     openTableDataEdit: function () {
       (this.dataDialogVisible = !0),
-        (this.tableDataOptions = JSON.stringify(this.optionModel.tableData, null, "  "));
+        (this.tableDataOptions = JSON.stringify(
+          this.optionModel.tableData,
+          null,
+          "  "
+        ));
     },
     saveTableData: function () {
       try {
         (this.optionModel.tableData = JSON.parse(this.tableDataOptions)),
           (this.dataDialogVisible = !1);
       } catch (e) {
-        this.$message.error(this.i18nt("designer.hint.invalidOptionsData") + e.message);
+        this.$message.error(
+          this.i18nt("designer.hint.invalidOptionsData") + e.message
+        );
       }
     },
     openSetting: function () {
@@ -773,7 +890,11 @@ export default {
         let idVal = row.prop ? row.prop : type + tmpId;
         columnSelectedWidget.id = idVal;
         columnSelectedWidget.options.name = idVal;
-        if (!isChange && row.columnOption && Object.keys(row.columnOption).length) {
+        if (
+          !isChange &&
+          row.columnOption &&
+          Object.keys(row.columnOption).length
+        ) {
           row.columnOption.required = row.required || false;
           columnSelectedWidget.options = row.columnOption;
         } else {
@@ -887,7 +1008,10 @@ export default {
       let defaultCheckedKeys = [];
       this.treeData.forEach((item1) => {
         item1.children.forEach((item2) => {
-          if (fields.includes(item2.name) && !defaultCheckedKeys.includes(item2.name)) {
+          if (
+            fields.includes(item2.name) &&
+            !defaultCheckedKeys.includes(item2.name)
+          ) {
             defaultCheckedKeys.push(item2.name);
           }
         });
@@ -923,18 +1047,22 @@ export default {
       this.optionModel.tableColumns.push(e);
     },
     openTableConfigDialog() {
-      this.eventHeader = `${this.optionModel.name}.${eventName}(${eventParams.join(
-        ", "
-      )}) {`;
+      this.eventHeader = `${
+        this.optionModel.name
+      }.${eventName}(${eventParams.join(", ")}) {`;
       this.eventHandlerCode = selectedWidget.options[eventName] || "";
       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 xformImportTemplateFile =
+        setttingConfig.xformImportTemplateFile || defaultUrl;
       if (!xformImportTemplateFile) return;
-      this.$commonFileUtil.downloadFile(xformImportTemplateFile, "通用导入模板.xlsx");
+      this.$commonFileUtil.downloadFile(
+        xformImportTemplateFile,
+        "通用导入模板.xlsx"
+      );
     },
     addGridPageSizeList() {
       if (this.optionModel.gridPageSizeList === undefined) {
@@ -945,6 +1073,73 @@ 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>

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -259,6 +259,10 @@ export const containers = [
       tableConfig: null,
       isEditTable: false,
       isTreeTable: false,
+      rowAddAuthName: null,
+      rowEditAuthName: null,
+      rowAddShow: null,
+      rowEditShow: null,
       wbsEnabled: false,
       sortScriptCode: null,
       importTemplateFile: null,
@@ -271,9 +275,9 @@ export const containers = [
       isNotQueryAllPage: false,
       isNotShowQueryButton: false,
 
-      exportItemColumns:[],
+      exportItemColumns: [],
       exportItemScriptCode: null,
-      exportItemParam:  null,
+      exportItemParam: null,
     },
   },
   /*{
@@ -450,6 +454,7 @@ export const containers = [
     category: "container",
     icon: "grid",
     commonFlag: !0,
+    formItemFlag: !0,
     layoutType: "H5",
     lineButtons: [],
     buttons: [],
@@ -457,13 +462,18 @@ export const containers = [
     tableField: null,
     options: {
       name: "",
+      keyNameEnabled: !0,
+      keyName: "",
       hidden: !1,
       label: "",
       listH5: true,
       // colHeight: null,
       customClass: "",
       isQueryTable: false,
+
       accessUrl: null,
+      ...httpConfig,
+      formScriptEnabled: false,
       tableColumns: [
         {
           columnId: 1,
@@ -743,7 +753,7 @@ export const containers = [
       disLocalFilter: false,
       treeFilterType: 0,
       onFilterIconClick: null,
-      onFilterTextChange:null
+      onFilterTextChange: null,
     },
   },
 ];
@@ -759,7 +769,7 @@ export const defaultSearchDialogConfig = {
   multipleChoices: true,
   confirmCallback: null,
   dialogQueryParam: null,
-  dialogCustomParam:null
+  dialogCustomParam: null,
 };
 
 export const defaultWfConfig = {
@@ -881,13 +891,13 @@ const projectTagConfig = {
   tagConfirmCallback: null,
   tagDeleteCallback: null,
   tabDeleteEnabled: true,
-  tagWidth: ""
+  tagWidth: "",
 };
 
 const httpConfig = {
   httpFormCode: null,
   formScriptEnabled: true,
-  commonAttributeEnabled:false,
+  commonAttributeEnabled: false,
   formScriptCode: null,
   formScriptParam: null,
   formScriptSuccess: null,
@@ -904,7 +914,13 @@ export const hiddenWidgetTypesOfWf = [
   "print-button",
   "dropdown-item",
 ];
-export const freeWidgetTypesOfWf = ["reset_button","copy_button", "a-link", "a-text", 'dropdown'];
+export const freeWidgetTypesOfWf = [
+  "reset_button",
+  "copy_button",
+  "a-link",
+  "a-text",
+  "dropdown",
+];
 
 export const basicFields = [
   {
@@ -1177,12 +1193,12 @@ export const basicFields = [
         {
           label: "radio 1",
           value: "1",
-          disabled: false
+          disabled: false,
         },
         {
           label: "radio 2",
           value: "2",
-          disabled: false
+          disabled: false,
         },
       ],
       required: !1,
@@ -1249,12 +1265,12 @@ export const basicFields = [
         {
           label: "check 1",
           value: "1",
-          disabled: false
+          disabled: false,
         },
         {
           label: "check 2",
           value: "2",
-          disabled: false
+          disabled: false,
         },
       ],
       required: !1,
@@ -1328,17 +1344,17 @@ export const basicFields = [
         {
           label: "select 1",
           value: "1",
-          disabled: false
+          disabled: false,
         },
         {
           label: "select 2",
           value: "2",
-          disabled: false
+          disabled: false,
         },
         {
           label: "select 3",
           value: "3",
-          disabled: false
+          disabled: false,
         },
       ],
       required: !1,
@@ -1725,8 +1741,8 @@ export const basicFields = [
       hidden: !1,
       textContent: "static text",
       fontSize: "13px",
-      preWrap: true,  //是否自动换行
-      colorClass: "",  //字体颜色
+      preWrap: true, //是否自动换行
+      colorClass: "", //字体颜色
       customClass: "",
       onCreated: "",
       onMounted: "",
@@ -3070,7 +3086,7 @@ export const advancedFields = [
       ...defaultWfConfig,
       hiddenByWf: true,
       ...defaultWidgetShowRuleConfig,
-      importMultiple:false,
+      importMultiple: false,
       importMultiSize: 1,
       importFileLimitSize: 200,
       importEntity: "",
@@ -3081,9 +3097,9 @@ export const advancedFields = [
       enabledImportPreHandle: false,
       tableRef: "",
       onSuccessImport: "",
-      hideCancelButton:false,
+      hideCancelButton: false,
       multipleSheet: false,
-      onBeforeClickButton:null,
+      onBeforeClickButton: null,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3130,8 +3146,8 @@ export const advancedFields = [
       onConfirmImportEnabled: false,
       onConfirmImport: "",
       onSuccessImport: "",
-      hideCancelButton:false,
-      onBeforeClickButton:null,
+      hideCancelButton: false,
+      onBeforeClickButton: null,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3169,7 +3185,7 @@ export const advancedFields = [
       ...defaultWidgetShowRuleConfig,
 
       // customLabelEnabled: false,
-      printButtonFlag:1,
+      printButtonFlag: 1,
       printTableRef: "",
       printItems: [],
       // printCustomCondition: "",
@@ -3209,7 +3225,7 @@ export const advancedFields = [
       ...defaultWfConfig,
       ...defaultWidgetShowRuleConfig,
 
-      printDetailButtonFlag:1,
+      printDetailButtonFlag: 1,
       // customLabelEnabled: false,
       printItems: [],
       printCustomCondition: "return {\n  id:[dataId]\n}",
@@ -3276,7 +3292,7 @@ export const advancedFields = [
       statusParam: [],
 
       ...httpConfig,
-      formScriptEnabled:false,
+      formScriptEnabled: false,
 
       onCreated: "",
       onMounted: "",
@@ -3349,7 +3365,7 @@ export const advancedFields = [
     tableField: null,
     options: {
       ...projectTagConfig,
-      formScriptEnabled: true
+      formScriptEnabled: true,
     },
   },
   {
@@ -3448,7 +3464,6 @@ export const advancedFields = [
       customClass: "",
       onCreated: "",
       onMounted: "",
-
     },
   },
 
@@ -3797,9 +3812,9 @@ export const businessFields = [
       disabled: !1,
       hidden: !1,
 
-      tempStorageFlag:1,
-      tempStorageCode:null,
-      tempStorageConfirm:null,
+      tempStorageFlag: 1,
+      tempStorageCode: null,
+      tempStorageConfirm: null,
 
       customClass: "",
       onCreated: "",
@@ -3819,16 +3834,14 @@ export const businessFields = [
       // disabled: !1,
       hidden: !1,
 
-      oplogFlag:1,
+      oplogFlag: 1,
       formScriptCode: "listUserLog",
-      oplogTypeCode:null,
-      oplogBusinessKey:null,
-
+      oplogTypeCode: null,
+      oplogBusinessKey: null,
 
       customClass: "",
       onCreated: "",
       onMounted: "",
-
     },
   },
   {
@@ -3860,8 +3873,10 @@ export const businessFields = [
       vabUpload2Flag: 1,
 
       vabupload2_scriptCode: "/intf/getHxFileUploadConfig",
-      vabupload2_uploadParam: "return {\n  entityName: \"msdyn_workorder\",\n  entityId: dataId,\n  backendwriteback: \"10\",\n  fileCategory: \"工单\",\n}",
-      vabupload2_deleteParam: "return {\r\n  entityName: \"msdyn_workorder\",\r\n  entityId: dataId,\r\n  backendwriteback: \"10\",\r\n}",
+      vabupload2_uploadParam:
+        'return {\n  entityName: "msdyn_workorder",\n  entityId: dataId,\n  backendwriteback: "10",\n  fileCategory: "工单",\n}',
+      vabupload2_deleteParam:
+        'return {\r\n  entityName: "msdyn_workorder",\r\n  entityId: dataId,\r\n  backendwriteback: "10",\r\n}',
       // vabupload2_getFileParam:"",
 
       // ...httpConfig,

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -276,7 +276,7 @@
             class="a-link"
             data-tit="新增"
             @click="addEditRow(null, obj)"
-            v-if="widget.options.isTreeTable"
+            v-if="widget.options.isTreeTable && canShowRowAdd(obj)"
           >
             <el-tooltip
               :enterable="false"
@@ -287,7 +287,12 @@
               ><i class="el-icon-circle-plus-outline"></i
             ></el-tooltip>
           </a>
-          <a @click="editRowEvent(obj)" class="a-link" data-tit="行编辑">
+          <a
+            @click="editRowEvent(obj)"
+            class="a-link"
+            data-tit="行编辑"
+            v-if="canShowRowEdit(obj)"
+          >
             <el-tooltip
               :enterable="false"
               effect="dark"