@tachybase/client 1.5.0 → 1.6.0

package/es/hooks/index.d.ts

@@ -1,2 +1,3 @@
 export * from './useAdminSchemaUid';
+export * from './useOptimizedMemo';
 export * from './useViewport';

package/es/hooks/index.mjs

@@ -1,2 +1,3 @@
 export * from "./useAdminSchemaUid.mjs";
+export * from "./useOptimizedMemo.mjs";
 export * from "./useViewport.mjs";

package/es/hooks/useOptimizedMemo.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 优化的 useMemo，先进行引用比较，仅在引用不同时才使用 lodash 的 isEqual 进行深度比较
+ * 这样可以在大多数情况下（引用相同时）避免深度比较的开销
+ *
+ * 性能分析：
+ * - 引用比较：O(1)，几乎无开销
+ * - 深度比较：O(n)，n 为数据大小，使用 lodash.isEqual（比 JSON.stringify 更可靠）
+ * - 计算成本：map、compile、字段查找等操作
+ *
+ * 权衡：对于表单摘要数据（通常 < 10KB），深度比较的开销（< 1ms）
+ * 远小于重新计算的成本（map + compile + 字段查找），所以值得缓存
+ *
+ * 优势：
+ * - 使用 lodash.isEqual 替代 JSON.stringify，更可靠（可处理循环引用、特殊类型等）
+ * - 代码更简洁，无需手动处理序列化错误
+ * - 依赖成熟的库，减少维护成本
+ *
+ * @example
+ * ```tsx
+ * const results = useOptimizedMemo(() => {
+ *   return expensiveComputation(data);
+ * }, [data]);
+ * ```
+ */
+export declare function useOptimizedMemo<T>(factory: () => T, deps: any[]): T;

package/es/hooks/useOptimizedMemo.mjs

@@ -0,0 +1,30 @@
+import { useRef } from "react";
+import lodash from "lodash";
+function useOptimizedMemo(factory, deps) {
+    const ref = useRef();
+    if (ref.current && deps.length === ref.current.deps.length && deps.every((dep, i)=>dep === ref.current.deps[i])) return ref.current.value;
+    if (!ref.current || deps.length !== ref.current.deps.length) {
+        const value = factory();
+        ref.current = {
+            deps,
+            value
+        };
+        return value;
+    }
+    const depsChanged = deps.some((dep, i)=>{
+        const prevDep = ref.current.deps[i];
+        if (dep === prevDep) return false;
+        return !lodash.isEqual(dep, prevDep);
+    });
+    if (depsChanged) {
+        const value = factory();
+        ref.current = {
+            deps,
+            value
+        };
+        return value;
+    }
+    ref.current.deps = deps;
+    return ref.current.value;
+}
+export { useOptimizedMemo };

package/es/schema-component/antd/action/Action.Designer.mjs

