@jeecg/online 3.4.4-beta2 → 3.5.3-beta2

package/useListButton.js

@@ -37,17 +37,14 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { E as ENHANCEJS, d as SETUP } from "./FormSchemaFactory.js";
+import { E as ENHANCEJS, q as SETUP } from "./useExtendComponent.js";
 import { useRoute } from "vue-router";
 import { router } from "/@/router";
-import * as vue from "vue";
 import { ref, onBeforeUnmount, toRaw, nextTick, reactive } from "vue";
-import * as UTIL_AXIOS from "/@/utils/http/axios";
 import { defHttp } from "/@/utils/http/axios";
-import * as HOOK_MESSAGE from "/@/hooks/web/useMessage";
 import { useMessage } from "/@/hooks/web/useMessage";
-import { randomString, filterObj } from "/@/utils/common/compUtils";
-import * as UTIL_CACHE from "/@/utils/cache";
+import { filterObj } from "/@/utils/common/compUtils";
+import { u as useCustomHook, G as GET_FUN_BODY_REG } from "./OnlineForm.js";
 import { onMountedOrActivated } from "/@/hooks/core/onMountedOrActivated";
 import { useModal } from "/@/components/Modal";
 import { Modal } from "ant-design-vue";
@@ -55,47 +52,6 @@ import { useMethods } from "/@/hooks/system/useMethods";
 import { getToken } from "/@/utils/auth";
 import { goJmReportViewPage } from "/@/utils";
 import { p as pick } from "./pick.js";
-const $exports = {
-  vue,
-  "@": {
-    hooks: {
-      useMessage: HOOK_MESSAGE
-    },
-    utils: {
-      axios: UTIL_AXIOS,
-      cache: UTIL_CACHE
-    }
-  }
-};
-function useCustomHook(otherExports, context) {
-  const assignExports = Object.assign({}, $exports, otherExports);
-  function doImport(path) {
-    if (path != null && path != "") {
-      let paths = path.toString().split("/");
-      let result = assignExports[paths[0]];
-      for (let i = 1; i < paths.length; i++) {
-        result = result[paths[i]];
-      }
-      return result;
-    }
-    return null;
-  }
-  function doExport() {
-  }
-  function executeJsEnhanced(code) {
-    let randomKey = randomString(6);
-    let exportKey = "__export_" + randomKey;
-    const executeCode = `return function (customImport, ${exportKey}) {"use strict"; ${code}}`;
-    console.group("executeJsEnhanced");
-    console.log(executeCode);
-    console.groupEnd();
-    const fun = new Function(executeCode)();
-    fun.call(context, doImport, doExport);
-  }
-  return {
-    executeJsEnhanced
-  };
-}
 const CONTEXT_PROP_DESCRIPTION = {
   acceptHrefParams: "<p> \u8DF3\u8F6C\u65F6\u83B7\u53D6\u7684\u53C2\u6570\u4FE1\u606F",
   currentPage: "<p> \u5F53\u524D\u9875\u6570",
@@ -152,7 +108,6 @@ const metaPagination = {
   total: 0
 };
 const { createMessage: $message, createErrorModal } = useMessage();
-const GET_FUN_BODY_REG = /(?:\/\*[\s\S]*?\*\/|\/\/.*?\r?\n|[^{])+\{([\s\S]*)\}$/;
 function useOnlineTableContext() {
   console.log("-------------------------useOnlineTableContext----------------------->");
   const ID = ref("");
@@ -174,7 +129,12 @@ function useOnlineTableContext() {
           return onlineTableContext[ENHANCEJS][code].call(onlineTableContext, onlineTableContext, row);
         }
       } else if (onlineTableContext[ENHANCEJS][code + "_hook"]) {
-        executeEnhanceJsHook(code + "_hook");
+        if (record) {
+          let row = toRaw(record);
+          executeEnhanceJsHook(code + "_hook", row);
+        } else {
+          executeEnhanceJsHook(code + "_hook");
+        }
       } else {
         console.log("\u589E\u5F3A\u6CA1\u627E\u5230!", code);
       }
@@ -188,12 +148,12 @@ function useOnlineTableContext() {
       }
     }
   };
