@gct-paas/render 0.1.6-dev.9 → 6.0.0-dev.10

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

@@ -8,6 +8,8 @@ interface DisplayRule {
 }
 /**单组件显隐控制 */
 export declare function useVisibileByRuleHook(props: DisplayRule, id: string): Readonly<import('vue').Ref<boolean, boolean>>;
+/**组件显示规则 */
+export declare function getOptionsByDisplayRule({ displayRule, tableForm }: DisplayRule, callback: (value: unknown) => void): void;
 /**
  * 需要做控制的数组组件
  * @param optopns 被控制的数组

package/es/Event/Dependency/displayRule.mjs

@@ -135,4 +135,4 @@ function useDisplayRuleOptionsBytable(optopns, tableForm) {
 	}));
 }
 //#endregion
-export { useDisplayRuleColumnByStyles, useDisplayRuleOptions, useVisibileByRuleHook };
+export { getOptionsByDisplayRule, useDisplayRuleColumnByStyles, useDisplayRuleOptions, useVisibileByRuleHook };

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,6 +1,7 @@
 import "./utils/appRedis.mjs";
 import "./utils/runGlobalByPage.mjs";
 import "./baseEvent.mjs";
+import "./context-extension-registry.mjs";
 import "./eventType.mjs";
 import "./Dependency/controller.mjs";
 import "./Dependency/displayRule.mjs";

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

@@ -125,6 +125,9 @@ export declare const pageDataforJson: import('vue').Ref<{
             title?: string | undefined;
         } | undefined;
         hasFooter?: boolean | undefined;
+        unitType?: "px" | "%" | undefined;
+        pageWidth?: number | undefined;
+        independentDetailPage?: boolean | undefined;
     } | undefined;
     pageName?: string | undefined;
 }, {
@@ -238,6 +241,9 @@ export declare const pageDataforJson: import('vue').Ref<{
             title?: string | undefined;
         } | undefined;
         hasFooter?: boolean | undefined;
+        unitType?: "px" | "%" | undefined;
+        pageWidth?: number | undefined;
+        independentDetailPage?: boolean | undefined;
     } | undefined;
     pageName?: string | undefined;
 } | {
@@ -322,6 +328,16 @@ export declare class Globals {
         data: RuntimePageJson;
         name: string | undefined;
     }>;
+    static initTxnPageByid(id: string, isDetail?: boolean): Promise<{
+        res: import('@gct-paas/api/apaas').TransactionResponse;
+        data: RuntimePageJson;
+        name: string | undefined;
+    }>;
+    static initDetailPageById(id: string): Promise<{
+        res: import('@gct-paas/api/apaas').DetailPageResponse;
+        data: RuntimePageJson;
+        name: string | undefined;
+    }>;
     static initHistoryByid(id: string): Promise<{
         res: import('@gct-paas/api/apaas').PageDesignerLogResponse;
         data: any;

package/es/Event/utils/runGlobalByPage.mjs

@@ -14,9 +14,16 @@ var PageTypeEnum = /* @__PURE__ */ function(PageTypeEnum) {
 	return PageTypeEnum;
 }({});
 var getPageApiByMap = {
-	[PageTypeEnum.WEB]: { getPageInfo: _gct.api.apaas.webpage.getInfo },
+	[PageTypeEnum.WEB]: {
+		getPageInfo: _gct.api.apaas.webpage.getInfo,
+		getTxnPageInfo: _gct.api.apaas.transaction.getGetVersionById,
+		getDetailPageInfo: _gct.api.apaas.detailPage.getInfo
+	},
 	[PageTypeEnum.MOBILE]: { getPageInfo: _gct.api.apaas.mobilePage.getInfo },
-	[PageTypeEnum.PAD]: { getPageInfo: _gct.api.apaas.padPage.getInfo }
+	[PageTypeEnum.PAD]: {
+		getPageInfo: _gct.api.apaas.padPage.getInfo,
+		getTxnPageInfo: _gct.api.apaas.transaction.getGetVersionById
+	}
 };
 var pageGlobaVariables = ref({});
 /**app全局变量 */