@@ -294,7 +294,7 @@ function WorkflowSelectComponent(param) {
     return /*#__PURE__*/ jsx(DataSourceProvider, {
         dataSource: "main",
         children: /*#__PURE__*/ jsx(RemoteSelect, {
-            manual: false,
+            manual: true,
             placeholder: t('Select workflow', {
                 ns: 'workflow'
             }),
@@ -314,7 +314,7 @@ function WorkflowSelectComponent(param) {
                         key: void 0 === props.filterKey ? void 0 : props.filterKey
                     },
                     sort: [
-                        '-updatedAt'
+                        '-initAt'
                     ]
                 }
             },

package/es/schema-component/antd/action/Action.mjs

@@ -29,6 +29,7 @@ import { ActionPage } from "./Action.Page.mjs";
 import Action_style from "./Action.style.mjs";
 import { ActionContextProvider } from "./context.mjs";
 import { useA } from "./hooks.mjs";
+import { useCompiledAction } from "./hooks/useCompiledAction.mjs";
 import { useGetAriaLabelOfAction } from "./hooks/useGetAriaLabelOfAction.mjs";
 import { linkageAction } from "./utils.mjs";
 const Action = withDynamicSchemaProps(observer((props)=>{
@@ -44,9 +45,8 @@ const Action = withDynamicSchemaProps(observer((props)=>{
     const field = useField();
     const app = useApp();
     const pageMode = app.usePageMode();
-    const { run, element } = useAction(actionCallback);
     const fieldSchema = useFieldSchema();
-    const compile = useCompile();
+    const { run, element } = useCompiledAction(useAction, actionCallback);
     const form = useForm();
     const record = useCollectionRecordData();
     const collection = useCollection();
@@ -65,6 +65,7 @@ const Action = withDynamicSchemaProps(observer((props)=>{
         }
     });
     const { getAriaLabel } = useGetAriaLabelOfAction(title);
+    const compile = useCompile();
     let actionTitle = title || compile(fieldSchema.title);
     actionTitle = lodash.isString(actionTitle) ? t(actionTitle) : actionTitle;
     useEffect(()=>{

package/es/schema-component/antd/action/hooks/useCompiledAction.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 编译 useAction，支持函数和字符串引用两种形式
+ * @param useAction - 可以是函数或字符串引用（如 '{{ useRevisionAction }}'）
+ * @param actionCallback - 传递给 useAction 的回调函数
+ * @returns 编译后的 useAction hook 的返回值 { run, element }
+ */
+export declare const useCompiledAction: (useAction: any, actionCallback?: any) => any;

package/es/schema-component/antd/action/hooks/useCompiledAction.mjs

@@ -0,0 +1,35 @@
+import { useMemo } from "react";
+import { useExpressionScope } from "@tachybase/schema";
+import { useCompile } from "../../../hooks/index.mjs";
+import { useA } from "../hooks.mjs";
+const useCompiledAction = (useAction, actionCallback)=>{
+    const compile = useCompile();
+    const scope = useExpressionScope();
+    const compiledUseAction = useMemo(()=>{
+        if ('function' == typeof useAction) return useAction;
+        if ('string' == typeof useAction && useAction.startsWith('{{')) {
+            const match = useAction.match(/\{\{\s*([^}]+)\s*\}\}/);
+            if (match && match[1]) {
+                const expression = match[1].trim();
+                const func = scope[expression];
+                if ('function' == typeof func) return func;
+                const compiled = compile(useAction);
+                if ('function' == typeof compiled) return compiled;
+                console.warn("useAction not found in scope or compilation failed: ".concat(expression), scope);
+                return useA;
+            }
+            const compiled = compile(useAction);
+            if ('function' == typeof compiled) return compiled;
+            console.warn("useAction compilation failed: ".concat(useAction), compiled);
+            return useA;
+        }
+        console.warn("useAction is not a function or string reference:", useAction);
+        return useA;
+    }, [
+        useAction,
+        compile,
+        scope
+    ]);
+    return compiledUseAction(actionCallback);
+};
+export { useCompiledAction };

package/es/schema-component/antd/appends-tree-select/AppendsTreeSelectV2.mjs

@@ -9,7 +9,11 @@ function usePropsCollection(param) {
     return collection;
 }
 function loadChildren(option) {
-    const result = getCollectionFieldOptions.call(this, option.field.target, option);
+    var _this_needLeaf;
+    const needLeaf = null != (_this_needLeaf = this.needLeaf) ? _this_needLeaf : false;
+    const result = getCollectionFieldOptions.call(this, option.field.target, option, {
+        needLeaf
+    });
     if (result.length) {
         if (!result.some((item)=>isAssociation(item.field))) option.isLeaf = true;
     } else option.isLeaf = true;
@@ -29,13 +33,18 @@ function getCollectionFieldOptions(collection, parentNode) {
     const [dataSourceName, collectionName] = parseCollectionName(collection);
     const rawFields = this.getCollectionFields(collectionName, dataSourceName);
     const fields = needLeaf ? rawFields : rawFields.filter(isAssociation);
-    const boundLoadChildren = loadChildren.bind(this);
+    const boundLoadChildren = loadChildren.bind({
+        ...this,
+        needLeaf
+    });
     return fields.filter(this.filter).map((field)=>{
         var _field_uiSchema;
         const key = parentNode ? "".concat(parentNode.value ? "".concat(parentNode.value, ".") : '').concat(field.name) : field.name;
         var _this_compile;
         const fieldTitle = null != (_this_compile = this.compile(null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title)) ? _this_compile : field.name;
-        const isLeaf = !this.getCollectionFields(field.target).filter(isAssociation).filter(this.filter).length;
+        const targetFields = field.target ? this.getCollectionFields(field.target) : [];
+        const availableFields = needLeaf ? targetFields : targetFields.filter(isAssociation);
+        const isLeaf = !availableFields.filter(this.filter).length;
         var _parentNode_key;
         return {
             pId: null != (_parentNode_key = null == parentNode ? void 0 : parentNode.key) ? _parentNode_key : null,
@@ -99,7 +108,8 @@ const AppendsTreeSelectV2 = (props)=>{
         const tData = null === propsLoadData ? [] : getCollectionFieldOptions.call({
             compile,
             getCollectionFields,
-            filter
+            filter,
+            needLeaf
         }, collectionString, parentNode, {
             needLeaf
         });

package/es/schema-component/antd/table/Table.Array.mjs

@@ -119,6 +119,7 @@ const useTableColumns = ()=>{
             }),
             dataIndex: s.name,
             key: s.name,
+            ...s['x-component-props'],
             render: (v, record)=>{
                 var _field_value;
                 const index = null == (_field_value = field.value) ? void 0 : _field_value.indexOf(record);

package/lib/hooks/index.js

@@ -3,6 +3,9 @@ var __webpack_modules__ = {
     "./useAdminSchemaUid": function(module) {
         module.exports = require("./useAdminSchemaUid.js");
     },
+    "./useOptimizedMemo": function(module) {
+        module.exports = require("./useOptimizedMemo.js");
+    },
     "./useViewport": function(module) {
         module.exports = require("./useViewport.js");
     }
@@ -56,10 +59,16 @@ var __webpack_exports__ = {};
         return _useAdminSchemaUid__WEBPACK_IMPORTED_MODULE_0__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _useViewport__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./useViewport");
+    var _useOptimizedMemo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./useOptimizedMemo");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _useOptimizedMemo__WEBPACK_IMPORTED_MODULE_1__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _useOptimizedMemo__WEBPACK_IMPORTED_MODULE_1__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _useViewport__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./useViewport");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _useViewport__WEBPACK_IMPORTED_MODULE_1__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _useViewport__WEBPACK_IMPORTED_MODULE_1__[key];
+    for(var __WEBPACK_IMPORT_KEY__ in _useViewport__WEBPACK_IMPORTED_MODULE_2__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _useViewport__WEBPACK_IMPORTED_MODULE_2__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();

package/lib/hooks/useOptimizedMemo.js

@@ -0,0 +1,74 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    useOptimizedMemo: ()=>useOptimizedMemo
+});
+const external_react_namespaceObject = require("react");
+const external_lodash_namespaceObject = require("lodash");
+var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
+function useOptimizedMemo(factory, deps) {
+    const ref = (0, external_react_namespaceObject.useRef)();
+    if (ref.current && deps.length === ref.current.deps.length && deps.every((dep, i)=>dep === ref.current.deps[i])) return ref.current.value;
+    if (!ref.current || deps.length !== ref.current.deps.length) {
+        const value = factory();
+        ref.current = {
+            deps,
+            value
+        };
+        return value;
+    }
+    const depsChanged = deps.some((dep, i)=>{
+        const prevDep = ref.current.deps[i];
+        if (dep === prevDep) return false;
+        return !external_lodash_default().isEqual(dep, prevDep);
+    });
+    if (depsChanged) {
+        const value = factory();
+        ref.current = {
+            deps,
+            value
+        };
+        return value;
+    }
+    ref.current.deps = deps;
+    return ref.current.value;
+}
+exports.useOptimizedMemo = __webpack_exports__.useOptimizedMemo;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "useOptimizedMemo"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/lib/schema-component/antd/action/Action.Designer.js

@@ -339,7 +339,7 @@ function WorkflowSelectComponent(param) {
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_data_source_index_js_namespaceObject.DataSourceProvider, {
         dataSource: "main",
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_index_js_namespaceObject.RemoteSelect, {
-            manual: false,
+            manual: true,
             placeholder: t('Select workflow', {
                 ns: 'workflow'
             }),
@@ -359,7 +359,7 @@ function WorkflowSelectComponent(param) {
                         key: void 0 === props.filterKey ? void 0 : props.filterKey
                     },
                     sort: [
-                        '-updatedAt'
+                        '-initAt'
                     ]
                 }
             },

package/lib/schema-component/antd/action/Action.js

@@ -71,6 +71,7 @@ const external_Action_style_js_namespaceObject = require("./Action.style.js");
 var external_Action_style_js_default = /*#__PURE__*/ __webpack_require__.n(external_Action_style_js_namespaceObject);
 const external_context_js_namespaceObject = require("./context.js");
 const external_hooks_js_namespaceObject = require("./hooks.js");
+const useCompiledAction_js_namespaceObject = require("./hooks/useCompiledAction.js");
 const useGetAriaLabelOfAction_js_namespaceObject = require("./hooks/useGetAriaLabelOfAction.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaProps)((0, schema_namespaceObject.observer)((props)=>{
@@ -86,9 +87,8 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
     const field = (0, schema_namespaceObject.useField)();
     const app = (0, index_js_namespaceObject.useApp)();
     const pageMode = app.usePageMode();
-    const { run, element } = useAction(actionCallback);
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-    const compile = (0, external_hooks_index_js_namespaceObject.useCompile)();
+    const { run, element } = (0, useCompiledAction_js_namespaceObject.useCompiledAction)(useAction, actionCallback);
     const form = (0, schema_namespaceObject.useForm)();
     const record = (0, external_data_source_index_js_namespaceObject.useCollectionRecordData)();
     const collection = (0, external_data_source_index_js_namespaceObject.useCollection)();
@@ -107,6 +107,7 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
         }
     });
     const { getAriaLabel } = (0, useGetAriaLabelOfAction_js_namespaceObject.useGetAriaLabelOfAction)(title);
+    const compile = (0, external_hooks_index_js_namespaceObject.useCompile)();
     let actionTitle = title || compile(fieldSchema.title);
     actionTitle = external_lodash_default().isString(actionTitle) ? t(actionTitle) : actionTitle;
     (0, external_react_namespaceObject.useEffect)(()=>{

package/lib/schema-component/antd/action/hooks/useCompiledAction.js

@@ -0,0 +1,69 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    useCompiledAction: ()=>useCompiledAction
+});
+const external_react_namespaceObject = require("react");
+const schema_namespaceObject = require("@tachybase/schema");
+const index_js_namespaceObject = require("../../../hooks/index.js");
+const external_hooks_js_namespaceObject = require("../hooks.js");
+const useCompiledAction = (useAction, actionCallback)=>{
+    const compile = (0, index_js_namespaceObject.useCompile)();
+    const scope = (0, schema_namespaceObject.useExpressionScope)();
+    const compiledUseAction = (0, external_react_namespaceObject.useMemo)(()=>{
+        if ('function' == typeof useAction) return useAction;
+        if ('string' == typeof useAction && useAction.startsWith('{{')) {
+            const match = useAction.match(/\{\{\s*([^}]+)\s*\}\}/);
+            if (match && match[1]) {
+                const expression = match[1].trim();
+                const func = scope[expression];
+                if ('function' == typeof func) return func;
+                const compiled = compile(useAction);
+                if ('function' == typeof compiled) return compiled;
+                console.warn("useAction not found in scope or compilation failed: ".concat(expression), scope);
+                return external_hooks_js_namespaceObject.useA;
+            }
+            const compiled = compile(useAction);
+            if ('function' == typeof compiled) return compiled;
+            console.warn("useAction compilation failed: ".concat(useAction), compiled);
+            return external_hooks_js_namespaceObject.useA;
+        }
+        console.warn("useAction is not a function or string reference:", useAction);
+        return external_hooks_js_namespaceObject.useA;
+    }, [
+        useAction,
+        compile,
+        scope
+    ]);
+    return compiledUseAction(actionCallback);
+};
+exports.useCompiledAction = __webpack_exports__.useCompiledAction;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "useCompiledAction"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/lib/schema-component/antd/appends-tree-select/AppendsTreeSelectV2.js

@@ -37,7 +37,11 @@ function usePropsCollection(param) {
     return collection;
 }
 function loadChildren(option) {
-    const result = getCollectionFieldOptions.call(this, option.field.target, option);
+    var _this_needLeaf;
+    const needLeaf = null != (_this_needLeaf = this.needLeaf) ? _this_needLeaf : false;
+    const result = getCollectionFieldOptions.call(this, option.field.target, option, {
+        needLeaf
+    });
     if (result.length) {
         if (!result.some((item)=>isAssociation(item.field))) option.isLeaf = true;
     } else option.isLeaf = true;
@@ -57,13 +61,18 @@ function getCollectionFieldOptions(collection, parentNode) {
     const [dataSourceName, collectionName] = (0, external_index_js_namespaceObject.parseCollectionName)(collection);
     const rawFields = this.getCollectionFields(collectionName, dataSourceName);
     const fields = needLeaf ? rawFields : rawFields.filter(isAssociation);
-    const boundLoadChildren = loadChildren.bind(this);
+    const boundLoadChildren = loadChildren.bind({
+        ...this,
+        needLeaf
+    });
     return fields.filter(this.filter).map((field)=>{
         var _field_uiSchema;
         const key = parentNode ? "".concat(parentNode.value ? "".concat(parentNode.value, ".") : '').concat(field.name) : field.name;
         var _this_compile;
         const fieldTitle = null != (_this_compile = this.compile(null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title)) ? _this_compile : field.name;
-        const isLeaf = !this.getCollectionFields(field.target).filter(isAssociation).filter(this.filter).length;
+        const targetFields = field.target ? this.getCollectionFields(field.target) : [];
+        const availableFields = needLeaf ? targetFields : targetFields.filter(isAssociation);
+        const isLeaf = !availableFields.filter(this.filter).length;
         var _parentNode_key;
         return {
             pId: null != (_parentNode_key = null == parentNode ? void 0 : parentNode.key) ? _parentNode_key : null,
@@ -127,7 +136,8 @@ const AppendsTreeSelectV2 = (props)=>{
         const tData = null === propsLoadData ? [] : getCollectionFieldOptions.call({
             compile,
             getCollectionFields,
-            filter
+            filter,
+            needLeaf
         }, collectionString, parentNode, {
             needLeaf
         });

package/lib/schema-component/antd/table/Table.Array.js

@@ -158,6 +158,7 @@ const useTableColumns = ()=>{
             }),
             dataIndex: s.name,
             key: s.name,
+            ...s['x-component-props'],
             render: (v, record)=>{
                 var _field_value;
                 const index = null == (_field_value = field.value) ? void 0 : _field_value.indexOf(record);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -21,8 +21,8 @@
     "@floating-ui/react": "0.26.28",
     "@js-preview/excel": "^1.7.14",
     "@lottiefiles/dotlottie-react": "^0.9.3",
-    "@tachybase/schema": "*",
-    "@tego/client": "*",
+    "@tachybase/schema": "1.3.52",
+    "@tego/client": "1.3.52",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
     "antd-style": "3.7.1",