@gct-paas/render 6.0.0-dev.8 → 6.0.0-test.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/loader.esm.min.js +2 -2
- package/es/Event/Dependency/controller.d.ts +2 -1
- package/es/Event/Dependency/controller.mjs +7 -5
- package/es/Event/Dependency/displayRule.mjs +3 -1
- package/es/Event/Dependency/useDependency.mjs +30 -8
- package/es/Event/Dependency/useDependencyToShow.mjs +14 -8
- package/es/Event/baseEvent.mjs +3 -0
- package/es/Event/context-extension-registry.d.ts +43 -0
- package/es/Event/context-extension-registry.mjs +67 -0
- package/es/Event/index.d.ts +1 -0
- package/es/Event/index.mjs +1 -0
- package/es/Event/utils/runGlobalByPage.d.ts +2 -0
- package/es/index.mjs +3 -2
- package/es/register/render-register/render-register.d.ts +1 -1
- package/es/register/render-register/render-register.mjs +4 -2
- package/es/setup-app.mjs +6 -0
- package/es/utils/expression/index.mjs +3 -3
- package/es/utils/expression/regularExpression/methods.d.ts +11 -3
- package/es/utils/expression/regularExpression/methods.mjs +90 -2
- package/es/utils/search/listhook.d.ts +8 -0
- package/es/utils/search/listhook.mjs +12 -1
- package/es/utils/search/search-hooks.d.ts +1 -0
- package/es/utils/search/search-hooks.mjs +16 -9
- package/package.json +11 -11
|
@@ -22,20 +22,26 @@ function useGetBodyBySearch(formState, cacheColumns, expStr) {
|
|
|
22
22
|
function transformToBody(state) {
|
|
23
23
|
const body = {};
|
|
24
24
|
let exp = expStr || "";
|
|
25
|
+
/** 按查询组件顺序取第一个有值字段，供后端 similarField（搜索时按匹配度排序） */
|
|
26
|
+
let similarField;
|
|
25
27
|
cacheColumns.forEach((i) => {
|
|
26
28
|
const field = i.props.fieldSearchKey || i.props.field;
|
|
27
29
|
const ope = i.props.ope || [];
|
|
28
30
|
let value = state[i.id];
|
|
29
|
-
if (!isEmptySearchValue(value) || i.props.useMore)
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
if (!isEmptySearchValue(value) || i.props.useMore) {
|
|
32
|
+
if (!similarField && field) similarField = field;
|
|
33
|
+
ope.forEach((o) => {
|
|
34
|
+
value = getMultipleChoiceToArray(value, o);
|
|
35
|
+
const key = `${field}.${o}:${i.id}`, expkey = `${i.id}.${o}`;
|
|
36
|
+
body[key] = i.props.useMore ? null : value;
|
|
37
|
+
exp = exp.replace(expkey, key);
|
|
38
|
+
});
|
|
39
|
+
}
|
|
35
40
|
});
|
|
36
41
|
return {
|
|
37
42
|
body,
|
|
38
|
-
exp
|
|
43
|
+
exp,
|
|
44
|
+
similarField
|
|
39
45
|
};
|
|
40
46
|
}
|
|
41
47
|
/** rdo版本关联查询数据单独处理 */
|
|
@@ -59,10 +65,11 @@ function useGetBodyBySearch(formState, cacheColumns, expStr) {
|
|
|
59
65
|
});
|
|
60
66
|
return state;
|
|
61
67
|
}
|
|
62
|
-
const { body, exp } = transformToBody(transformRdo(formState, cacheColumns));
|
|
68
|
+
const { body, exp, similarField } = transformToBody(transformRdo(formState, cacheColumns));
|
|
63
69
|
return {
|
|
64
70
|
query: body,
|
|
65
|
-
exp
|
|
71
|
+
exp,
|
|
72
|
+
similarField
|
|
66
73
|
};
|
|
67
74
|
}
|
|
68
75
|
function getMultipleChoiceToArray(value, ope) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gct-paas/render",
|
|
3
|
-
"version": "6.0.0-
|
|
3
|
+
"version": "6.0.0-test.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "paas 平台网页端底包",
|
|
6
6
|
"loader": "dist/loader.esm.min.js",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"license": "MIT",
|
|
32
32
|
"author": "gct",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@gct-paas/api": "^6.0.0-dev.
|
|
34
|
+
"@gct-paas/api": "^6.0.0-dev.17",
|
|
35
35
|
"@vueuse/core": "^14.1.0",
|
|
36
36
|
"axios": "^1.13.2",
|
|
37
37
|
"bignumber.js": "^10.0.2",
|
|
@@ -44,10 +44,10 @@
|
|
|
44
44
|
"qx-util": "^0.4.8",
|
|
45
45
|
"vue": "^3.5.30",
|
|
46
46
|
"vue3-dnd": "^2.1.0",
|
|
47
|
-
"@gct-paas/core-web": "6.0.0-
|
|
48
|
-
"@gct-paas/core": "6.0.0-
|
|
49
|
-
"@gct-paas/
|
|
50
|
-
"@gct-paas/
|
|
47
|
+
"@gct-paas/core-web": "6.0.0-test.0",
|
|
48
|
+
"@gct-paas/core": "6.0.0-test.0",
|
|
49
|
+
"@gct-paas/scss": "6.0.0-test.0",
|
|
50
|
+
"@gct-paas/schema": "6.0.0-test.0"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@types/escodegen": "^0.0.10",
|
|
@@ -55,12 +55,12 @@
|
|
|
55
55
|
"@types/estree": "^1.0.8"
|
|
56
56
|
},
|
|
57
57
|
"peerDependencies": {
|
|
58
|
-
"@gct-paas/api": "^6.0.0-dev.
|
|
58
|
+
"@gct-paas/api": "^6.0.0-dev.17",
|
|
59
59
|
"vue": ">=3",
|
|
60
|
-
"@gct-paas/core": "6.0.0-
|
|
61
|
-
"@gct-paas/core-web": "6.0.0-
|
|
62
|
-
"@gct-paas/
|
|
63
|
-
"@gct-paas/
|
|
60
|
+
"@gct-paas/core": "6.0.0-test.0",
|
|
61
|
+
"@gct-paas/core-web": "6.0.0-test.0",
|
|
62
|
+
"@gct-paas/scss": "6.0.0-test.0",
|
|
63
|
+
"@gct-paas/schema": "6.0.0-test.0"
|
|
64
64
|
},
|
|
65
65
|
"scripts": {
|
|
66
66
|
"dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",
|