-  function executeEnhanceJsHook(code) {
+  function executeEnhanceJsHook(code, row) {
     let str = onlineTableContext[ENHANCEJS][code].toLocaleString();
     let arr = str.match(GET_FUN_BODY_REG);
     if (arr.length > 1) {
       let temp = arr[1];
-      executeJsEnhanced(temp);
+      executeJsEnhanced(temp, row);
     }
   }
   const onlineTableContext = new Proxy(CONTEXT_PROP_DESCRIPTION, {
@@ -654,7 +614,7 @@ function useListButton(onlineTableContext, extConfigJson) {
   }
   function getActions(record) {
     let bpmStatusValue = getBpmStatusValue(record);
-    let canEdit = bpmStatusValue && bpmStatusValue == "1" || !bpmStatusValue;
+    let canEdit = bpmStatusValue && (bpmStatusValue == "1" || bpmStatusValue == "3" || bpmStatusValue == "4") || !bpmStatusValue;
     if (toRaw(buttonSwitch.update) === true && canEdit) {
       return [
         {
@@ -909,7 +869,7 @@ function useListButton(onlineTableContext, extConfigJson) {
     let paramsStr = JSON.stringify(filterObj(params));
     let url = `${onlineTableContext.onlineUrl.exportXls}${onlineTableContext.ID}`;
     const description = onlineTableContext.description;
-    handleExportXlsx(description, url, { paramsStr });
+    return handleExportXlsx(description, url, { paramsStr });
   }
   function showLinkButtonOfExpression(expression, row) {
     if (!expression || expression == "") {

package/useSchemas.js

@@ -317,116 +317,84 @@ function useExtendConfigFormSchemas(_props, handlers) {
   const formSchemas = [
     mapFormSchema(
       {
-        label: "\u96C6\u6210\u8BBE\u8BA1\u8868\u5355",
-        field: "isDesForm",
+        label: "\u5F39\u7A97\u9ED8\u8BA4\u5168\u5C4F",
+        field: "modelFullscreen",
         component: "RadioButtonGroup",
         componentProps: {
           options: [
-            { label: "\u5F00\u542F", value: "Y" },
-            { label: "\u5173\u95ED", value: "N" }
+            { label: "\u5F00\u542F", value: 1 },
+            { label: "\u5173\u95ED", value: 0 }
           ],
-          buttonStyle: "solid",
-          onChange: handlers.onIsDesformChange
+          buttonStyle: "solid"
         }
       },
       "left"
     ),
     mapFormSchema(
       {
-        label: "\u8868\u5355\u7F16\u7801",
-        field: "desFormCode",
-        component: "Input",
+        label: "\u5F39\u7A97\u5BBD\u5EA6",
+        field: "modalMinWidth",
+        component: "InputNumber",
         componentProps: {
-          style: "width: 80%"
-        },
-        dynamicDisabled: ({ model }) => model.isDesForm !== "Y",
-        dynamicRules: ({ model }) => {
-          return [{ required: model.isDesForm === "Y", message: "\u8BF7\u8F93\u5165\u8868\u5355\u7F16\u7801\uFF01" }];
+          style: "width: 80%",
+          placeholder: "\u5F39\u7A97\u6700\u5C0F\u5BBD\u5EA6\uFF08\u5355\u4F4D\uFF1Apx\uFF09"
         }
       },
       "right"
     ),
     mapFormSchema(
       {
-        label: "\u96C6\u6210\u79EF\u6728\u62A5\u8868",
-        field: "reportPrintShow",
+        label: "\u5F00\u542F\u8868\u5355\u8BC4\u8BBA",
+        field: "commentStatus",
         component: "RadioButtonGroup",
         componentProps: {
           options: [
             { label: "\u5F00\u542F", value: 1 },
             { label: "\u5173\u95ED", value: 0 }
           ],
-          buttonStyle: "solid",
-          onChange: handlers.onReportPrintShowChange
+          buttonStyle: "solid"
         }
       },
       "left"
     ),
     mapFormSchema(
       {
-        label: "\u62A5\u8868\u5730\u5740",
-        field: "reportPrintUrl",
-        component: "Input",
-        componentProps: {
-          style: "width: 80%"
-        },
-        dynamicDisabled: ({ model }) => !model.reportPrintShow,
-        dynamicRules: ({ model }) => {
-          return [
-            { required: !!model.reportPrintShow, message: "\u8BF7\u8F93\u5165\u62A5\u8868\u5730\u5740\uFF01" },
-            {
-              validator({}, value) {
-                if (/\/jmreport\/view\/{积木报表ID}/.test(value)) {
-                  return Promise.reject("\u8BF7\u5C06{\u79EF\u6728\u62A5\u8868ID}\u66FF\u6362\u4E3A\u771F\u5B9E\u7684\u79EF\u6728\u62A5\u8868ID\uFF01");
-                }
-                return Promise.resolve();
-              }
-            }
-          ];
-        }
+        label: "",
+        field: "commentStatus",
+        component: "InputNumber",
+        render: () => ""
       },
       "right"
     ),
     mapFormSchema(
       {
-        label: "\u56FA\u5B9A\u64CD\u4F5C\u5217",
-        field: "tableFixedAction",
+        label: "\u542F\u7528\u8054\u5408\u67E5\u8BE2",
+        field: "joinQuery",
         component: "RadioButtonGroup",
         componentProps: {
           options: [
             { label: "\u5F00\u542F", value: 1 },
             { label: "\u5173\u95ED", value: 0 }
           ],
-          buttonStyle: "solid"
-        },
-        defaultValue: 0
+          buttonStyle: "solid",
+          onChange: handlers.onJoinQueryChange
+        }
       },
       "left"
     ),
     mapFormSchema(
       {
-        label: "\u56FA\u5B9A\u65B9\u5F0F",
-        field: "tableFixedActionType",
-        component: "Select",
-        componentProps: {
-          options: [
-            { label: "\u56FA\u5B9A\u5230\u53F3\u4FA7", value: "right" },
-            { label: "\u56FA\u5B9A\u5230\u5DE6\u4FA7", value: "left" }
-          ],
-          style: "width: 80%"
-        },
-        defaultValue: "right",
-        dynamicDisabled: ({ model }) => !model.tableFixedAction,
-        dynamicRules: ({ model }) => {
-          return [{ required: !!model.tableFixedAction, message: "\u8BF7\u9009\u62E9\u56FA\u5B9A\u65B9\u5F0F\uFF01" }];
-        }
+        label: "",
+        field: "joinQuery",
+        component: "InputNumber",
+        render: () => ""
       },
       "right"
     ),
     mapFormSchema(
       {
-        label: "\u542F\u7528\u8054\u5408\u67E5\u8BE2",
-        field: "joinQuery",
+        label: "\u96C6\u6210\u79EF\u6728\u62A5\u8868",
+        field: "reportPrintShow",
         component: "RadioButtonGroup",
         componentProps: {
           options: [
@@ -434,51 +402,71 @@ function useExtendConfigFormSchemas(_props, handlers) {
             { label: "\u5173\u95ED", value: 0 }
           ],
           buttonStyle: "solid",
-          onChange: handlers.onJoinQueryChange
+          onChange: handlers.onReportPrintShowChange
         }
       },
       "left"
     ),
     mapFormSchema(
       {
-        label: "",
-        field: "joinQuery",
-        component: "InputNumber",
-        render: () => ""
+        label: "\u62A5\u8868\u5730\u5740",
+        field: "reportPrintUrl",
+        component: "Input",
+        componentProps: {
+          style: "width: 80%"
+        },
+        dynamicDisabled: ({ model }) => !model.reportPrintShow,
+        dynamicRules: ({ model }) => {
+          return [
+            { required: !!model.reportPrintShow, message: "\u8BF7\u8F93\u5165\u62A5\u8868\u5730\u5740\uFF01" },
+            {
+              validator({}, value) {
+                if (/\/jmreport\/view\/{积木报表ID}/.test(value)) {
+                  return Promise.reject("\u8BF7\u5C06{\u79EF\u6728\u62A5\u8868ID}\u66FF\u6362\u4E3A\u771F\u5B9E\u7684\u79EF\u6728\u62A5\u8868ID\uFF01");
+                }
+                return Promise.resolve();
+              }
+            }
+          ];
+        }
       },
       "right"
     ),
     mapFormSchema(
       {
-        label: "\u5F39\u7A97\u9ED8\u8BA4\u5168\u5C4F",
-        field: "modelFullscreen",
+        label: "\u96C6\u6210\u8BBE\u8BA1\u8868\u5355",
+        field: "isDesForm",
         component: "RadioButtonGroup",
         componentProps: {
           options: [
-            { label: "\u5F00\u542F", value: 1 },
-            { label: "\u5173\u95ED", value: 0 }
+            { label: "\u5F00\u542F", value: "Y" },
+            { label: "\u5173\u95ED", value: "N" }
           ],
-          buttonStyle: "solid"
+          buttonStyle: "solid",
+          onChange: handlers.onIsDesformChange
         }
       },
       "left"
     ),
     mapFormSchema(
       {
-        label: "\u5F39\u7A97\u5BBD\u5EA6",
-        field: "modalMinWidth",
-        component: "InputNumber",
+        label: "\u8868\u5355\u7F16\u7801",
+        field: "desFormCode",
+        component: "Input",
         componentProps: {
-          style: "width: 80%",
-          placeholder: "\u5F39\u7A97\u6700\u5C0F\u5BBD\u5EA6\uFF08\u5355\u4F4D\uFF1Apx\uFF09"
+          style: "width: 80%"
+        },
+        dynamicDisabled: ({ model }) => model.isDesForm !== "Y",
+        dynamicRules: ({ model }) => {
+          return [{ required: model.isDesForm === "Y", message: "\u8BF7\u8F93\u5165\u8868\u5355\u7F16\u7801\uFF01" }];
         }
       },
       "right"
     ),
     mapFormSchema(
       {
-        label: "\u5F00\u542F\u8868\u5355\u8BC4\u8BBA",
-        field: "commentStatus",
+        label: "\u56FA\u5B9A\u64CD\u4F5C\u5217",
+        field: "tableFixedAction",
         component: "RadioButtonGroup",
         componentProps: {
           options: [
@@ -486,16 +474,28 @@ function useExtendConfigFormSchemas(_props, handlers) {
             { label: "\u5173\u95ED", value: 0 }
           ],
           buttonStyle: "solid"
-        }
+        },
+        defaultValue: 1
       },
       "left"
     ),
     mapFormSchema(
       {
-        label: "",
-        field: "commentStatus",
-        component: "InputNumber",
-        render: () => ""
+        label: "\u56FA\u5B9A\u65B9\u5F0F",
+        field: "tableFixedActionType",
+        component: "Select",
+        componentProps: {
+          options: [
+            { label: "\u56FA\u5B9A\u5230\u53F3\u4FA7", value: "right" },
+            { label: "\u56FA\u5B9A\u5230\u5DE6\u4FA7", value: "left" }
+          ],
+          style: "width: 80%"
+        },
+        defaultValue: "right",
+        dynamicDisabled: ({ model }) => !model.tableFixedAction,
+        dynamicRules: ({ model }) => {
+          return [{ required: !!model.tableFixedAction, message: "\u8BF7\u9009\u62E9\u56FA\u5B9A\u65B9\u5F0F\uFF01" }];
+        }
       },
       "right"
     )