aldehyde 0.2.178 → 0.2.180
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/lib/controls/action/utils.d.ts +2 -0
- package/lib/controls/action/utils.d.ts.map +1 -1
- package/lib/controls/action/utils.js +54 -6
- package/lib/controls/action/utils.js.map +1 -1
- package/lib/layout2/header.js +3 -3
- package/lib/layout2/header.js.map +1 -1
- package/lib/layout2/sider.js +3 -3
- package/lib/layout2/sider.js.map +1 -1
- package/lib/routable/ltmpl-route.d.ts.map +1 -1
- package/lib/routable/ltmpl-route.js +8 -4
- package/lib/routable/ltmpl-route.js.map +1 -1
- package/lib/table/act-table.d.ts +1 -0
- package/lib/table/act-table.d.ts.map +1 -1
- package/lib/table/act-table.js +28 -7
- package/lib/table/act-table.js.map +1 -1
- package/lib/table/query-table.d.ts +3 -0
- package/lib/table/query-table.d.ts.map +1 -1
- package/lib/table/query-table.js +31 -1
- package/lib/table/query-table.js.map +1 -1
- package/lib/table/table-util.d.ts.map +1 -1
- package/lib/table/table-util.js +18 -20
- package/lib/table/table-util.js.map +1 -1
- package/lib/tmpl/interface.d.ts +1 -1
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tmpl/interface.js.map +1 -1
- package/lib/units/index.d.ts.map +1 -1
- package/lib/units/index.js +5 -0
- package/lib/units/index.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/action/utils.tsx +58 -9
- package/src/aldehyde/layout2/header.tsx +3 -3
- package/src/aldehyde/layout2/sider.tsx +3 -3
- package/src/aldehyde/routable/ltmpl-route.tsx +20 -6
- package/src/aldehyde/table/act-table.tsx +79 -35
- package/src/aldehyde/table/query-table.tsx +38 -0
- package/src/aldehyde/table/table-util.tsx +21 -21
- package/src/aldehyde/tmpl/interface.tsx +1 -0
- package/src/aldehyde/units/index.tsx +4 -0
|
@@ -5,7 +5,9 @@ export default class ActionUtils {
|
|
|
5
5
|
static isShow(preposes: FieldConfig[], data: DtmplData[] | object[], formRef: RefObject<FormInstance>): boolean;
|
|
6
6
|
static isMatch(fieldConfigs: FieldConfig[], data: DtmplData[] | object[], formInstance: FormInstance, dtmplConfig: DtmplConfig): boolean;
|
|
7
7
|
static matchDtmplData(fieldConfigs: FieldConfig[], data: DtmplData[] | object[], dtmplConfig: DtmplConfig): boolean;
|
|
8
|
+
static transValue(value: string, itemType: string): string;
|
|
8
9
|
static comparator(comparator: Comparator, val: string, defaultValue: string): boolean;
|
|
10
|
+
static isEqual(value: any, defaultValue: any): boolean;
|
|
9
11
|
static toArray(value: any): any;
|
|
10
12
|
static getFormRefValue(formInstance: FormInstance, key: any): any;
|
|
11
13
|
static containsField(formInstance: FormInstance, key: any): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,WAAW,EACX,SAAS,EACT,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,WAAW,EACX,SAAS,EACT,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,MAAM,CACT,QAAQ,EAAE,WAAW,EAAE,EACzB,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,EAC5B,OAAO,EAAE,SAAS,CAAC,YAAY,CAAC;IAUlC,MAAM,CAAC,OAAO,CACZ,YAAY,EAAE,WAAW,EAAE,EAC3B,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,EAC5B,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW;IA4C1B,MAAM,CAAC,cAAc,CACnB,YAAY,EAAE,WAAW,EAAE,EAC3B,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,EAC5B,WAAW,EAAE,WAAW;IAoD1B,MAAM,CAAC,UAAU,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM;IAKpB,MAAM,CAAC,UAAU,CACf,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM;IA0FtB,MAAM,CAAC,OAAO,CAAC,KAAK,KAAA,EAAC,YAAY,KAAA;IAsBjC,MAAM,CAAC,OAAO,CAAC,KAAK,KAAA;IAWpB,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,KAAA;IAStD,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,KAAA;CAQrD"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { message } from "antd";
|
|
2
2
|
import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
|
|
3
|
+
import Units from "../../units";
|
|
3
4
|
export default class ActionUtils {
|
|
4
5
|
static isShow(preposes, data, formRef) {
|
|
5
6
|
if (!preposes || preposes.length <= 0) {
|
|
@@ -61,19 +62,23 @@ export default class ActionUtils {
|
|
|
61
62
|
isMatch = false;
|
|
62
63
|
break;
|
|
63
64
|
}
|
|
65
|
+
let value;
|
|
66
|
+
let defualtValue;
|
|
64
67
|
for (let fieldConfig of fieldConfigs) {
|
|
68
|
+
defualtValue = this.transValue(fieldConfig.defaultValue, fieldConfig.controlType);
|
|
65
69
|
if (d["fieldMap"]) {
|
|
66
70
|
let fieldId = dtmplConfig
|
|
67
71
|
? TmplConfigAnalysis.getFieldId(dtmplConfig, fieldConfig.mstrucId)
|
|
68
72
|
: fieldConfig.id;
|
|
69
|
-
|
|
73
|
+
value = this.transValue(d["fieldMap"][fieldId], fieldConfig.controlType);
|
|
74
|
+
if (!this.comparator(fieldConfig.comparator, value, defualtValue)) {
|
|
70
75
|
isMatch = false;
|
|
71
76
|
break;
|
|
72
77
|
}
|
|
73
78
|
}
|
|
74
79
|
else {
|
|
75
|
-
|
|
76
|
-
if (!this.comparator(fieldConfig.comparator,
|
|
80
|
+
value = this.transValue(d[fieldConfig.id], fieldConfig.controlType);
|
|
81
|
+
if (!this.comparator(fieldConfig.comparator, value, defualtValue)) {
|
|
77
82
|
isMatch = false;
|
|
78
83
|
break;
|
|
79
84
|
}
|
|
@@ -82,6 +87,9 @@ export default class ActionUtils {
|
|
|
82
87
|
}
|
|
83
88
|
return isMatch;
|
|
84
89
|
}
|
|
90
|
+
static transValue(value, itemType) {
|
|
91
|
+
return Units.configParamTrans(value, itemType);
|
|
92
|
+
}
|
|
85
93
|
static comparator(comparator, val, defaultValue) {
|
|
86
94
|
let dvs;
|
|
87
95
|
let value = val;
|
|
@@ -110,13 +118,13 @@ export default class ActionUtils {
|
|
|
110
118
|
return value.includes(defaultValue);
|
|
111
119
|
case "equal":
|
|
112
120
|
case "equals":
|
|
113
|
-
return value
|
|
121
|
+
return this.isEqual(value, defaultValue);
|
|
114
122
|
case "exclude":
|
|
115
123
|
dvs = this.toArray(defaultValue);
|
|
116
124
|
vals = this.toArray(value);
|
|
117
125
|
for (let i = 0; i < dvs.length; i++) {
|
|
118
126
|
for (let j = 0; j < vals.length; j++) {
|
|
119
|
-
if (dvs[i]
|
|
127
|
+
if (dvs[i] == vals[j]) {
|
|
120
128
|
return false;
|
|
121
129
|
}
|
|
122
130
|
}
|
|
@@ -134,6 +142,20 @@ export default class ActionUtils {
|
|
|
134
142
|
}
|
|
135
143
|
}
|
|
136
144
|
return false;
|
|
145
|
+
case "include_all":
|
|
146
|
+
dvs = this.toArray(defaultValue);
|
|
147
|
+
vals = this.toArray(value);
|
|
148
|
+
let count = 0;
|
|
149
|
+
let targetCount = dvs.length;
|
|
150
|
+
for (let i = 0; i < dvs.length; i++) {
|
|
151
|
+
for (let j = 0; j < vals.length; j++) {
|
|
152
|
+
if (dvs[i] == vals[j]) {
|
|
153
|
+
count++;
|
|
154
|
+
break;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
return targetCount <= count;
|
|
137
159
|
case "noGreater":
|
|
138
160
|
case "nogreater":
|
|
139
161
|
return value <= defaultValue;
|
|
@@ -142,12 +164,38 @@ export default class ActionUtils {
|
|
|
142
164
|
return value >= defaultValue;
|
|
143
165
|
case "unequal":
|
|
144
166
|
case "unequals":
|
|
145
|
-
return value
|
|
167
|
+
return !this.isEqual(value, defaultValue);
|
|
146
168
|
default:
|
|
147
169
|
message.error("暂不支持的比较关系：" + comparator + ";请联系管理员添加。", 5);
|
|
148
170
|
return;
|
|
149
171
|
}
|
|
150
172
|
}
|
|
173
|
+
static isEqual(value, defaultValue) {
|
|
174
|
+
if (defaultValue == "是" || defaultValue == "否" || defaultValue == "true" || defaultValue == "false") {
|
|
175
|
+
if (value == "true" || value == "是") {
|
|
176
|
+
if (defaultValue == "是" || defaultValue == "true") {
|
|
177
|
+
return true;
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
return false;
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
else if (value == "false" || value == "否") {
|
|
184
|
+
if (defaultValue == "否" || defaultValue == "false") {
|
|
185
|
+
return true;
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
return false;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
else {
|
|
192
|
+
return false;
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
return value == defaultValue;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
151
199
|
static toArray(value) {
|
|
152
200
|
let val;
|
|
153
201
|
if (typeof value == "string") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,kBAAkB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,kBAAkB,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,MAAM,CACT,QAAuB,EACzB,IAA4B,EAC5B,OAAgC;QAGhC,IAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,IAAE,CAAC,EAAC,CAAC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;aAAK,CAAC;YACL,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CACZ,YAA2B,EAC3B,IAA4B,EAC5B,YAA0B,EAC1B,WAAwB;QAExB,UAAU;QACV,mBAAmB;QACnB,yCAAyC;QACzC,UAAU;QACV,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,WAAW,GAAkB,EAAE,CAAC;YACpC,KAAK,IAAI,WAAW,IAAI,YAAY,EAAE,CAAC;gBACrC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,SAAS;gBACX,CAAC;gBACD,IAAI,OAAO,GAAG,WAAW;oBACvB,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC;oBAClE,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;gBACnB,IAAI,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;oBAC9C,IAAI,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBACxD,IACE,CAAC,IAAI,CAAC,UAAU,CACd,WAAW,CAAC,UAAU,EACtB,KAAK,EACL,WAAW,CAAC,YAAY,CACzB,EACD,CAAC;wBACD,OAAO,GAAG,KAAK,CAAC;wBAChB,MAAM;oBACR,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;YACD,IAAI,OAAO,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtC,gBAAgB;gBAChB,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,EAAE,CAAC;YAChB,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,cAAc,CACnB,YAA2B,EAC3B,IAA4B,EAC5B,WAAwB;QAExB,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;QACD,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YACnB,kBAAkB;YAClB,aAAa;YACb,IAAI;YACJ,IAAI,CAAC,CAAC,EAAE,CAAC;gBACP,OAAO,GAAG,KAAK,CAAC;gBAChB,MAAM;YACR,CAAC;YAED,IAAI,KAAK,CAAC;YACV,IAAI,YAAY,CAAC;YACjB,KAAK,IAAI,WAAW,IAAI,YAAY,EAAE,CAAC;gBACrC,YAAY,GAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,YAAY,EAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBAC/E,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;oBAClB,IAAI,OAAO,GAAG,WAAW;wBACvB,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC;wBAClE,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;oBACnB,KAAK,GAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAC,WAAW,CAAC,WAAW,CAAC,CAAC;oBACtE,IACE,CAAC,IAAI,CAAC,UAAU,CACd,WAAW,CAAC,UAAU,EACpB,KAAK,EACL,YAAY,CACf,EACD,CAAC;wBACD,OAAO,GAAG,KAAK,CAAC;wBAChB,MAAM;oBACR,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,EAAC,WAAW,CAAC,WAAW,CAAC,CAAC;oBACjE,IACE,CAAC,IAAI,CAAC,UAAU,CACd,WAAW,CAAC,UAAU,EACpB,KAAK,EACL,YAAY,CACf,EACD,CAAC;wBACD,OAAO,GAAG,KAAK,CAAC;wBAChB,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,UAAU,CACb,KAAa,EACb,QAAgB;QAElB,OAAO,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,UAAU,CACf,UAAsB,EACtB,GAAW,EACX,YAAoB;QAEpB,IAAI,GAAa,CAAC;QAClB,IAAI,KAAK,GAAC,GAAG,CAAE;QACf,IAAI,GAAG,IAAK,GAAG,CAAC,OAAO,IAAK,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACnD,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1B,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,UAAU,GAAG,QAAQ,CAAC;QACxB,CAAC;QAED,IAAG,UAAU,IAAE,OAAO,EAAC,CAAC;YACtB,OAAO,CAAC,KAAK,IAAI,KAAK,IAAE,EAAE,CAAC;QAC7B,CAAC;aAAK,IAAG,UAAU,IAAE,QAAQ,EAAC,CAAC;YAC7B,OAAO,KAAK,IAAI,KAAK,IAAE,EAAE,CAAC;QAC5B,CAAC;QAGD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,KAAK,IAAI,KAAK,IAAI,GAAG,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,CAAC;QACT,QAAQ,UAAU,EAAE,CAAC;YACnB,KAAK,SAAS;gBACZ,OAAO,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACtC,KAAK,OAAO,CAAC;YACb,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,YAAY,CAAC,CAAC;YAC1C,KAAK,SAAS;gBACZ,GAAG,GAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC/B,IAAI,GAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACrC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;4BACtB,OAAO,KAAK,CAAA;wBACd,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,YAAY,CAAC;YAClB,KAAK,gBAAgB;gBACnB,GAAG,GAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC/B,IAAI,GAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACrC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;4BACvB,OAAO,IAAI,CAAA;wBACb,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,OAAO,KAAK,CAAC;YAEf,KAAK,aAAa;gBAChB,GAAG,GAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC/B,IAAI,GAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,KAAK,GAAC,CAAC,CAAC;gBACZ,IAAI,WAAW,GAAC,GAAG,CAAC,MAAM,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACrC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;4BACtB,KAAK,EAAE,CAAC;4BACR,MAAM;wBACR,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,OAAO,WAAW,IAAE,KAAK,CAAC;YAC5B,KAAK,WAAW,CAAC;YACjB,KAAK,WAAW;gBACd,OAAO,KAAK,IAAI,YAAY,CAAC;YAC/B,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACX,OAAO,KAAK,IAAI,YAAY,CAAC;YAC/B,KAAK,SAAS,CAAC;YACf,KAAK,UAAU;gBACb,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,YAAY,CAAC,CAAC;YAC3C;gBACE,OAAO,CAAC,KAAK,CACX,YAAY,GAAG,UAAU,GAAG,YAAY,EACxC,CAAC,CACF,CAAC;gBACF,OAAO;QACX,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,KAAK,EAAC,YAAY;QAC/B,IAAG,YAAY,IAAE,GAAG,IAAE,YAAY,IAAE,GAAG,IAAI,YAAY,IAAE,MAAM,IAAI,YAAY,IAAE,OAAO,EAAC,CAAC;YACxF,IAAG,KAAK,IAAE,MAAM,IAAI,KAAK,IAAE,GAAG,EAAE,CAAC;gBAC/B,IAAG,YAAY,IAAE,GAAG,IAAI,YAAY,IAAE,MAAM,EAAC,CAAC;oBAC5C,OAAO,IAAI,CAAC;gBACd,CAAC;qBAAI,CAAC;oBACJ,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;iBAAK,IAAG,KAAK,IAAE,OAAO,IAAI,KAAK,IAAE,GAAG,EAAE,CAAC;gBACtC,IAAG,YAAY,IAAE,GAAG,IAAI,YAAY,IAAE,OAAO,EAAC,CAAC;oBAC7C,OAAO,IAAI,CAAC;gBACd,CAAC;qBAAI,CAAC;oBACJ,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;iBAAI,CAAC;gBACJ,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;aAAI,CAAC;YACJ,OAAO,KAAK,IAAI,YAAY,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,KAAK;QAClB,IAAI,GAAG,CAAC;QACR,IAAG,OAAO,KAAK,IAAI,QAAQ,EAAC,CAAC;YAC3B,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;aAAM,IAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAC,CAAC;YAC9B,GAAG,GAAE,KAAK,CAAC;QACb,CAAC;aAAI,CAAC;YACJ,GAAG,GAAE,CAAC,KAAK,CAAC,CAAC;QACf,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,CAAC,eAAe,CAAC,YAA0B,EAAE,GAAG;QACpD,IAAI,YAAY,EAAE,CAAC;YACjB,oFAAoF;YACpF,OAAO,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,YAA0B,EAAE,GAAG;QAClD,IAAI,YAAY,EAAE,CAAC;YACjB,oFAAoF;YACpF,OAAO,YAAY,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF"}
|
package/lib/layout2/header.js
CHANGED
|
@@ -80,7 +80,7 @@ const Header = ({ systemName, menuList, style }) => {
|
|
|
80
80
|
const colors = generate(colorPrimary);
|
|
81
81
|
console.log("header", colors);
|
|
82
82
|
// translate
|
|
83
|
-
const { translate } = useLocale();
|
|
83
|
+
const { translate, getLocale } = useLocale();
|
|
84
84
|
const [menu, setMenu] = useState([]);
|
|
85
85
|
useEffect(() => {
|
|
86
86
|
setMenu(handlePropsMenuToAntdMenu(menuList, (menuItem, floor) => {
|
|
@@ -112,9 +112,9 @@ const Header = ({ systemName, menuList, style }) => {
|
|
|
112
112
|
height: "100%",
|
|
113
113
|
display: "block",
|
|
114
114
|
} }, translate("${" + label + "}")));
|
|
115
|
-
return translate("${" + label + "}");
|
|
115
|
+
return React.createElement(React.Fragment, null, translate("${" + label + "}"));
|
|
116
116
|
}, "layout2-header-menu-item"));
|
|
117
|
-
}, [menuList]);
|
|
117
|
+
}, [menuList, getLocale()]);
|
|
118
118
|
// menu select
|
|
119
119
|
const [selectedKeys, setSelectedKeys] = useState([]);
|
|
120
120
|
const { sourceId } = useParams();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,MAAM,EACN,IAAI,EAEJ,KAAK,EACL,OAAO,GACR,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,kBAAkB,CAAC;AAC1B,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,gBAAgB,MAAM,mCAAmC,CAAC;AACjE,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAElD,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,OAAO,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EACL,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAU9C,8BAA8B;AAC9B,MAAM;AACN,+BAA+B;AAC/B,mBAAmB;AACnB,mEAAmE;AACnE,OAAO;AACP,MAAM;AACN,+BAA+B;AAC/B,kBAAkB;AAClB,uBAAuB;AACvB,mEAAmE;AACnE,OAAO;AACP,MAAM;AACN,+BAA+B;AAC/B,mBAAmB;AACnB,uBAAuB;AACvB,mEAAmE;AACnE,OAAO;AACP,MAAM;AACN,+BAA+B;AAC/B,mBAAmB;AACnB,uBAAuB;AACvB,mEAAmE;AACnE,OAAO;AACP,MAAM;AACN,+BAA+B;AAC/B,mBAAmB;AACnB,sBAAsB;AACtB,mEAAmE;AACnE,OAAO;AACP,MAAM;AACN,2CAA2C;AAC3C,sBAAsB;AACtB,mEAAmE;AACnE,kBAAkB;AAClB,UAAU;AACV,yBAAyB;AACzB,2BAA2B;AAC3B,sBAAsB;AACtB,qDAAqD;AACrD,qDAAqD;AACrD,aAAa;AACb,WAAW;AACX,UAAU;AACV,yBAAyB;AACzB,2BAA2B;AAC3B,sBAAsB;AACtB,qDAAqD;AACrD,qDAAqD;AACrD,aAAa;AACb,WAAW;AACX,SAAS;AACT,OAAO;AACP,MAAM;AACN,qBAAqB;AACrB,eAAe;AACf,gFAAgF;AAChF,iCAAiC;AACjC,aAAa;AACb,SAAS;AACT,mEAAmE;AACnE,OAAO;AACP,KAAK;AAEL,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;AAE3B,MAAM,MAAM,GAA8B,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;IAC5E,QAAQ;IACR,MAAM,EACJ,KAAK,EAAE,EAAE,YAAY,EAAE,GACxB,GAAG,QAAQ,EAAE,CAAC;IAEf,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE9B,YAAY;IACZ,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"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"}
|
package/lib/layout2/sider.js
CHANGED
|
@@ -172,7 +172,7 @@ const Sider = ({ menuList, style }) => {
|
|
|
172
172
|
const { token: { colorPrimary }, } = useToken();
|
|
173
173
|
const colors = generate(colorPrimary);
|
|
174
174
|
// translate
|
|
175
|
-
const { translate } = useLocale();
|
|
175
|
+
const { translate, getLocale } = useLocale();
|
|
176
176
|
const menuItemIdToFirstFloorIdxMap = useRef();
|
|
177
177
|
const secoundFloorMenuList = useRef([]);
|
|
178
178
|
useEffect(() => {
|
|
@@ -223,7 +223,7 @@ const Sider = ({ menuList, style }) => {
|
|
|
223
223
|
setMenu(getMenuWithSecoundFloor(curSiderMenuList));
|
|
224
224
|
setSelectedKeys(getTargetMenuItemIdRouteList(curSiderMenuList, targetId));
|
|
225
225
|
}
|
|
226
|
-
}, [sourceId, menuId, menuList]);
|
|
226
|
+
}, [sourceId, menuId, menuList, getLocale()]);
|
|
227
227
|
// default select keys
|
|
228
228
|
useEffect(() => {
|
|
229
229
|
if (sourceId === undefined) {
|
|
@@ -232,7 +232,7 @@ const Sider = ({ menuList, style }) => {
|
|
|
232
232
|
setSelectedKeys([]);
|
|
233
233
|
}
|
|
234
234
|
}
|
|
235
|
-
}, [menuList, sourceId]);
|
|
235
|
+
}, [menuList, sourceId, getLocale()]);
|
|
236
236
|
const menuClick = (openKeys) => {
|
|
237
237
|
setSelectedKeys([...openKeys]);
|
|
238
238
|
};
|
package/lib/layout2/sider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/sider.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/sider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAGL,cAAc,EACd,eAAe,
|
|
1
|
+
{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAGL,cAAc,EACd,eAAe,EAEhB,MAAM,mBAAmB,CAAC;AAU3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;;AA0SD,wBAAsC"}
|
|
@@ -47,9 +47,12 @@ class LtmplRoute extends React.PureComponent {
|
|
|
47
47
|
const { basePath } = this.props;
|
|
48
48
|
const { sourceId } = this.props.params;
|
|
49
49
|
const { ltmplConfigRes } = this.state;
|
|
50
|
-
let dtmplSourceId = showViewParam.dtmplSourceId
|
|
50
|
+
let dtmplSourceId = showViewParam.dtmplSourceId
|
|
51
|
+
? showViewParam.dtmplSourceId
|
|
52
|
+
: sourceId;
|
|
51
53
|
let path = `${basePath}${this.computedLayoutPath}/${dtmplSourceId}/detail-view?code=${showViewParam.code}&menuId=${this.getMenuId()}`;
|
|
52
|
-
if (showViewParam.toCustomPage &&
|
|
54
|
+
if (showViewParam.toCustomPage &&
|
|
55
|
+
ltmplConfigRes.ltmplConfig.customViewPagePath) {
|
|
53
56
|
path = `${basePath}${this.computedLayoutPath}${ltmplConfigRes.ltmplConfig.customViewPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
|
|
54
57
|
}
|
|
55
58
|
this.onRoute(path);
|
|
@@ -114,11 +117,12 @@ class LtmplRoute extends React.PureComponent {
|
|
|
114
117
|
});
|
|
115
118
|
};
|
|
116
119
|
this.doSearch = (params_) => {
|
|
120
|
+
var _a;
|
|
117
121
|
const { basePath } = this.props;
|
|
118
122
|
const { sourceId } = this.props.params;
|
|
119
|
-
let params = Object.assign({}, params_);
|
|
123
|
+
let params = Object.assign(Object.assign({}, Units.transQueryStrToParams(this.props.location.search, (_a = this.state.ltmplConfigRes) === null || _a === void 0 ? void 0 : _a.ltmplConfig)), params_);
|
|
120
124
|
//params['sourceId'] = sourceId;
|
|
121
|
-
const newfliter = Units.transQueryParamsToStr(params);
|
|
125
|
+
const newfliter = Units.transQueryParamsToStr(Object.assign({}, params));
|
|
122
126
|
this.props.navigate(`${basePath}${this.computedLayoutPath}/${sourceId}/act-table?${newfliter}`, {
|
|
123
127
|
replace: true,
|
|
124
128
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"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"}
|
package/lib/table/act-table.d.ts
CHANGED
|
@@ -120,6 +120,7 @@ declare class ActTable extends React.PureComponent<ActTableProps, ActTableStat>
|
|
|
120
120
|
renderCriteriaForm: () => React.JSX.Element;
|
|
121
121
|
renderContent: () => React.JSX.Element;
|
|
122
122
|
saveRatmplSelect: (selectedRows: SelectedRow[]) => Promise<void>;
|
|
123
|
+
handleColumnOrder(columnId: any): "descend" | "ascend";
|
|
123
124
|
render(): React.JSX.Element;
|
|
124
125
|
}
|
|
125
126
|
export default ActTable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAY,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"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"}
|
package/lib/table/act-table.js
CHANGED
|
@@ -217,7 +217,9 @@ class ActTable extends React.PureComponent {
|
|
|
217
217
|
let itemType = SupportInputTypes.getSupportControlType(item);
|
|
218
218
|
if (s < 12 && item.title != "操作" && item.title != "序号") {
|
|
219
219
|
if (hiddenColIds.includes("10000")) {
|
|
220
|
-
TableUnits.sort(column, itemType);
|
|
220
|
+
// TableUnits.sort(column, itemType, "descend");
|
|
221
|
+
const order = this.handleColumnOrder(column["dataIndex"]);
|
|
222
|
+
TableUnits.sort(column, itemType, order);
|
|
221
223
|
}
|
|
222
224
|
}
|
|
223
225
|
//特殊列处理
|
|
@@ -357,7 +359,7 @@ class ActTable extends React.PureComponent {
|
|
|
357
359
|
};
|
|
358
360
|
}
|
|
359
361
|
});
|
|
360
|
-
console.log(tableColumns);
|
|
362
|
+
console.log("columns", tableColumns);
|
|
361
363
|
return tableColumns;
|
|
362
364
|
};
|
|
363
365
|
this.handleShowChart = () => {
|
|
@@ -448,7 +450,6 @@ class ActTable extends React.PureComponent {
|
|
|
448
450
|
this.setState({
|
|
449
451
|
loading: true,
|
|
450
452
|
});
|
|
451
|
-
debugger;
|
|
452
453
|
let result = yield HcserviceV3.deleteByCode(serverKey, sourceId, [code], mainCode);
|
|
453
454
|
if (result) {
|
|
454
455
|
//重新加载数据
|
|
@@ -696,7 +697,7 @@ class ActTable extends React.PureComponent {
|
|
|
696
697
|
};
|
|
697
698
|
this.renderContent = () => {
|
|
698
699
|
let { queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable, } = this.state;
|
|
699
|
-
let { sourceId, ltmplConfig, funcMode, title, collapsible, pageSize, pageNo, onChangePage, serverKey, } = this.props;
|
|
700
|
+
let { sourceId, ltmplConfig, funcMode, title, collapsible, pageSize, pageNo, onChangePage, serverKey, doSearch, criteriaData, } = this.props;
|
|
700
701
|
const { translate } = this.context;
|
|
701
702
|
if (!ltmplConfig || !sourceId) {
|
|
702
703
|
return (React.createElement(React.Fragment, null,
|
|
@@ -720,6 +721,10 @@ class ActTable extends React.PureComponent {
|
|
|
720
721
|
}
|
|
721
722
|
}
|
|
722
723
|
}
|
|
724
|
+
const sortColumnData = [];
|
|
725
|
+
if (Array.isArray(criteriaData["sortColIds"])) {
|
|
726
|
+
sortColumnData.push(...criteriaData["sortColIds"]);
|
|
727
|
+
}
|
|
723
728
|
return (React.createElement(React.Fragment, null,
|
|
724
729
|
buttons.includes("analysis") && showL2ActTable ? (React.createElement("div", null,
|
|
725
730
|
React.createElement(L2ActTable, { serverKey: serverKey, innerQueryKey: queryKey.key, sourceId: sourceId }),
|
|
@@ -745,7 +750,7 @@ class ActTable extends React.PureComponent {
|
|
|
745
750
|
: ltmplConfig.subtotalXColumn, subtotalYColumn: ltmplConfig.subtotalYColumn == null ||
|
|
746
751
|
ltmplConfig.subtotalYColumn.length <= 0
|
|
747
752
|
? null
|
|
748
|
-
: ltmplConfig.subtotalYColumn, groupIColumns: ltmplConfig.groupIColumns })),
|
|
753
|
+
: ltmplConfig.subtotalYColumn, groupIColumns: ltmplConfig.groupIColumns, doSearch: doSearch, sortColumnData: sortColumnData })),
|
|
749
754
|
ltmplConfig.footer ? (React.createElement("div", { style: { padding: "6px" }, dangerouslySetInnerHTML: { __html: ltmplConfig.footer } })) : null)));
|
|
750
755
|
};
|
|
751
756
|
this.saveRatmplSelect = (selectedRows) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -822,9 +827,25 @@ class ActTable extends React.PureComponent {
|
|
|
822
827
|
}
|
|
823
828
|
});
|
|
824
829
|
}
|
|
830
|
+
handleColumnOrder(columnId) {
|
|
831
|
+
const sortColumns = this.props.criteriaData["sortColIds"];
|
|
832
|
+
if (!Array.isArray(sortColumns))
|
|
833
|
+
return undefined;
|
|
834
|
+
for (const column of sortColumns) {
|
|
835
|
+
const [key, sort] = column.split("_");
|
|
836
|
+
if (key === columnId) {
|
|
837
|
+
if (sort === "asc")
|
|
838
|
+
return "ascend";
|
|
839
|
+
if (sort === "desc")
|
|
840
|
+
return "descend";
|
|
841
|
+
continue;
|
|
842
|
+
}
|
|
843
|
+
}
|
|
844
|
+
return undefined;
|
|
845
|
+
}
|
|
825
846
|
render() {
|
|
826
|
-
let { queryKey, loading, blockMenuTreeDrawerOpen, recordCode, showCustomCard, customButton, customButtonData, showRatmplSelector } = this.state;
|
|
827
|
-
let { sourceId, ltmplConfig, title, collapsible, initCollapse, tip, serverKey, mainCode } = this.props;
|
|
847
|
+
let { queryKey, loading, blockMenuTreeDrawerOpen, recordCode, showCustomCard, customButton, customButtonData, showRatmplSelector, } = this.state;
|
|
848
|
+
let { sourceId, ltmplConfig, title, collapsible, initCollapse, tip, serverKey, mainCode, } = this.props;
|
|
828
849
|
const { translate } = this.context;
|
|
829
850
|
if (!ltmplConfig || !sourceId) {
|
|
830
851
|
return (React.createElement(React.Fragment, null,
|