@gct-paas/render 6.0.0-dev.6 → 6.0.0-dev.60

package/es/Event/Dependency/controller.d.ts

@@ -1,7 +1,8 @@
 /**组件依赖触发器 */
-export declare function insetDep({ expression, rowData, }: {
+export declare function insetDep({ expression, rowData, immediate, }: {
     expression?: string;
     rowData?: IObject | null;
+    immediate?: boolean;
 }, callback: (value: unknown) => void): void;
 /**
  * 直接计算表达式结果，不进行依赖监控

package/es/Event/Dependency/controller.mjs

@@ -5,7 +5,7 @@ import { computed } from "vue";
 import { watchDebounced } from "@vueuse/core";
 //#region src/Event/Dependency/controller.ts
 /**组件依赖触发器 */
-function insetDep({ expression = "", rowData = null }, callback) {
+function insetDep({ expression = "", rowData = null, immediate = true }, callback) {
 	if (!expression || expression === "true") {
 		callback(true);
 		return;
@@ -40,10 +40,12 @@ function insetDep({ expression = "", rowData = null }, callback) {
 			const { formKey, itemKey } = formCacheMap[k];
 			cache[k] = itemKey ? form[formKey]?.[itemKey] : form[formKey];
 		});
-		calculate(expression, cache).then(callback);
+		calculate(expression, cache).then(callback).catch((err) => {
+			console.error("[组件依赖] 表达式计算失败:", expression, cache, err);
+		});
 	}
-	/**当处于行内场景的时候需要立即执行 快速响应 */
-	if (rowData) playValueByRule(cacheFormFileds.value);
+	/**当处于行内场景且需要立即执行时 */
+	if (rowData && immediate) playValueByRule(cacheFormFileds.value);
 	/**
 	* 监听收集的依赖
 	*/
@@ -51,7 +53,7 @@ function insetDep({ expression = "", rowData = null }, callback) {
 		playValueByRule(cacheFormFileds.value);
 	}, {
 		debounce: 200,
-		immediate: !rowData
+		immediate: immediate && !rowData
 	});
 }
 /**

package/es/Event/Dependency/displayRule.mjs

@@ -68,7 +68,9 @@ function playValueByRule(form, formCacheMap, displayRule, callback) {
 		const { formKey, itemKey } = formCacheMap[k];
 		cache[k] = form?.[formKey]?.[itemKey];
 	});
-	calculate(displayRule, cache).then(callback);
+	calculate(displayRule, cache).then(callback).catch((err) => {
+		console.error("[显隐规则] 表达式计算失败:", displayRule, cache, err);
+	});
 }
 /**
 * 需要做控制的数组组件

package/es/Event/Dependency/useDependency.mjs

@@ -3,7 +3,7 @@ import "../../utils/index.mjs";
 import "../utils/processRovedInfo.mjs";
 import { insetDep } from "./controller.mjs";
 import { ASSIGNMENTSTRATEGY_ENUM, Dependency_ENUM } from "@gct-paas/core";
-import { computed, inject, toRef } from "vue";
+import { computed, inject, ref, toRef } from "vue";
 import { watchDebounced } from "@vueuse/core";
 //#region src/Event/Dependency/useDependency.ts
 function useDependency(widget, formState = {}, isRow = false) {
@@ -14,6 +14,17 @@ function useDependency(widget, formState = {}, isRow = false) {
 	if (useProcessFieldEvent) useProcessFieldEvent.useFieldWidget(widget);
 	if (!useProcessFieldEvent && widget.formItem && formReadonly?.value !== void 0) widget.props.readonly = formReadonly?.value || widget.props.readonly;
 	if (!useProcessFieldEvent && !formReadonly?.value) {
+		/**
+		* readonly 由只读/必填/禁用规则的最新结果共同决定，避免多个异步回调各自回写相互覆写：
+		* 只读规则结果覆盖基础 readonly；必填/禁用触发时强制可编辑（readonly=false）
+		*/
+		const readonlyByRule = ref(null);
+		const requiredForceEditable = ref(false);
+		const disabledForceEditable = ref(false);
+		const applyReadonly = () => {
+			const base = readonlyByRule.value ?? readonly;
+			widget.props.readonly = base && !requiredForceEditable.value && !disabledForceEditable.value;
+		};
 		const readonly_expression = configDependency[Dependency_ENUM.READONLY]?.expression;
 		const readonly_field_value = configDependency[Dependency_ENUM.READONLY]?.fieldValue;
 		const readonly_value = configDependency[Dependency_ENUM.READONLY]?.value;
@@ -21,7 +32,8 @@ function useDependency(widget, formState = {}, isRow = false) {
 			expression: readonly_expression,
 			rowData: isRow ? formState : null
 		}, (res) => {
-			widget.props.readonly = !!res;
+			readonlyByRule.value = !!res;
+			applyReadonly();
 		});
 		const required_expression = configDependency[Dependency_ENUM.REQUIRED]?.expression;
 		const required_value = configDependency[Dependency_ENUM.REQUIRED]?.value;
