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

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

@@ -13,13 +13,17 @@ var methods_exports = /* @__PURE__ */ __exportAll({
 	ADD: () => ADD,
 	AND: () => AND,
 	AVERAGE: () => AVERAGE,
+	BANKROUND: () => BANKROUND,
 	CONCAT: () => CONCAT,
 	COUNT: () => COUNT,
 	DATE2TIMESTAMP: () => DATE2TIMESTAMP,
 	DATEFORMAT: () => DATEFORMAT,
 	DAY: () => DAY,
 	DIVISION: () => DIVISION,
+	DateAdd: () => DateAdd,
+	DateSubtract: () => DateSubtract,
 	EQ: () => EQ,
+	EXP: () => EXP,
 	FINDSTR: () => FINDSTR,
 	FIXED: () => FIXED,
 	GE: () => GE,
@@ -40,10 +44,12 @@ var methods_exports = /* @__PURE__ */ __exportAll({
 	LASTYEARRANGE: () => LASTYEARRANGE,
 	LE: () => LE,
 	LEN: () => LEN,
+	LN: () => LN,
 	LOWER: () => LOWER,
 	LT: () => LT,
 	LTRIM: () => LTRIM,
 	MAX: () => MAX,
+	MAXABS: () => MAXABS,
 	MIN: () => MIN,
 	MINUTE: () => MINUTE,
 	MOD: () => MOD,
@@ -63,6 +69,7 @@ var methods_exports = /* @__PURE__ */ __exportAll({
 	REPLACE: () => REPLACE,
 	ROUND: () => ROUND,
 	ROUNDUP: () => ROUNDUP,
+	RSQ: () => RSQ,
 	RTRIM: () => RTRIM,
 	SEARCHSTR: () => SEARCHSTR,
 	SEQMAP: () => SEQMAP,
@@ -324,6 +331,18 @@ 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 BANKROUND(v, n) {
+	if (v === null || v === "" || v === void 0) return "";
+	if (n < 0) throw new Error("Decimal places should be non-negative.");
+	n = n ? parseInt(n + "") : 0;
+	return new BigNumberJS(v).decimalPlaces(n, BigNumberJS.ROUND_HALF_EVEN).toNumber();
+}
 function MOD(v, n) {
 	const fn = () => {
 		if (v === 0) throw new Error("The second value should not be zero.");
@@ -365,6 +384,22 @@ function SQRT(v) {
 	};
 	return fn();
 }
+function EXP(v) {
+	const fn = () => {
+		const n = toSafeNumber(v);
+		if (n === null) return NaN;
+		return Math.exp(n);
+	};
+	return fn();
+}
+function LN(v) {
+	const fn = () => {
+		const n = toSafeNumber(v);
+		if (n === null || n <= 0) throw new Error("The value must be greater than zero.");
+		return Math.log(n);
+	};
+	return fn();
+}
 function GET(v, p) {
 	const fn = () => {
 		if (Array.isArray(v)) if (typeof p === "number") return v[p];
@@ -421,6 +456,35 @@ function DATEFORMAT(v, f) {
 	const fn = () => dayjs(v).format(f);
 	return fn();
 }
+function _detectDateType(v) {
+	if (/^\d{2}:\d{2}(:\d{2})?$/.test(v.trim())) return "time";
+	if (/^\d{4}-\d{2}-\d{2}$/.test(v.trim())) return "date";
+	return "datetime";
+}
+function _getDefaultFormat(type) {
+	if (type === "date") return "YYYY-MM-DD";
+	if (type === "time") return "HH:mm:ss";
+	return "YYYY-MM-DD HH:mm:ss";
+}
+var TIME_BASE_DATE = "2000-01-01 ";
+function DateAdd(v, num, unit, format) {
+	if (!v) return;
+	const fn = () => {
+		const type = _detectDateType(v);
+		const fmt = format ?? _getDefaultFormat(type);
+		return dayjs(type === "time" ? TIME_BASE_DATE + v.trim() : v).add(num, unit).format(fmt);
+	};
+	return fn();
+}
+function DateSubtract(v, num, unit, format) {
+	if (!v) return;
+	const fn = () => {
+		const type = _detectDateType(v);
+		const fmt = format ?? _getDefaultFormat(type);
+		return dayjs(type === "time" ? TIME_BASE_DATE + v.trim() : v).subtract(num, unit).format(fmt);
+	};
+	return fn();
+}
 function NOW() {
 	return dayjs().format("YYYY-MM-DD HH:MM:ss");
 }
@@ -553,9 +617,9 @@ function COUNT(v) {
 	if (!Array.isArray(v)) return "";
 	return v.length;
 }
-/**标准差函数 */
+/**标准差函数，支持任意个参数，参数可为数组或非数组，空值不参与计算 */
 function STDEV(...args) {
-	const data = args.flat().map((v) => Number(v)).filter((v) => Number.isFinite(v));
+	const data = args.flat().filter((i) => i !== "" && i !== null && i !== void 0).map((v) => Number(v)).filter((v) => Number.isFinite(v));
 	if (data.length < 2) return "";
 	const mean = data.reduce((sum, val) => sum + val, 0) / data.length;
 	const variance = data.reduce((sum, val) => {
@@ -564,6 +628,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/search/listhook.d.ts

@@ -21,3 +21,11 @@ export declare const useQueryfilter: (datafilter: IObject[] | IObject) => {
  * @returns
  */
 export declare const getQuerySort: ({ collation, collationSort, collationField, }: IObject) => any;
+/**
+ * 关键字搜索时，取配置的搜索字段的第一段作为 similarField 交给后端做匹配度排序
+ * 使用方：下拉/对象选择的关键字搜索、搜索选择组件（select-search）
+ * 注意：与「查询组件」的 similarField（取第一个有值字段）来源不同，勿混用
+ * @param searchField 配置的搜索字段
+ * @param keyword 搜索的关键字
+ */
+export declare function getSimilarFieldBySearchField(searchField?: string[], keyword?: string): string | undefined;

package/es/utils/search/listhook.mjs

@@ -87,5 +87,16 @@ var getQuerySort = ({ collation, collationSort, collationField }) => {
 		sortType: collationSort
 	}] : [];
 };
+/**
+* 关键字搜索时，取配置的搜索字段的第一段作为 similarField 交给后端做匹配度排序
+* 使用方：下拉/对象选择的关键字搜索、搜索选择组件（select-search）
+* 注意：与「查询组件」的 similarField（取第一个有值字段）来源不同，勿混用
+* @param searchField 配置的搜索字段
+* @param keyword 搜索的关键字
+*/
+function getSimilarFieldBySearchField(searchField, keyword) {
+	if (!keyword?.trim() || !searchField?.length) return void 0;
+	return searchField[0]?.split(".")[0] || void 0;
+}
 //#endregion
-export { getIExp, getIKeywordFieldKeys, getQueryDateByKeyWord, getQuerySort, useQueryfilter };
+export { getIExp, getIKeywordFieldKeys, getQueryDateByKeyWord, getQuerySort, getSimilarFieldBySearchField, useQueryfilter };

package/es/utils/search/search-hooks.d.ts

@@ -3,4 +3,5 @@ import { ISearchSchema } from '@gct-paas/schema';
 export declare function useGetBodyBySearch(formState: IObject, cacheColumns: ISearchSchema[], expStr?: string): {
     query: IObject;
     exp: string;
+    similarField: string | undefined;
 };

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

@@ -22,20 +22,26 @@ function useGetBodyBySearch(formState, cacheColumns, expStr) {
 	function transformToBody(state) {
 		const body = {};
 		let exp = expStr || "";
+		/** 按查询组件顺序取第一个有值字段，供后端 similarField（搜索时按匹配度排序） */
+		let similarField;
 		cacheColumns.forEach((i) => {
 			const field = i.props.fieldSearchKey || i.props.field;
 			const ope = i.props.ope || [];
 			let value = state[i.id];
-			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;
-				exp = exp.replace(expkey, key);
-			});
+			if (!isEmptySearchValue(value) || i.props.useMore) {
+				if (!similarField && field) similarField = field;
+				ope.forEach((o) => {
+					value = getMultipleChoiceToArray(value, o);
+					const key = `${field}.${o}:${i.id}`, expkey = `${i.id}.${o}`;
+					body[key] = i.props.useMore ? null : value;
+					exp = exp.replace(expkey, key);
+				});
+			}
 		});
 		return {
 			body,
-			exp
+			exp,
+			similarField
 		};
 	}
 	/** rdo版本关联查询数据单独处理 */
@@ -59,10 +65,11 @@ function useGetBodyBySearch(formState, cacheColumns, expStr) {
 		});
 		return state;
 	}
-	const { body, exp } = transformToBody(transformRdo(formState, cacheColumns));
+	const { body, exp, similarField } = transformToBody(transformRdo(formState, cacheColumns));
 	return {
 		query: body,
-		exp
+		exp,
+		similarField
 	};
 }
 function getMultipleChoiceToArray(value, ope) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/render",
-  "version": "6.0.0-dev.6",
+  "version": "6.0.0-dev.60",
   "type": "module",
   "description": "paas 平台网页端底包",
   "loader": "dist/loader.esm.min.js",
@@ -31,7 +31,7 @@
   "license": "MIT",
   "author": "gct",
   "dependencies": {
-    "@gct-paas/api": "^6.0.0-dev.6",
+    "@gct-paas/api": "^6.0.0-dev.17",
     "@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": "6.0.0-dev.6",
-    "@gct-paas/core-web": "6.0.0-dev.6",
-    "@gct-paas/scss": "6.0.0-dev.6",
-    "@gct-paas/schema": "6.0.0-dev.6"
+    "@gct-paas/core": "6.0.0-dev.60",
+    "@gct-paas/schema": "6.0.0-dev.60",
+    "@gct-paas/core-web": "6.0.0-dev.60",
+    "@gct-paas/scss": "6.0.0-dev.60"
   },
   "devDependencies": {
     "@types/escodegen": "^0.0.10",
@@ -55,12 +55,12 @@
     "@types/estree": "^1.0.8"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^6.0.0-dev.6",
+    "@gct-paas/api": "^6.0.0-dev.17",
     "vue": ">=3",
-    "@gct-paas/core": "6.0.0-dev.6",
-    "@gct-paas/core-web": "6.0.0-dev.6",
-    "@gct-paas/schema": "6.0.0-dev.6",
-    "@gct-paas/scss": "6.0.0-dev.6"
+    "@gct-paas/core": "6.0.0-dev.60",
+    "@gct-paas/scss": "6.0.0-dev.60",
+    "@gct-paas/core-web": "6.0.0-dev.60",
+    "@gct-paas/schema": "6.0.0-dev.60"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",