@@ -235,6 +242,43 @@ var Globals = class Globals {
 			name
 		};
 	}
+	static async initTxnPageByid(id, isDetail = false) {
+		this.pageID = id;
+		const getJSon = getPageApiByMap[PageTypeEnum.WEB].getTxnPageInfo;
+		const res = await getJSon({ id });
+		const { runtimeJson: createJson, detailRuntimeJson: detailJson, name } = res || {};
+		const runtimeJson = isDetail ? detailJson : createJson;
+		pageDataforJson.value.pageName = name;
+		if (!runtimeJson) return Promise.reject();
+		const data = JSON.parse(runtimeJson);
+		if (!data.widgets.filter((item) => item.type !== "bottom-button-container").length) return Promise.reject();
+		await this.initGlobalS(data);
+		pageDataforJson.value.pageConfig = data.pageConfig || {};
+		pageDataforJson.value.pageStyle = data.pageStyle || {};
+		return {
+			res,
+			data,
+			name
+		};
+	}
+	static async initDetailPageById(id) {
+		this.pageID = id;
+		const getJSon = getPageApiByMap[PageTypeEnum.WEB].getDetailPageInfo;
+		const res = await getJSon({ id });
+		const { runtimeJson, name } = res || {};
+		pageDataforJson.value.pageName = name;
+		if (!runtimeJson) return Promise.reject();
+		const data = JSON.parse(runtimeJson);
+		if (!data.widgets.filter((item) => item.type !== "bottom-button-container").length) return Promise.reject();
+		await this.initGlobalS(data);
+		pageDataforJson.value.pageConfig = data.pageConfig || {};
+		pageDataforJson.value.pageStyle = data.pageStyle || {};
+		return {
+			res,
+			data,
+			name
+		};
+	}
 	static async initHistoryByid(id) {
 		this.pageID = id;
 		const res = await _gct.api.apaas.pageDesignerLog.getInfo({ id });

package/es/index.d.ts

@@ -8,4 +8,5 @@ export * from './providers';
 export * from './register';
 export * from './utils';
 export * from './modules/vue3-dnd';
+export { renderSetupApp } from './setup-app';
 export declare function onInit(): void;

package/es/index.mjs

@@ -31,8 +31,9 @@ import { is, isArray, isBoolean, isDate, isDef, isElement, isEmpty, isEmptyStr,
 import { emptyValueDisplay } from "./utils/field-empty-value.mjs";
 import "./utils/index.mjs";
 import { Context, Events, GctComponent } from "./Event/baseEvent.mjs";
+import { ContextExtensionRegistry, registerContextExtension } from "./Event/context-extension-registry.mjs";
 import { calculateDepResult, insetDep } from "./Event/Dependency/controller.mjs";
-import { useDisplayRuleColumnByStyles, useDisplayRuleOptions, useVisibileByRuleHook } from "./Event/Dependency/displayRule.mjs";
+import { getOptionsByDisplayRule, useDisplayRuleColumnByStyles, useDisplayRuleOptions, useVisibileByRuleHook } from "./Event/Dependency/displayRule.mjs";
 import { dependencyToShow, dependencyToShowSync, tableWidgetByDept, tableWidgetToShow, useDependencyToShow, useDependencyToShowList } from "./Event/Dependency/useDependencyToShow.mjs";
 import { useDependency, useDependencyByRequired } from "./Event/Dependency/useDependency.mjs";
 import "./Event/index.mjs";
@@ -40,10 +41,17 @@ import { containerNodeProps, nodeEditorProps, nodeProps } from "./props/index.mj
 import { Vue3DndDraggableItem } from "./modules/vue3-dnd/components/vue3-dnd-draggable-item/vue3-dnd-draggable-item.mjs";
 import { Vue3DndDraggable } from "./modules/vue3-dnd/components/vue3-dnd-draggable/vue3-dnd-draggable.mjs";
 import "./modules/vue3-dnd/index.mjs";
+import { renderSetupApp } from "./setup-app.mjs";
 //#region src/index.ts
 function onInit() {
 	if (!_gct.register.render) _gct.register.render = new RenderRegister();
 	else console.warn("渲染注册已存在，可能存在重复注册问题，请检查是否有重复引入渲染包的情况");
+	if (!window._kit) Object.defineProperty(window, "_kit", {
+		value: {},
+		writable: false,
+		configurable: false
+	});
 }
+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, 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, 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, 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/locale/auto-register.d.ts

@@ -0,0 +1,2 @@
+/** 注册 render 包的 locale 多语言资源 */
+export declare function registerRenderLocale(): void;

package/es/locale/auto-register.mjs

@@ -0,0 +1,13 @@
+import { process_exports } from "./sys/process.mjs";
+import { sys_exports } from "./sys.mjs";
+//#region src/locale/auto-register.ts
+var localeModules = /* @__PURE__ */ Object.assign({
+	"./sys/process.ts": process_exports,
+	"./sys.ts": sys_exports
+});
+/** 注册 render 包的 locale 多语言资源 */
+function registerRenderLocale() {
+	_gct.i18nUtil.autoRegisterLocale(localeModules);
+}
+//#endregion
+export { registerRenderLocale };

package/es/locale/sys/process.mjs

@@ -0,0 +1,10 @@
+import { __exportAll } from "../../_virtual/_rolldown/runtime.mjs";
+//#region src/locale/sys/process.ts
+var process_exports = /* @__PURE__ */ __exportAll({ default: () => process_default });
+var process_default = {
+	pleaseInitiateTheProcessFirst: "未找到流程数据，请先发起流程",
+	processInstanceMismatch: "流程实例不匹配！",
+	element: { approval: "审批" }
+};
+//#endregion
+export { process_exports };

package/es/locale/sys.mjs

@@ -0,0 +1,6 @@
+import { __exportAll } from "../_virtual/_rolldown/runtime.mjs";
+//#region src/locale/sys.ts
+var sys_exports = /* @__PURE__ */ __exportAll({ default: () => sys_default });
+var sys_default = { success: "成功" };
+//#endregion
+export { sys_exports };

package/es/setup-app.d.ts

@@ -0,0 +1,2 @@
+import { App } from 'vue';
+export declare function renderSetupApp(_app: App): Promise<void>;

package/es/setup-app.mjs

@@ -0,0 +1,7 @@
+import { registerRenderLocale } from "./locale/auto-register.mjs";
+//#region src/setup-app.ts
+async function renderSetupApp(_app) {
+	registerRenderLocale();
+}
+//#endregion
+export { renderSetupApp };

package/es/types/index.d.ts

@@ -5,3 +5,13 @@ declare module '@gct-paas/core' {
     render: RenderRegister;
   }
 }
+declare global {
+  interface Window {
+    /**
+     * 套件全局方法
+     *
+     * @type {IObject}
+     */
+    _kit: IObject;
+  }
+}

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

@@ -40,6 +40,7 @@ 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 MOD(v: number, n: number): number | string;
 declare function POWER(v: number, n: number): number;
 declare function SQRT(v: number): number;
@@ -74,4 +75,6 @@ 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, };
+/** 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, 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, RSQ, };

package/es/utils/expression/regularExpression/methods.mjs

@@ -44,6 +44,7 @@ var methods_exports = /* @__PURE__ */ __exportAll({
 	LT: () => LT,
 	LTRIM: () => LTRIM,
 	MAX: () => MAX,
+	MAXABS: () => MAXABS,
 	MIN: () => MIN,
 	MINUTE: () => MINUTE,
 	MOD: () => MOD,
@@ -63,6 +64,7 @@ var methods_exports = /* @__PURE__ */ __exportAll({
 	REPLACE: () => REPLACE,
 	ROUND: () => ROUND,
 	ROUNDUP: () => ROUNDUP,
+	RSQ: () => RSQ,
 	RTRIM: () => RTRIM,
 	SEARCHSTR: () => SEARCHSTR,
 	SEQMAP: () => SEQMAP,
@@ -324,6 +326,12 @@ function ABS(v) {
 	const fn = () => Math.abs.call(null, v);
 	return fn();
 }
+function MAXABS(...args) {
+	const v = args.flat().filter((i) => i !== null && i !== void 0);
+	if (!v.length) return "";
+	const fn = () => v.reduce((prev, current) => Math.abs(Number(current)) > Math.abs(Number(prev)) ? current : prev);
+	return fn();
+}
 function MOD(v, n) {
 	const fn = () => {
 		if (v === 0) throw new Error("The second value should not be zero.");
@@ -564,6 +572,30 @@ function STDEV(...args) {
 	}, 0) / (data.length - 1);
 	return Math.sqrt(variance);
 }
+/** RSQ函数 */
+function RSQ(arr1, arr2) {
+	if (!Array.isArray(arr1) || !Array.isArray(arr2)) return "";
+	const y = arr1.map((v) => Number(v)).filter((v) => Number.isFinite(v));
+	const x = arr2.map((v) => Number(v)).filter((v) => Number.isFinite(v));
+	if (y.length <= 1 || x.length <= 1 || y.length !== x.length) return "";
+	const n = y.length;
+	const meanY = y.reduce((sum, val) => sum + val, 0) / n;
+	const meanX = x.reduce((sum, val) => sum + val, 0) / n;
+	let numerator = 0;
+	let denomY = 0;
+	let denomX = 0;
+	for (let i = 0; i < n; i++) {
+		const diffY = y[i] - meanY;
+		const diffX = x[i] - meanX;
+		numerator += diffX * diffY;
+		denomY += diffY * diffY;
+		denomX += diffX * diffX;
+	}
+	if (denomY === 0 || denomX === 0) return "";
+	const r = numerator / Math.sqrt(denomX * denomY);
+	const rsq = r * r;
+	return Math.min(Math.max(rsq, 0), 1);
+}
 function plus(a, b) {
 	const result = new BigNumberJS(a).plus(new BigNumberJS(b)).toNumber();
 	if (isNaN(result)) return "";

package/es/utils/get-ref-data.mjs

@@ -19,7 +19,7 @@ async function getDataByModelType({ refOriginFieldType, modelKey, foreignFields,
 			modelKey,
 			bsKey: "rdoGetVersionByRefId",
 			modelCategory: EntityModelCategoryEnum.ENTITY
-		}, { foreignFields }, { refId: ids });
+		}, { refId: ids }, { foreignFields });
 		return {
 			data,
 			dict
@@ -29,10 +29,10 @@ async function getDataByModelType({ refOriginFieldType, modelKey, foreignFields,
 			modelKey,
 			bsKey: "getOne",
 			modelCategory: EntityModelCategoryEnum.ENTITY
-		}, {
+		}, {}, {
 			query: { "id_.eq": ids },
 			foreignFields
-		}, {});
+		});
 		return {
 			data,
 			dict

package/es/utils/model-transformer.mjs

@@ -73,15 +73,21 @@ function transSelectData(field, row = {}, dict = {}) {
 */
 function transformDataToDict(row = {}, dict = {}) {
 	const data = cloneDeep(row);
-	return Object.keys(dict ?? {})?.length ? Object.keys(data).reduce((total, curr) => {
-		const map = dict[curr] || {}, value = data[curr];
-		try {
-			total[curr] = (value + "").split(",").map((k) => map[k]).join("，");
-		} catch {
-			total[curr] = value;
+	if (!dict || Object.keys(dict).length === 0) return data;
+	return Object.keys(data).reduce((total, currKey) => {
+		const rawVal = data[currKey];
+		const fieldDict = dict[currKey];
+		if (!fieldDict) {
+			total[currKey] = rawVal;
+			return total;
 		}
+		if (rawVal === null || rawVal === void 0) {
+			total[currKey] = rawVal;
+			return total;
+		}
+		total[currKey] = String(rawVal).split(",").map((code) => fieldDict[code] ?? code).filter(Boolean).join("，");
 		return total;
-	}, {}) : data;
+	}, {});
 }
 //#endregion
 export { addDataByForm, setDataByForm, transSelectData, transformData, transformDataToDict, transformSourceData };

package/es/utils/search/search-hooks.mjs

@@ -6,6 +6,12 @@ var isArrayOpe = [
 	SEARCH_SERVICE.IN,
 	SEARCH_SERVICE.NOTIN
 ];
+/** 空字符串、空数组、区间两端皆空视为无查询值；保留 0 / false */
+function isEmptySearchValue(value) {
+	if (value === null || value === void 0 || value === "") return true;
+	if (Array.isArray(value)) return value.length === 0 || value.every((v) => v === null || v === void 0 || v === "");
+	return false;
+}
 /**查询组件body转化为算子 */
 function useGetBodyBySearch(formState, cacheColumns, expStr) {
 	/**
@@ -20,7 +26,7 @@ function useGetBodyBySearch(formState, cacheColumns, expStr) {
 			const field = i.props.fieldSearchKey || i.props.field;
 			const ope = i.props.ope || [];
 			let value = state[i.id];
-			if (value !== null && value !== void 0 || i.props.useMore) ope.forEach((o) => {
+			if (!isEmptySearchValue(value) || i.props.useMore) ope.forEach((o) => {
 				value = getMultipleChoiceToArray(value, o);
 				const key = `${field}.${o}:${i.id}`, expkey = `${i.id}.${o}`;
 				body[key] = i.props.useMore ? null : value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/render",
-  "version": "0.1.6-dev.9",
+  "version": "6.0.0-dev.10",
   "type": "module",
   "description": "paas 平台网页端底包",
   "loader": "dist/loader.esm.min.js",
@@ -31,7 +31,7 @@
   "license": "MIT",
   "author": "gct",
   "dependencies": {
-    "@gct-paas/api": "^0.1.6-dev.5",
+    "@gct-paas/api": "^6.0.0-dev.7",
     "@vueuse/core": "^14.1.0",
     "axios": "^1.13.2",
     "bignumber.js": "^10.0.2",
@@ -44,10 +44,10 @@
     "qx-util": "^0.4.8",
     "vue": "^3.5.30",
     "vue3-dnd": "^2.1.0",
-    "@gct-paas/core-web": "0.1.6-dev.9",
-    "@gct-paas/core": "0.1.6-dev.9",
-    "@gct-paas/schema": "0.1.6-dev.9",
-    "@gct-paas/scss": "0.1.6-dev.9"
+    "@gct-paas/core": "6.0.0-dev.10",
+    "@gct-paas/schema": "6.0.0-dev.10",
+    "@gct-paas/core-web": "6.0.0-dev.10",
+    "@gct-paas/scss": "6.0.0-dev.10"
   },
   "devDependencies": {
     "@types/escodegen": "^0.0.10",
@@ -55,12 +55,12 @@
     "@types/estree": "^1.0.8"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^0.1.6-dev.5",
+    "@gct-paas/api": "^6.0.0-dev.7",
     "vue": ">=3",
-    "@gct-paas/core": "0.1.6-dev.9",
-    "@gct-paas/schema": "0.1.6-dev.9",
-    "@gct-paas/core-web": "0.1.6-dev.9",
-    "@gct-paas/scss": "0.1.6-dev.9"
+    "@gct-paas/core": "6.0.0-dev.10",
+    "@gct-paas/core-web": "6.0.0-dev.10",
+    "@gct-paas/schema": "6.0.0-dev.10",
+    "@gct-paas/scss": "6.0.0-dev.10"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",