aldehyde 0.2.453 → 0.2.454
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,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,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,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,CACX,QAAQ,EAAE,WAAW,EAAE,EACvB,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;IA2C1B,MAAM,CAAC,cAAc,CACnB,YAAY,EAAE,WAAW,EAAE,EAC3B,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,EAC5B,WAAW,EAAE,WAAW;IAoD1B,MAAM,CAAC,UAAU,CACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM;IAKlB,MAAM,CAAC,UAAU,CACf,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM;IAgHtB,MAAM,CAAC,OAAO,CAAC,KAAK,KAAA,EAAE,YAAY,KAAA;IA2BlC,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AAQA,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,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -12,14 +12,14 @@ import Units from "../../units";
|
|
|
12
12
|
|
|
13
13
|
export default class ActionUtils {
|
|
14
14
|
static isShow(
|
|
15
|
-
|
|
15
|
+
preposes: FieldConfig[],
|
|
16
16
|
data: DtmplData[] | object[],
|
|
17
17
|
formRef: RefObject<FormInstance>
|
|
18
18
|
) {
|
|
19
19
|
|
|
20
|
-
if(!preposes || preposes.length<=0){
|
|
20
|
+
if (!preposes || preposes.length <= 0) {
|
|
21
21
|
return true;
|
|
22
|
-
} else{
|
|
22
|
+
} else {
|
|
23
23
|
return this.isMatch(preposes, data, formRef?.current, null);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
@@ -92,29 +92,29 @@ export default class ActionUtils {
|
|
|
92
92
|
let value;
|
|
93
93
|
let defualtValue;
|
|
94
94
|
for (let fieldConfig of fieldConfigs) {
|
|
95
|
-
defualtValue=this.transValue(fieldConfig.defaultValue,fieldConfig.controlType);
|
|
95
|
+
defualtValue = this.transValue(fieldConfig.defaultValue, fieldConfig.controlType);
|
|
96
96
|
if (d["fieldMap"]) {
|
|
97
97
|
let fieldId = dtmplConfig
|
|
98
98
|
? TmplConfigAnalysis.getFieldId(dtmplConfig, fieldConfig.mstrucId)
|
|
99
99
|
: fieldConfig.id;
|
|
100
|
-
value=this.transValue(d["fieldMap"][fieldId],fieldConfig.controlType);
|
|
100
|
+
value = this.transValue(d["fieldMap"][fieldId], fieldConfig.controlType);
|
|
101
101
|
if (
|
|
102
102
|
!this.comparator(
|
|
103
103
|
fieldConfig.comparator,
|
|
104
|
-
|
|
105
|
-
|
|
104
|
+
value,
|
|
105
|
+
defualtValue
|
|
106
106
|
)
|
|
107
107
|
) {
|
|
108
108
|
isMatch = false;
|
|
109
109
|
break;
|
|
110
110
|
}
|
|
111
111
|
} else {
|
|
112
|
-
value=this.transValue(d[fieldConfig.id],fieldConfig.controlType);
|
|
112
|
+
value = this.transValue(d[fieldConfig.id], fieldConfig.controlType);
|
|
113
113
|
if (
|
|
114
114
|
!this.comparator(
|
|
115
115
|
fieldConfig.comparator,
|
|
116
|
-
|
|
117
|
-
|
|
116
|
+
value,
|
|
117
|
+
defualtValue
|
|
118
118
|
)
|
|
119
119
|
) {
|
|
120
120
|
isMatch = false;
|
|
@@ -127,10 +127,10 @@ export default class ActionUtils {
|
|
|
127
127
|
}
|
|
128
128
|
|
|
129
129
|
static transValue(
|
|
130
|
-
|
|
131
|
-
|
|
130
|
+
value: string,
|
|
131
|
+
itemType: string
|
|
132
132
|
) {
|
|
133
|
-
return Units.configParamTrans(value,itemType);
|
|
133
|
+
return Units.configParamTrans(value, itemType);
|
|
134
134
|
}
|
|
135
135
|
|
|
136
136
|
static comparator(
|
|
@@ -139,8 +139,8 @@ export default class ActionUtils {
|
|
|
139
139
|
defaultValue: string
|
|
140
140
|
) {
|
|
141
141
|
let dvs: string[];
|
|
142
|
-
let value=val
|
|
143
|
-
if (
|
|
142
|
+
let value = val;
|
|
143
|
+
if (defaultValue && defaultValue.indexOf("@R@") <= 0 && val && val.indexOf && val.indexOf("@R@") > 0) {
|
|
144
144
|
let vs = val.split("@R@");
|
|
145
145
|
value = vs[1];
|
|
146
146
|
}
|
|
@@ -148,11 +148,11 @@ export default class ActionUtils {
|
|
|
148
148
|
if (!comparator) {
|
|
149
149
|
comparator = "equals";
|
|
150
150
|
}
|
|
151
|
-
|
|
152
|
-
if(comparator=="none1"){
|
|
153
|
-
return !value || value=="";
|
|
154
|
-
}else if(comparator=="none1n"){
|
|
155
|
-
return value && value!="";
|
|
151
|
+
|
|
152
|
+
if (comparator == "none1") {
|
|
153
|
+
return !value || value == "";
|
|
154
|
+
} else if (comparator == "none1n") {
|
|
155
|
+
return value && value != "";
|
|
156
156
|
}
|
|
157
157
|
|
|
158
158
|
if (!defaultValue) {
|
|
@@ -160,7 +160,8 @@ export default class ActionUtils {
|
|
|
160
160
|
}
|
|
161
161
|
|
|
162
162
|
if (!value && value != "0") {
|
|
163
|
-
|
|
163
|
+
// 无数据：不包含任一(空数据算不包含)，其余条件空数据不符合
|
|
164
|
+
return comparator === "exclude" ? true : false;
|
|
164
165
|
}
|
|
165
166
|
let vals;
|
|
166
167
|
switch (comparator) {
|
|
@@ -168,10 +169,10 @@ export default class ActionUtils {
|
|
|
168
169
|
return value.includes(defaultValue);
|
|
169
170
|
case "equal":
|
|
170
171
|
case "equals":
|
|
171
|
-
return this.isEqual(value,defaultValue);
|
|
172
|
+
return this.isEqual(value, defaultValue);
|
|
172
173
|
case "exclude":
|
|
173
|
-
dvs=this.toArray(defaultValue);
|
|
174
|
-
vals=this.toArray(value);
|
|
174
|
+
dvs = this.toArray(defaultValue);
|
|
175
|
+
vals = this.toArray(value);
|
|
175
176
|
for (let i = 0; i < dvs.length; i++) {
|
|
176
177
|
for (let j = 0; j < vals.length; j++) {
|
|
177
178
|
if (dvs[i] == vals[j]) {
|
|
@@ -182,8 +183,8 @@ export default class ActionUtils {
|
|
|
182
183
|
return true;
|
|
183
184
|
case "includeOne":
|
|
184
185
|
case "include_anyone":
|
|
185
|
-
dvs=this.toArray(defaultValue);
|
|
186
|
-
vals=this.toArray(value);
|
|
186
|
+
dvs = this.toArray(defaultValue);
|
|
187
|
+
vals = this.toArray(value);
|
|
187
188
|
for (let i = 0; i < dvs.length; i++) {
|
|
188
189
|
for (let j = 0; j < vals.length; j++) {
|
|
189
190
|
if (dvs[i] === vals[j]) {
|
|
@@ -194,10 +195,10 @@ export default class ActionUtils {
|
|
|
194
195
|
return false;
|
|
195
196
|
|
|
196
197
|
case "include_all":
|
|
197
|
-
dvs=this.toArray(defaultValue);
|
|
198
|
-
vals=this.toArray(value);
|
|
199
|
-
let count=0;
|
|
200
|
-
let targetCount=dvs.length;
|
|
198
|
+
dvs = this.toArray(defaultValue);
|
|
199
|
+
vals = this.toArray(value);
|
|
200
|
+
let count = 0;
|
|
201
|
+
let targetCount = dvs.length;
|
|
201
202
|
for (let i = 0; i < dvs.length; i++) {
|
|
202
203
|
for (let j = 0; j < vals.length; j++) {
|
|
203
204
|
if (dvs[i] == vals[j]) {
|
|
@@ -206,38 +207,38 @@ export default class ActionUtils {
|
|
|
206
207
|
}
|
|
207
208
|
}
|
|
208
209
|
}
|
|
209
|
-
return targetCount<=count;
|
|
210
|
+
return targetCount <= count;
|
|
210
211
|
case "Greater":
|
|
211
212
|
case "greater":
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
213
|
+
if (!isNaN(Number(value)) && !isNaN(Number(defaultValue))) {
|
|
214
|
+
return Number(value) > Number(defaultValue);
|
|
215
|
+
} else {
|
|
216
|
+
return value > defaultValue;
|
|
217
|
+
}
|
|
217
218
|
case "Less":
|
|
218
219
|
case "less":
|
|
219
|
-
if(!isNaN(Number(value)) && !isNaN(Number(defaultValue))){
|
|
220
|
+
if (!isNaN(Number(value)) && !isNaN(Number(defaultValue))) {
|
|
220
221
|
return Number(value) < Number(defaultValue);
|
|
221
|
-
}else{
|
|
222
|
+
} else {
|
|
222
223
|
return value < defaultValue;
|
|
223
224
|
}
|
|
224
225
|
case "noGreater":
|
|
225
226
|
case "nogreater":
|
|
226
|
-
if(!isNaN(Number(value)) && !isNaN(Number(defaultValue))){
|
|
227
|
+
if (!isNaN(Number(value)) && !isNaN(Number(defaultValue))) {
|
|
227
228
|
return Number(value) <= Number(defaultValue);
|
|
228
|
-
}else{
|
|
229
|
-
return value<=defaultValue;
|
|
229
|
+
} else {
|
|
230
|
+
return value <= defaultValue;
|
|
230
231
|
}
|
|
231
232
|
case "noLess":
|
|
232
233
|
case "noless":
|
|
233
|
-
if(!isNaN(Number(value)) && !isNaN(Number(defaultValue))){
|
|
234
|
+
if (!isNaN(Number(value)) && !isNaN(Number(defaultValue))) {
|
|
234
235
|
return Number(value) >= Number(defaultValue);
|
|
235
|
-
}else{
|
|
236
|
-
return value>=defaultValue;
|
|
236
|
+
} else {
|
|
237
|
+
return value >= defaultValue;
|
|
237
238
|
}
|
|
238
239
|
case "unequal":
|
|
239
240
|
case "unequals":
|
|
240
|
-
return !this.isEqual(value,defaultValue);
|
|
241
|
+
return !this.isEqual(value, defaultValue);
|
|
241
242
|
default:
|
|
242
243
|
message.error(
|
|
243
244
|
"暂不支持的比较关系：" + comparator + ";请联系管理员添加。",
|
|
@@ -247,41 +248,41 @@ export default class ActionUtils {
|
|
|
247
248
|
}
|
|
248
249
|
}
|
|
249
250
|
|
|
250
|
-
static isEqual(value,defaultValue){
|
|
251
|
+
static isEqual(value, defaultValue) {
|
|
251
252
|
|
|
252
|
-
if(defaultValue=="是"||defaultValue=="否" || defaultValue=="true" || defaultValue=="false"){
|
|
253
|
-
if(value=="true" || value=="是"
|
|
254
|
-
if(defaultValue=="是" || defaultValue=="true"){
|
|
253
|
+
if (defaultValue == "是" || defaultValue == "否" || defaultValue == "true" || defaultValue == "false") {
|
|
254
|
+
if (value == "true" || value == "是") {
|
|
255
|
+
if (defaultValue == "是" || defaultValue == "true") {
|
|
255
256
|
return true;
|
|
256
|
-
}else{
|
|
257
|
+
} else {
|
|
257
258
|
return false;
|
|
258
259
|
}
|
|
259
|
-
}else if(value=="false" || value=="否"
|
|
260
|
-
if(defaultValue=="否" || defaultValue=="false"){
|
|
260
|
+
} else if (value == "false" || value == "否") {
|
|
261
|
+
if (defaultValue == "否" || defaultValue == "false") {
|
|
261
262
|
return true;
|
|
262
|
-
}else{
|
|
263
|
+
} else {
|
|
263
264
|
return false;
|
|
264
265
|
}
|
|
265
|
-
}else{
|
|
266
|
+
} else {
|
|
266
267
|
return false;
|
|
267
268
|
}
|
|
268
|
-
}else{
|
|
269
|
-
if(!isNaN(Number(value)) && !isNaN(Number(defaultValue))){
|
|
269
|
+
} else {
|
|
270
|
+
if (!isNaN(Number(value)) && !isNaN(Number(defaultValue))) {
|
|
270
271
|
return Number(value) == Number(defaultValue);
|
|
271
|
-
}else{
|
|
272
|
-
return value==defaultValue;
|
|
272
|
+
} else {
|
|
273
|
+
return value == defaultValue;
|
|
273
274
|
}
|
|
274
275
|
}
|
|
275
276
|
}
|
|
276
277
|
|
|
277
|
-
static toArray(value){
|
|
278
|
+
static toArray(value) {
|
|
278
279
|
let val;
|
|
279
|
-
if(typeof value == "string"){
|
|
280
|
+
if (typeof value == "string") {
|
|
280
281
|
val = value.split(",");
|
|
281
|
-
} else if(Array.isArray(value)){
|
|
282
|
-
val= value;
|
|
283
|
-
}else{
|
|
284
|
-
val= [value];
|
|
282
|
+
} else if (Array.isArray(value)) {
|
|
283
|
+
val = value;
|
|
284
|
+
} else {
|
|
285
|
+
val = [value];
|
|
285
286
|
}
|
|
286
287
|
return val;
|
|
287
288
|
}
|