@@ -30,8 +42,8 @@ function useDependency(widget, formState = {}, isRow = false) {
 			rowData: isRow ? formState : null
 		}, (res) => {
 			widget.props.required = !!res;
-			if (res) widget.props.readonly = false;
-			else widget.props.readonly = readonly;
+			requiredForceEditable.value = !!res;
+			applyReadonly();
 		});
 		const disabled_expression = configDependency[Dependency_ENUM.DISABLED]?.expression;
 		if (configDependency[Dependency_ENUM.DISABLED]?.value && disabled_expression) insetDep({
@@ -39,16 +51,23 @@ function useDependency(widget, formState = {}, isRow = false) {
 			rowData: isRow ? formState : null
 		}, (res) => {
 			widget.props.disabled = !!res;
-			if (res) widget.props.readonly = false;
-			else widget.props.readonly = readonly;
+			disabledForceEditable.value = !!res;
+			applyReadonly();
 		});
 	}
 	const assignment_expression = configDependency[Dependency_ENUM.ASSIGNMENT]?.expression;
 	const strategy = configDependency[Dependency_ENUM.ASSIGNMENT]?.strategy;
-	if (assignment_expression) insetDep({
+	const isUserModified = ref(false);
+	if (strategy === ASSIGNMENTSTRATEGY_ENUM.notCoveredForever) {
+		const currentValue = formState[field];
+		if (currentValue !== "" && currentValue !== null && currentValue !== void 0) isUserModified.value = true;
+	}
+	if (assignment_expression && !readonly) insetDep({
 		expression: assignment_expression,
-		rowData: isRow ? formState : null
+		rowData: isRow ? formState : null,
+		immediate: false
 	}, (res) => {
+		if ((strategy === ASSIGNMENTSTRATEGY_ENUM.notCovered || strategy === ASSIGNMENTSTRATEGY_ENUM.notCoveredForever) && isUserModified.value) return;
 		formState[field] = res;
 	});
 	const fieldKey = isFieldModel ? bindFieldLink?.join(".") : field;
@@ -64,6 +83,9 @@ function useDependency(widget, formState = {}, isRow = false) {
 		},
 		set(val) {
 			if (!!assignment_expression && strategy === ASSIGNMENTSTRATEGY_ENUM.alwaysCover) return;
+			if (!!assignment_expression && strategy === ASSIGNMENTSTRATEGY_ENUM.notCovered) if (val === "" || val === null || val === void 0 || val === 0 || val === false) isUserModified.value = false;
+			else isUserModified.value = true;
+			if (!!assignment_expression && strategy === ASSIGNMENTSTRATEGY_ENUM.notCoveredForever) isUserModified.value = true;
 			formRowData.value[fieldKey] = val;
 		}
 	});

package/es/Event/Dependency/useDependencyToShow.mjs

@@ -68,22 +68,28 @@ async function dependencyToShowSync(widget, rowData) {
 	}
 	const { displayType, displayRule } = widget.props || {};
 	const { value, expression } = (widget.props.componentDependency?.configDependency || {})[Dependency_ENUM.HIDDEN] || {};
+	/**计算失败时保持 hidden，避免异常导致组件错误显示 */
+	const safeCalcHidden = async (exp) => {
+		try {
+			return await calculateDepResult({
+				expression: exp,
+				rowData
+			});
+		} catch (err) {
+			console.error("[组件依赖] 显隐规则表达式计算失败:", exp, err);
+			return true;
+		}
+	};
 	if (value && expression) {
 		widget.props.hidden = true;
-		widget.props.hidden = !!await calculateDepResult({
-			expression,
-			rowData
-		});
+		widget.props.hidden = await !!safeCalcHidden(expression);
 	} else if (value)
  /**开启组件依赖没有配置隐藏条件 */
 	widget.props.hidden = true;
 	else if (displayType === DisplayType.RULE && displayRule) {
 		/**老数据显示隐藏配置兼容 */
 		widget.props.hidden = true;
-		widget.props.hidden = !!await calculateDepResult({
-			expression: displayRule,
-			rowData
-		});
+		widget.props.hidden = await !!safeCalcHidden(displayRule);
 	}
 	return !widget.props.hidden;
 }

package/es/Event/baseEvent.mjs

@@ -4,6 +4,7 @@ import "../utils/index.mjs";
 import { $httpBizService, $request, BizService } from "./bizServiceRequest.mjs";
 import { globalLoading } from "./utils/globalLoading.mjs";
 import { ProcessAppRovedData } from "./utils/processRovedInfo.mjs";
+import { ContextExtensionRegistry } from "./context-extension-registry.mjs";
 import { FormComponents, INNER_EVENT, t } from "@gct-paas/core";
 import dayjs from "dayjs";
 import { toRaw } from "vue";
@@ -12,6 +13,7 @@ import * as _ from "lodash-es";
 import { cloneDeep, differenceBy } from "lodash-es";
 import BigNumberJS from "bignumber.js";
 //#region src/Event/baseEvent.ts
+var contextExtensionRegistry = new ContextExtensionRegistry();
 var Events = class {
 	context;
 	searchVNodes;
@@ -45,6 +47,7 @@ var Events = class {
 			$ref: this.getComponent.bind(this),
 			$asyncRef: this.getSyncComponent.bind(this)
 		});
+		contextExtensionRegistry.apply(this.context);
 		this.#createFunction(js);
 		Globals.setContextByKey(this.context, pageKey);
 		this.pageKey = pageKey;

package/es/Event/context-extension-registry.d.ts

@@ -0,0 +1,43 @@
+import { Context } from './baseEvent';
+/** 上下文扩展方法 */
+export type ContextExtension = {
+    bivarianceHack(context: Context, ...args: unknown[]): unknown;
+}['bivarianceHack'];
+/** 上下文扩展方法映射 */
+export type ContextExtensionMethods = Record<string, unknown>;
+/**
+ * 上下文扩展注册中心。
+ *
+ * 注册数据由核心包统一维护，端包和应用层仅通过继承补充保留键策略。
+ */
+export declare class ContextExtensionRegistry {
+    private static readonly extensions;
+    /**
+     * 注册套件提供的上下文扩展方法。
+     *
+     * @param suiteKey 套件标识
+     * @param methods 扩展方法映射
+     */
+    static register(suiteKey: string, methods: ContextExtensionMethods): void;
+    /**
+     * 将已注册扩展挂载到指定上下文。
+     *
+     * @param context 当前页面上下文
+     */
+    apply(context: Context): void;
+    /**
+     * 判断方法名是否为当前层级的内置上下文方法。
+     *
+     * @param context 当前页面上下文
+     * @param methodName 上下文方法名
+     * @returns 是否为保留方法
+     */
+    protected isReservedKey(context: Context, methodName: string): boolean;
+}
+/**
+ * 注册套件上下文扩展。
+ *
+ * @param suiteKey 套件标识
+ * @param methods 扩展方法映射
+ */
+export declare function registerContextExtension(suiteKey: string, methods: ContextExtensionMethods): void;

package/es/Event/context-extension-registry.mjs

@@ -0,0 +1,67 @@
+//#region src/Event/context-extension-registry.ts
+/**
+* 上下文扩展注册中心。
+*
+* 注册数据由核心包统一维护，端包和应用层仅通过继承补充保留键策略。
+*/
+var ContextExtensionRegistry = class ContextExtensionRegistry {
+	static extensions = /* @__PURE__ */ new Map();
+	/**
+	* 注册套件提供的上下文扩展方法。
+	*
+	* @param suiteKey 套件标识
+	* @param methods 扩展方法映射
+	*/
+	static register(suiteKey, methods) {
+		Object.entries(methods).forEach(([methodName, method]) => {
+			if (typeof method !== "function") {
+				console.error(`套件 ${suiteKey} 注册上下文扩展 ${methodName} 失败：扩展值必须是函数`);
+				return;
+			}
+			const previous = this.extensions.get(methodName);
+			if (previous) {
+				const duplicateType = previous.suiteKey === suiteKey ? "同一套件重复" : "套件间";
+				console.warn(`${duplicateType}注册上下文扩展 ${methodName}：${previous.suiteKey} 将被 ${suiteKey} 覆盖`);
+			}
+			this.extensions.set(methodName, {
+				suiteKey,
+				method
+			});
+		});
+	}
+	/**
+	* 将已注册扩展挂载到指定上下文。
+	*
+	* @param context 当前页面上下文
+	*/
+	apply(context) {
+		ContextExtensionRegistry.extensions.forEach(({ suiteKey, method }, methodName) => {
+			if (this.isReservedKey(context, methodName)) {
+				console.error(`套件 ${suiteKey} 的上下文扩展 ${methodName} 与内置上下文方法冲突，已跳过挂载`);
+				return;
+			}
+			context[methodName] = (...args) => method(context, ...args);
+		});
+	}
+	/**
+	* 判断方法名是否为当前层级的内置上下文方法。
+	*
+	* @param context 当前页面上下文
+	* @param methodName 上下文方法名
+	* @returns 是否为保留方法
+	*/
+	isReservedKey(context, methodName) {
+		return methodName in context;
+	}
+};
+/**
+* 注册套件上下文扩展。
+*
+* @param suiteKey 套件标识
+* @param methods 扩展方法映射
+*/
+function registerContextExtension(suiteKey, methods) {
+	ContextExtensionRegistry.register(suiteKey, methods);
+}
+//#endregion
+export { ContextExtensionRegistry, registerContextExtension };

package/es/Event/index.d.ts

@@ -1,5 +1,6 @@
 export { Globals, pageGlobaVariables, globalVarCaches, formMap, setFormData, pageDataforJson, getPageTitle, getPremission, PageTypeEnum, } from './utils/runGlobalByPage';
 export { Events, Context, GctComponent, type ModalInstance } from './baseEvent';
+export { ContextExtensionRegistry, registerContextExtension, type ContextExtension, type ContextExtensionMethods, } from './context-extension-registry';
 export * from './eventType';
 export * from './Dependency/useDependencyToShow';
 export * from './Dependency/useDependency';

package/es/Event/index.mjs

@@ -1,5 +1,6 @@
 import "./utils/appRedis.mjs";
 import "./utils/runGlobalByPage.mjs";
+import "./context-extension-registry.mjs";
 import "./baseEvent.mjs";
 import "./eventType.mjs";
 import "./Dependency/controller.mjs";

package/es/Event/utils/runGlobalByPage.d.ts

@@ -128,6 +128,7 @@ export declare const pageDataforJson: import('vue').Ref<{
         unitType?: "px" | "%" | undefined;
         pageWidth?: number | undefined;
         independentDetailPage?: boolean | undefined;
+        detailPageCustom?: boolean | undefined;
     } | undefined;
     pageName?: string | undefined;
 }, {
@@ -244,6 +245,7 @@ export declare const pageDataforJson: import('vue').Ref<{
         unitType?: "px" | "%" | undefined;
         pageWidth?: number | undefined;
         independentDetailPage?: boolean | undefined;
+        detailPageCustom?: boolean | undefined;
     } | undefined;
     pageName?: string | undefined;
 } | {

package/es/index.mjs

@@ -26,10 +26,11 @@ import { cacheAdapter } from "./utils/cacheAdapter.mjs";
 import { getRefInfoId } from "./utils/get-ref-data.mjs";
 import { useGetBodyBySearch } from "./utils/search/search-hooks.mjs";
 import { defaultValMap } from "./utils/search/search-default-value.mjs";
-import { getIExp, getIKeywordFieldKeys, getQueryDateByKeyWord, getQuerySort, useQueryfilter } from "./utils/search/listhook.mjs";
+import { getIExp, getIKeywordFieldKeys, getQueryDateByKeyWord, getQuerySort, getSimilarFieldBySearchField, useQueryfilter } from "./utils/search/listhook.mjs";
 import { is, isArray, isBoolean, isDate, isDef, isElement, isEmpty, isEmptyStr, isFunction, isMap, isNull, isNullAndUnDef, isNullOrUnDef, isNumber, isObject, isPromise, isRegExp, isString, isUnDef, isUrl, isWindow } from "./utils/is.mjs";
 import { emptyValueDisplay } from "./utils/field-empty-value.mjs";
 import "./utils/index.mjs";
+import { ContextExtensionRegistry, registerContextExtension } from "./Event/context-extension-registry.mjs";
 import { Context, Events, GctComponent } from "./Event/baseEvent.mjs";
 import { calculateDepResult, insetDep } from "./Event/Dependency/controller.mjs";
 import { getOptionsByDisplayRule, useDisplayRuleColumnByStyles, useDisplayRuleOptions, useVisibileByRuleHook } from "./Event/Dependency/displayRule.mjs";
@@ -53,4 +54,4 @@ function onInit() {
 }
 onInit();
 //#endregion
-export { Context, ControllerType, DESIGN_DATA_KEY_TAG, DESIGN_TYPE, DateFormat, DateRangeMap, DatepickerRanges, DesignItemAttribute, DesignNodeType, DesignRender, DesignRenderViewPrefix, Events, FieldSchema, GctComponent, GlobaAppInfo, Globals, HandwritingPad_default as HandwritingPad, PageTypeEnum, RenderDesignEditor, RenderNodeRegister, RenderNodeType, RenderPluginPgkUtil, RenderRegister, Vue3DndDraggable, Vue3DndDraggableItem, addDataByForm, cacheAdapter, calculate, calculateDepResult, containerNodeProps, defaultValMap, dependencyToShow, dependencyToShowSync, emptyValueDisplay, formMap, getDefaultDate, getDisabledDate, getIExp, getIKeywordFieldKeys, getMobileDateRange, getOptionsByDisplayRule, getPageTitle, getPremission, getQueryDateByKeyWord, getQuerySort, getRefInfoId, globalVarCaches, identify, initFieldWidgetRuntime, insetDep, is, isArray, isBoolean, isDate, isDef, isElement, isEmpty, isEmptyStr, isFunction, isMap, isNull, isNullAndUnDef, isNullOrUnDef, isNumber, isObject, isPromise, isRegExp, isString, isUnDef, isUrl, isWindow, nodeEditorProps, nodeProps, onInit, pageDataforJson, pageGlobaVariables, renderSetupApp, schemaToStyle, setDataByForm, setFormData, tableWidgetByDept, tableWidgetToShow, transSelectData, transformData, transformDataToDict, transformPropsField, transformSourceData, useAsyncFileAttrs, useDependency, useDependencyByRequired, useDependencyToShow, useDependencyToShowList, useDesignRenderController, useDisplayRuleColumnByStyles, useDisplayRuleOptions, useGctSelect, useGetBodyBySearch, useQueryfilter, useStyle, useVisibileByRuleHook, widthRenderDesignEditorInstall };
+export { Context, ContextExtensionRegistry, ControllerType, DESIGN_DATA_KEY_TAG, DESIGN_TYPE, DateFormat, DateRangeMap, DatepickerRanges, DesignItemAttribute, DesignNodeType, DesignRender, DesignRenderViewPrefix, Events, FieldSchema, GctComponent, GlobaAppInfo, Globals, HandwritingPad_default as HandwritingPad, PageTypeEnum, RenderDesignEditor, RenderNodeRegister, RenderNodeType, RenderPluginPgkUtil, RenderRegister, Vue3DndDraggable, Vue3DndDraggableItem, addDataByForm, cacheAdapter, calculate, calculateDepResult, containerNodeProps, defaultValMap, dependencyToShow, dependencyToShowSync, emptyValueDisplay, formMap, getDefaultDate, getDisabledDate, getIExp, getIKeywordFieldKeys, getMobileDateRange, getOptionsByDisplayRule, getPageTitle, getPremission, getQueryDateByKeyWord, getQuerySort, getRefInfoId, getSimilarFieldBySearchField, globalVarCaches, identify, initFieldWidgetRuntime, insetDep, is, isArray, isBoolean, isDate, isDef, isElement, isEmpty, isEmptyStr, isFunction, isMap, isNull, isNullAndUnDef, isNullOrUnDef, isNumber, isObject, isPromise, isRegExp, isString, isUnDef, isUrl, isWindow, nodeEditorProps, nodeProps, onInit, pageDataforJson, pageGlobaVariables, registerContextExtension, renderSetupApp, schemaToStyle, setDataByForm, setFormData, tableWidgetByDept, tableWidgetToShow, transSelectData, transformData, transformDataToDict, transformPropsField, transformSourceData, useAsyncFileAttrs, useDependency, useDependencyByRequired, useDependencyToShow, useDependencyToShowList, useDesignRenderController, useDisplayRuleColumnByStyles, useDisplayRuleOptions, useGctSelect, useGetBodyBySearch, useQueryfilter, useStyle, useVisibileByRuleHook, widthRenderDesignEditorInstall };

package/es/register/render-register/render-register.d.ts

@@ -45,7 +45,7 @@ export declare class RenderRegister {
      * @param {string} [prefix]
      * @return {*}  {(Component | undefined)}
      */
-    get(tag: string, prefix?: string): Component | undefined;
+    get(tag: string, prefix?: string, isSilent?: boolean): Component | undefined;
     /**
      * 组件标识清单
      *

package/es/register/render-register/render-register.mjs

@@ -56,10 +56,12 @@ var RenderRegister = class {
 	* @param {string} [prefix]
 	* @return {*}  {(Component | undefined)}
 	*/
-	get(tag, prefix) {
+	get(tag, prefix, isSilent = false) {
 		const fullTag = prefix ? `${prefix}:${tag}` : tag;
 		const component = this.map.get(fullTag);
-		if (!component) console.warn(`未找到组件，标识: ${fullTag}`);
+		if (!component) {
+			if (!isSilent) console.warn(`未找到组件，标识: ${fullTag}`);
+		}
 		return component;
 	}
 	/**

package/es/setup-app.mjs

@@ -1,6 +1,12 @@
 import { registerRenderLocale } from "./locale/auto-register.mjs";
 //#region src/setup-app.ts
+var renderSetupAppKey = Symbol.for("@gct-paas/render/setupApp");
 async function renderSetupApp(_app) {
+	if (Reflect.get(window, renderSetupAppKey)) {
+		console.error("@gct-paas/render renderSetupApp 已执行，请勿重复调用。");
+		return;
+	}
+	Reflect.set(window, renderSetupAppKey, true);
 	registerRenderLocale();
 }
 //#endregion

package/es/utils/expression/index.d.ts

@@ -1,4 +1,16 @@
 import { UseMemoizeReturn } from '@vueuse/core';
+/**
+ * 运行时注册单个公式函数执行器（第三方/业务方在预览态/运行态调用）
+ * @param fnName 函数名，必须与公式编辑器注册时的 id 完全一致（大小写敏感）；
+ *             与内置函数（methods.ts）重名时内置优先，扩展不会覆盖平台行为
+ * @param executor 执行体，支持同步/async 函数（引擎按 await 调用）
+ */
+export declare function registerExpressionMethods(fnName: string, executor: (...args: any[]) => any): void;
+/**
+ * 按函数名卸载已注册的执行器；不传参数则清空全部
+ * @param names 函数名列表
+ */
+export declare function unregisterExpressionMethods(...names: string[]): void;
 export declare const identify: UseMemoizeReturn<string[], [expr: string, isAll?: boolean | undefined]>;
 export declare const calculate: UseMemoizeReturn<Promise<IObject | number>, [
     expr: string,

package/es/utils/expression/index.mjs

@@ -5,7 +5,30 @@ import * as esprima from "esprima-next";
 import estraverse from "estraverse";
 import escodegen from "escodegen";
 //#region src/utils/expression/index.ts
-window._METHOD_DEBUG_ = methods_exports;
+/**
+* 运行时注册的业务函数执行器。
+* 公式编辑器注册的业务函数（options.functions）只随定义携带可选的 execute，
+* 表达式持久化仅保存函数名；执行体必须在会执行表达式的应用启动时注册到这里。
+*/
+var extensionMethods = {};
+Object.defineProperty(window, "_METHOD_DEBUG_", {
+	configurable: true,
+	enumerable: true,
+	get: () => ({
+		...extensionMethods,
+		...methods_exports
+	})
+});
+/**
+* 运行时注册单个公式函数执行器（第三方/业务方在预览态/运行态调用）
+* @param fnName 函数名，必须与公式编辑器注册时的 id 完全一致（大小写敏感）；
+*             与内置函数（methods.ts）重名时内置优先，扩展不会覆盖平台行为
+* @param executor 执行体，支持同步/async 函数（引擎按 await 调用）
+*/
+function registerExpressionMethods(fnName, executor) {
+	if (typeof fnName === "string" && fnName && typeof executor === "function") extensionMethods[fnName] = executor;
+	else console.warn("[Expression] registerExpressionMethods 参数非法：fnName 需为非空字符串，executor 需为函数");
+}
 var identify = useMemoize(_identify);
 var calculate = useMemoize(_calc);
 function _deepCalcName(node) {
@@ -75,12 +98,15 @@ async function _calc(expr, values) {
 	});
 	const calcFunc = new AsyncFunction("Methods", [
 		...defs,
-		`return new Promise(async(resolve)=>{`,
+		`return (async () => {`,
 		`const res = ${runjs};`,
-		"resolve(res);",
-		"})"
+		"return res;",
+		"})()"
 	].join("\n"));
-	const result = await calcFunc(methods_exports);
+	const result = await calcFunc({
+		...extensionMethods,
+		...methods_exports
+	});
 	console.info("【表达式】", expr);
 	console.info("【参数】", values);
 	console.info("【执行语句】", calcFunc.toString());
@@ -111,7 +137,9 @@ function _identify(expr, isAll = false) {
 }
 window.gct_expression = {
 	execute: calculate,
-	identify
+	identify,
+	/** 控制台快速注册执行体做临时验证：gct_expression.register('MY_FN', v => ...) */
+	register: registerExpressionMethods
 };
 //#endregion
 export { calculate, identify };

package/es/utils/expression/regularExpression/methods.d.ts

@@ -40,9 +40,13 @@ declare function MIN(...args: (number | '')[]): number | '';
 declare function SMALL(v: number[], n: number): number | undefined;
 declare function AVERAGE(...args: (number | '')[]): number | '';
 declare function ABS(v: number): number;
+declare function MAXABS(...args: number[]): number | '';
+declare function BANKROUND(v: number | string, n: number): number | '';
 declare function MOD(v: number, n: number): number | string;
 declare function POWER(v: number, n: number): number;
 declare function SQRT(v: number): number;
+declare function EXP(v: number): number;
+declare function LN(v: number): number;
 declare function GET<T extends object | IObject[]>(v: T, p: number | keyof T): T[keyof T];
 declare function PUT<T extends object>(a: T, b: keyof T, c: unknown): T;
 declare function PUSH<T>(v: T[], n: T): T[];
@@ -50,6 +54,8 @@ declare function HEADPUSH<T>(v: T[], n: T): T[];
 declare function TIMESTAMP2DATE(v: number): string | undefined;
 declare function DATE2TIMESTAMP(v: string): number | undefined;
 declare function DATEFORMAT(v: Date, f: string): string | undefined;
+declare function DateAdd(v: string, num: number, unit: dayjs.ManipulateType, format?: string): string | undefined;
+declare function DateSubtract(v: string, num: number, unit: dayjs.ManipulateType, format?: string): string | undefined;
 declare function NOW(): string;
 declare function TODAY(): string;
 declare function YEAR(v: dayjs.ConfigType): number;
@@ -72,6 +78,8 @@ declare function SEQMAP<K extends string | number | symbol, V>(...args: (K | V)[
 declare function SUMSQ(...args: (string | '')[]): number | string;
 /**数组计数 */
 declare function COUNT(v: number[]): number | '';
-/**标准差函数 */
-declare function STDEV(...args: number[]): number | '';
-export { IF, ISEMPTY, ISNULL, ISUNDEFINED, AND, OR, EQ, NE, LE, LT, GE, GT, LEN, CONCAT, SUBSTRING, SUBSTR, UPPER, LOWER, TRIM, LTRIM, RTRIM, REPEAT, REPLACE, FINDSTR, SEARCHSTR, PARSENUMBER, SPLIT, SUM, ADD, REDUCE, MULTIPLICATION, DIVISION, FIXED, ROUND, ROUNDUP, MAX, LARGE, MIN, SMALL, AVERAGE, ABS, MOD, POWER, SQRT, GET, PUT, PUSH, HEADPUSH, TIMESTAMP2DATE, DATE2TIMESTAMP, DATEFORMAT, NOW, TODAY, YEAR, MONTH, DAY, HOUR, MINUTE, WEEKRANGE, LASTWEEKRANGE, MONTHRANGE, LASTMONTHRANGE, YEARRANGE, LASTYEARRANGE, QUARTER, LASTQUARTER, ISDATERANGE, ISTIMERANGE, TUPLE, SEQMAP, SUMSQ, COUNT, STDEV, };
+/**标准差函数，支持任意个参数，参数可为数组或非数组，空值不参与计算 */
+declare function STDEV(...args: unknown[]): number | '';
+/** RSQ函数 */
+declare function RSQ(arr1: number[], arr2: number[]): number | '';
+export { IF, ISEMPTY, ISNULL, ISUNDEFINED, AND, OR, EQ, NE, LE, LT, GE, GT, LEN, CONCAT, SUBSTRING, SUBSTR, UPPER, LOWER, TRIM, LTRIM, RTRIM, REPEAT, REPLACE, FINDSTR, SEARCHSTR, PARSENUMBER, SPLIT, SUM, ADD, REDUCE, MULTIPLICATION, DIVISION, FIXED, ROUND, ROUNDUP, MAX, LARGE, MIN, SMALL, AVERAGE, ABS, MAXABS, MOD, POWER, SQRT, EXP, LN, GET, PUT, PUSH, HEADPUSH, TIMESTAMP2DATE, DATE2TIMESTAMP, DATEFORMAT, DateAdd, DateSubtract, NOW, TODAY, YEAR, MONTH, DAY, HOUR, MINUTE, WEEKRANGE, LASTWEEKRANGE, MONTHRANGE, LASTMONTHRANGE, YEARRANGE, LASTYEARRANGE, QUARTER, LASTQUARTER, ISDATERANGE, ISTIMERANGE, TUPLE, SEQMAP, SUMSQ, COUNT, STDEV, RSQ, BANKROUND, };