aldehyde 0.2.505 → 0.2.507

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.
Files changed (14) hide show
  1. package/lib/controls/action/index.d.ts.map +1 -1
  2. package/lib/controls/action/index.js +20 -27
  3. package/lib/controls/action/index.js.map +1 -1
  4. package/lib/detail/edit/fields-edit-card.d.ts +9 -0
  5. package/lib/detail/edit/fields-edit-card.d.ts.map +1 -1
  6. package/lib/detail/edit/fields-edit-card.js +130 -4
  7. package/lib/detail/edit/fields-edit-card.js.map +1 -1
  8. package/lib/form/criteria-form.d.ts.map +1 -1
  9. package/lib/form/criteria-form.js +7 -2
  10. package/lib/form/criteria-form.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/aldehyde/controls/action/index.tsx +19 -27
  13. package/src/aldehyde/detail/edit/fields-edit-card.tsx +140 -13
  14. package/src/aldehyde/form/criteria-form.tsx +6 -4
package/lib/controls/action/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AASlC,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAIhE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC;AACnE,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,QAAQ,GAAG,SAAS,CAAC;AACtE,MAAM,MAAM,sBAAsB,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE3D,UAAU,WAAW;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAE3B,IAAI,CAAC,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,CAAC,MAAM,KAAA,EAAE,KAAK,KAAA,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;CAC7C;AAED,UAAU,WAAW;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;CAClC;AAED,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,KAAK,CAAC,aAAa,CACrD,WAAW,EACX,WAAW,CACZ;IACC,MAAM,CAAC,YAAY;;;;;MAMjB;IACF,MAAM,CAAC,WAAW;;;;;;;YA3CpB,GAAG;oBACE,GAAG;;;;;;OA0C6B;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,KAAK;;;;MAIH;IAEF,iBAAiB;IAgBjB,kBAAkB,CAAC,SAAS,KAAA;IAO5B,MAAM,gBAGJ;IAEF,UAAU,2CAET;IAED,QAAQ,WA8CN;IACF,IAAI,GAAI,OAAO,MAAM,UAQnB;IACF,QAAQ,aAIN;IACF,cAAc,GAAI,OAAO,MAAM,EAAE,cAAS,UAkBxC;IAEF,aAAa,2DAYX;IAEF,WAAW,QAAO,OAAO,CAIvB;IAEF,UAAU,0BAqDR;IAEF,QAAQ,YAkCN;IAEF,QAAQ,cAaN;IAEF,iBAAiB,0BAsFf;IAGF,gBAAgB,0BAuBf;IAED,MAAM;CAeP"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AASlC,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAIhE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC;AACnE,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,QAAQ,GAAG,SAAS,CAAC;AACtE,MAAM,MAAM,sBAAsB,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE3D,UAAU,WAAW;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAE3B,IAAI,CAAC,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,CAAC,MAAM,KAAA,EAAE,KAAK,KAAA,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;CAC7C;AAED,UAAU,WAAW;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;CAClC;AAED,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,KAAK,CAAC,aAAa,CACrD,WAAW,EACX,WAAW,CACZ;IACC,MAAM,CAAC,YAAY;;;;;MAMjB;IACF,MAAM,CAAC,WAAW;;;;;;;YA3CpB,GAAG;oBACE,GAAG;;;;;;OA0C6B;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,KAAK;;;;MAIH;IAEF,iBAAiB;IAgBjB,kBAAkB,CAAC,SAAS,KAAA;IAO5B,MAAM,gBAGJ;IAEF,UAAU,2CAET;IAED,QAAQ,WAsCN;IACF,IAAI,GAAI,OAAO,MAAM,UAQnB;IACF,QAAQ,aAIN;IACF,cAAc,GAAI,OAAO,MAAM,EAAE,cAAS,UAkBxC;IAEF,aAAa,2DAYX;IAEF,WAAW,QAAO,OAAO,CAIvB;IAEF,UAAU,0BAqDR;IAEF,QAAQ,YAkCN;IAEF,QAAQ,cAaN;IAEF,iBAAiB,0BAsFf;IAGF,gBAAgB,0BAuBf;IAED,MAAM;CAeP"}
package/lib/controls/action/index.js CHANGED
@@ -33,36 +33,29 @@ class Action extends React.PureComponent {
33
33
  if (!fieldConfig) {
34
34
  continue;
35
35
  }
36
- if (upperFormValue) {
37
- if (upperFormValue.getFieldValue(fieldConfig.id)) {
38
- value[fieldConfig.id] = ActionUtils.getFormRefValue(upperFormValue, fieldConfig.id);
39
- }
40
- else {
41
- if (dtmplValue) {
42
- if (dtmplValue["fieldMap"]) {
43
- value[fieldConfig.id] = dtmplValue
44
- ? dtmplValue["fieldMap"][fieldConfig.id]
45
- : undefined;
46
- }
47
- else {
48
- value[fieldConfig.id] = dtmplValue
49
- ? dtmplValue[fieldConfig.id]
50
- : undefined;
51
- }
52
- }
53
- }
36
+ if (upperFormValue && upperFormValue.getFieldValue(fieldConfig.id)) {
37
+ value[fieldConfig.id] = ActionUtils.getFormRefValue(upperFormValue, fieldConfig.id);
54
38
  }
55
39
  else {
56
40
  if (dtmplValue) {
57
- if (dtmplValue["fieldMap"]) {
58
- value[fieldConfig.id] = dtmplValue
59
- ? dtmplValue["fieldMap"][fieldConfig.id]
60
- : undefined;
61
- }
62
- else {
63
- value[fieldConfig.id] = dtmplValue
64
- ? dtmplValue[fieldConfig.id]
65
- : undefined;
41
+ const { requiredRuleCriteria, usableRuleCriteria, relValueField, relValueField3, relMinValueField, relMaxValueField } = fieldConfig;
42
+ const temDtmplValue = dtmplValue["fieldMap"] ? dtmplValue["fieldMap"] : dtmplValue;
43
+ if (temDtmplValue) {
44
+ value[fieldConfig.id] = temDtmplValue[fieldConfig.id]; // 当前表单项
45
+ requiredRuleCriteria && requiredRuleCriteria.forEach(item => {
46
+ value[item.id] = temDtmplValue[item.id];
47
+ });
48
+ usableRuleCriteria && usableRuleCriteria.forEach(item => {
49
+ value[item.id] = temDtmplValue[item.id];
50
+ });
51
+ if (relValueField)
52
+ value[relValueField.id] = temDtmplValue[relValueField.id]; // 次条件
53
+ if (relValueField3)
54
+ value[relValueField3.id] = temDtmplValue[relValueField3.id]; // 三条件
55
+ if (relMinValueField)
56
+ value[relMinValueField.id] = temDtmplValue[relMinValueField.id]; // 最小值
57
+ if (relMaxValueField)
58
+ value[relMaxValueField.id] = temDtmplValue[relMaxValueField.id]; // 最大值
66
59
  }
67
60
  }
68
61
  }
package/lib/controls/action/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EACL,MAAM,EAEN,UAAU,EACV,OAAO,EACP,OAAO,EACP,KAAK,EACN,MAAM,MAAM,CAAC;AACd,OAAO,aAAa,CAAC;AAGrB,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAEhE,OAAO,WAAW,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,oBAAoB,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,aAAa,MAAM,aAAa,CAAC;AA6BxC,MAAqB,MAAO,SAAQ,KAAK,CAAC,aAGzC;IAHD;;QAcE,UAAK,GAAG;YACN,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;YACpB,OAAO,EAAE,KAAK,CAAC,SAAS,EAAgB;SACzC,CAAC;QAwBF,4CAA4C;QAC5C,WAAM,GAAG,GAAG,EAAE;YACZ,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1C,OAAO,WAAW,CAAC,MAAM,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC7E,CAAC,CAAC;QAEF,eAAU,GAAG,GAAG,EAAE;YAChB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QAC5B,CAAC,CAAA;QAED,aAAQ,GAAG,GAAG,EAAE;YACd,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACnD,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,mBAAmB;YACnB,eAAe;YACf,IAAI,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5C,IAAI,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC;YAC3E,KAAK,IAAI,WAAW,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,SAAS;gBACX,CAAC;gBACD,IAAI,cAAc,IAAI,cAAc,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;oBACnE,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,eAAe,CACjD,cAAc,EACd,WAAW,CAAC,EAAE,CACf,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,IAAI,UAAU,EAAE,CAAC;wBACf,MAAM,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,WAAW,CAAC;wBACpI,MAAM,aAAa,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;wBACnF,IAAI,aAAa,EAAE,CAAC;4BAClB,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ;4BAC/D,oBAAoB,IAAI,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gCAC1D,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;4BAC1C,CAAC,CAAC,CAAC;4BACH,kBAAkB,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gCACtD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;4BAC1C,CAAC,CAAC,CAAC;4BACH,IAAI,aAAa;gCAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM;4BACpF,IAAI,cAAc;gCAAE,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM;4BACvF,IAAI,gBAAgB;gCAAE,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM;4BAC7F,IAAI,gBAAgB;gCAAE,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM;wBAC/F,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QACF,SAAI,GAAG,CAAC,KAAa,EAAE,EAAE;YACvB,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAEzC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9C,IAAI,CAAC,QAAQ,CAAC;gBACZ,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC;YACH,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;QACpD,CAAC,CAAC;QACF,aAAQ,GAAG,GAAG,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC;gBACZ,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC;QACL,CAAC,CAAC;QACF,mBAAc,GAAG,CAAC,KAAa,EAAE,SAAS,EAAE,EAAE;YAC5C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACrC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,UAAU;YACV,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC/B,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc,EAAE,CAAC;gBACnC,UAAU;gBACV,cAAc,CAAC,cAAc,CAC3B,KAAK,EACL;oBACE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;oBACnC,QAAQ,EAAE,SAAS;iBACpB,EACD,IAAI,CAAC,UAAU,EAAE,CAAC,OAAO,CAC1B,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEF,kBAAa,GAAG,GAAG,EAAE;YACnB,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAChD,IAAI,KAAK,GAAe,CAAC,UAAU;gBACjC,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ;oBACpC,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,SAAS,CAAC;YAChB,OAAO,UAAU;gBACf,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,YAAY,CAAC,UAAU;oBACvB,CAAC,CAAC,YAAY,CAAC,UAAU;oBACzB,CAAC,CAAC,QAAQ,CAAC;QACjB,CAAC,CAAC;QAEF,gBAAW,GAAG,GAAY,EAAE;YAC1B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAClC,IAAI,KAAK,GAAG,UAAU,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACvD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,eAAU,GAAG,GAAG,EAAE;YAChB,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACnC,MAAM,EACJ,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,UAAU,EACV,SAAS,EAAE,OAAO,EACnB,GAAG,IAAI,CAAC,KAAK,CAAC;YACf,IAAI,SAAS,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBACnB,IAAI,CAAC,UAAU,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;oBAC1C,OAAO,IAAI,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,SAAS,GAAG,IAAI,CAAC;gBACnB,CAAC;YACH,CAAC;YACD,OAAO,CACL,oBAAC,OAAO,IACN,SAAS,EAAC,KAAK,EACf,IAAI,EAAE,WAAW,EACjB,eAAe,EAAE,IAAI,EACrB,OAAO,EAAC,OAAO,EACf,OAAO,EACL,oBAAC,cAAc,IACb,YAAY,EAAE,CAAC,EACf,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,EAC1B,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,YAAY,CAAC,gBAAgB,IAAI,QAAQ,EACnD,WAAW,EAAE,IAAI,EACjB,KAAK,EAAE,YAAY,CAAC,KAAK,EACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAC/B,MAAM,EAAE,YAAY,CAAC,MAAM,EAC3B,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,EACtB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,cAAc,EAAE,IAAI,CAAC,cAAc,GACnC;gBAGJ,oBAAC,MAAM,IACL,MAAM,EAAE,YAAY,CAAC,MAAM,EAC3B,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,EAC1B,KAAK,EAAE,YAAY,CAAC,WAAW,EAC/B,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,EACzB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC,EAC3D,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,OAAO,IAEf,IAAI,CAAC,QAAQ,EAAE,CACT,CACD,CACX,CAAC;QACJ,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAG,EAAE;YACd,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9C,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;YACnC,IAAI,KAAK,GAAG,IAAI,CAAC;YACjB,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;gBACtB,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;oBAC7B,KAAK,GAAG,CACN,oBAAC,KAAK,IAAC,IAAI,EAAE,CAAC;wBACZ,oBAAC,IAAI,IAAC,IAAI,EAAE,YAAY,CAAC,IAAI,GAAI;wBAChC,SAAS,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,GAAG,GAAG,CAAC,CACrC,CACT,CAAC;gBACJ,CAAC;qBAAM,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;oBAC9B,KAAK,GAAG,CACN,oBAAC,OAAO,IAAC,SAAS,EAAC,KAAK,EAAC,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,GAAG,GAAG,CAAC;wBACxE,oBAAC,IAAI,IAAC,IAAI,EAAE,YAAY,CAAC,IAAI,GAAS,CAC9B,CACX,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,SAAS,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC;gBACrD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,SAAS,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC;YACrD,CAAC;YAED,IAAI,YAAY,CAAC,GAAG,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;gBAC3C,KAAK,GAAG,CACN;oBACE,oBAAC,OAAO,IAAC,KAAK,EAAE,YAAY,CAAC,GAAG,IAAG,SAAS,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,GAAG,GAAG,CAAC,CAAW,CACvF,CACJ,CAAC;YACJ,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAG,EAAE;YACd,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,IAAI,YAAY,KAAK,EAAE,CAAC;oBAC1B,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;wBACnB,IAAI,CAAC,EAAE,CAAC;4BACN,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;wBACxB,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,sBAAiB,GAAG,GAAG,EAAE;YACvB,MAAM,EACJ,YAAY,EACZ,QAAQ,EACR,IAAI,EAAE,OAAO,EACb,QAAQ,EACR,UAAU,EACV,UAAU,EACV,UAAU,GACX,GAAG,IAAI,CAAC,KAAK,CAAC;YACf,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;YACnC,IAAI,SAAS,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBACnB,IAAI,CAAC,UAAU,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;oBAC1C,OAAO,IAAI,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,SAAS,GAAG,IAAI,CAAC;gBACnB,CAAC;YACH,CAAC;YACD,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,IAAI,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACjC,OAAO,CAAC,YAAY,CAAC,gBAAgB;gBACnC,YAAY,CAAC,gBAAgB,IAAI,SAAS,CAAC,CAAC,CAAC,CAC7C,oBAAC,UAAU,IACT,GAAG,EAAE,YAAY,CAAC,EAAE,EACpB,SAAS,EAAC,aAAa,EACvB,KAAK,EAAE,SAAS,CAAC,aAAa,GAAG,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC,EAC5D,SAAS,EAAE,GAAG,EAAE;oBACd,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBACvC,CAAC,EACD,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAC1B,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC;gBAE9B,oBAAC,MAAM,IACL,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,YAAY,CAAC,MAAM,EAC3B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,YAAY,CAAC,WAAW,EAC/B,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,SAAS,IAElB,IAAI,CAAC,QAAQ,EAAE,CACT,CACE,CACd,CAAC,CAAC,CAAC,YAAY,CAAC,gBAAgB,IAAI,QAAQ,CAAC,CAAC,CAAC,CAC9C,oBAAC,UAAU,IACT,GAAG,EAAE,YAAY,CAAC,EAAE,EACpB,SAAS,EAAC,aAAa,EACvB,KAAK,EAAE,SAAS,CAAC,aAAa,GAAG,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC,EAC5D,SAAS,EAAE,GAAG,EAAE;oBACd,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBACvC,CAAC,EACD,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAC1B,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAC9B,MAAM,EAAE,QAAQ;gBAEhB,oBAAC,MAAM,IACL,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,YAAY,CAAC,WAAW,EAC/B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,SAAS,IAElB,IAAI,CAAC,QAAQ,EAAE,CACT,CACE,CACd,CAAC,CAAC,CAAC,CACF,oBAAC,MAAM,IACL,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,YAAY,CAAC,WAAW,EAC/B,MAAM,EAAE,YAAY,CAAC,MAAM,EAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EACnD,QAAQ,EAAE,SAAS,IAElB,IAAI,CAAC,QAAQ,EAAE,CACT,CACV,CAAC;QACJ,CAAC,CAAC;QAEF,SAAS;QACT,qBAAgB,GAAG,GAAG,EAAE;YACtB,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC7F,IAAI,SAAS,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBACnB,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,SAAS,GAAG,IAAI,CAAC;gBACnB,CAAC;YACH,CAAC;YAED,OAAO,oBAAC,MAAM,IACZ,MAAM,EAAE,YAAY,CAAC,MAAM,EAC3B,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,EAC1B,KAAK,EAAE,YAAY,CAAC,WAAW,EAC/B,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,EACzB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,CAAC,aAAa,EAAE,CAAC,EACtH,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,OAAO,IAEf,IAAI,CAAC,QAAQ,EAAE,CACT,CAAC;QACZ,CAAC,CAAA;IAiBH,CAAC;IAxWC,iBAAiB;QACf,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE1C,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAExC,IAAI,cAAc,GAAG,aAAa,CAAC,iBAAiB,CAClD,EAAE,EAAE,EAAE,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EACtE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAM,CAAC,EAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,oBAAO,CAAC,CAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EACrE,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC;YACZ,cAAc;SACf,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,SAAS;QAC1B,MAAM,EAAG,GAAG,IAAI,CAAC,KAAK,CAAC;QACvB,IAAI,IAAI,CAAC,KAAK,IAAI,SAAS,EAAE,CAAC;YAC5B,iDAAiD;QACnD,CAAC;IACH,CAAC;IAoUD,MAAM;QACJ,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEpC,IAAI,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC,eAAe;YAC/C,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACjC,CAAC;QAED,OAAO,CACL,0CACG,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;YACpD,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE;YACnB,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAC3B,CACJ,CAAC;IACJ,CAAC;;AAvXM,mBAAY,GAAG;IACpB,UAAU,EAAE,QAAQ;IACpB,UAAU,EAAE,QAAQ;IACpB,QAAQ,EAAE,YAAY;IACtB,OAAO,EAAE,KAAK;IACd,0CAA0C;CAC3C,AANkB,CAMjB;AACK,kBAAW,GAAG,aAAa,AAAhB,CAAiB;eAXhB,MAAM"}
package/lib/detail/edit/fields-edit-card.d.ts CHANGED
@@ -53,6 +53,15 @@ export default class FieldsEditCard extends React.PureComponent<FieldsEditCardPr
53
53
  componentDidUpdate(): Promise<void>;
54
54
  reset: () => void;
55
55
  onOk: () => void;
56
+ getSubDtmplData: (valueField: any, code: any) => any;
57
+ getSecondCriteria: (field: any) => Promise<any>;
58
+ /**
59
+ * 处理表单关联项
60
+ * 匹配关联项的字段，实现值更新关联字段值变化
61
+ */
62
+ handleRelValueField: () => void;
63
+ handleBuildInFuncFields: () => Promise<void>;
64
+ handleValuesChange: (changedValues?: any, allValues?: any) => void;
56
65
  render(): React.JSX.Element;
57
66
  }
58
67
  export {};
package/lib/detail/edit/fields-edit-card.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fields-edit-card.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/fields-edit-card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AACvC,OAAO,EAAgB,YAAY,EAAqB,MAAM,MAAM,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,mBAAmB;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAC,SAAS,KAAA,KAAK,IAAI,CAAC;IAClD,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;CACnC;AAED,UAAU,mBAAmB;CAAG;AAEhC,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,KAAK,CAAC,aAAa,CAC7D,mBAAmB,EACnB,mBAAmB,CACpB;IAEC,MAAM,CAAC,YAAY;;;;;;;;;;MAOjB;IACF,KAAK,KAAM;IACX,MAAM,CAAC,WAAW;;;;;;;YA1BlB,GAAC;oBAED,GAAC;;;;;;OAwBkC;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAEjB,kBAAkB;IAIxB,KAAK,aAIH;IAEF,IAAI,aAEF;IAIF,MAAM;CAmFP"}
1
+ {"version":3,"file":"fields-edit-card.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/fields-edit-card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAgB,YAAY,EAAqB,MAAM,MAAM,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAQ5D,UAAU,mBAAmB;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,KAAA,KAAK,IAAI,CAAC;IACnD,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;CACnC;AAED,UAAU,mBAAmB;CAAI;AAEjC,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,KAAK,CAAC,aAAa,CAC7D,mBAAmB,EACnB,mBAAmB,CACpB;IAEC,MAAM,CAAC,YAAY;;;;;;;;;;MAOjB;IACF,KAAK,KAAM;IACX,MAAM,CAAC,WAAW;;;;;;;YArCA,GAAG;oBAGvB,GAFC;;;;;;OAoCoC;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAIjB,kBAAkB;IAIxB,KAAK,aAIH;IAEF,IAAI,aAEF;IAGF,eAAe,GAAU,eAAU,EAAE,SAAI,SAuBxC;IAED,iBAAiB,GAAU,UAAK,kBAyC/B;IAGD;;;OAGG;IACH,mBAAmB,aAuBjB;IAGF,uBAAuB,sBAetB;IAED,kBAAkB,GAAI,gBAAgB,GAAG,EAAE,YAAY,GAAG,UAIzD;IAGD,MAAM;CAgFP"}
package/lib/detail/edit/fields-edit-card.js CHANGED
@@ -12,6 +12,10 @@ import { Button, Card, Popconfirm, Space } from "antd";
12
12
  import { CloseOutlined } from "@ant-design/icons";
13
13
  import FieldsForm from "../../form/fields-form";
14
14
  import { LocaleContext } from "../../locale/LocaleProvider";
15
+ import HcserviceV3 from "../../tmpl/hcservice-v3";
16
+ import { relValueFieldExtControlType } from "../../controls/entry-control";
17
+ // 缓存 getSubDtmplData 的请求结果（防止多次请求）
18
+ const subDtmplDataCache = new Map();
15
19
  class FieldsEditCard extends React.PureComponent {
16
20
  constructor() {
17
21
  super(...arguments);
@@ -24,9 +28,132 @@ class FieldsEditCard extends React.PureComponent {
24
28
  this.onOk = () => {
25
29
  this.props.formRef.current.submit();
26
30
  };
31
+ // 表单关联项secondCriterion处理start
32
+ this.getSubDtmplData = (valueField, code) => __awaiter(this, void 0, void 0, function* () {
33
+ const { serverKey } = this.props;
34
+ let dtmplData = null;
35
+ const cacheKey = `${valueField.extRefPageId || valueField.id}_${code.split("@R@")[0]}`; //缓存Key
36
+ const cacheData = subDtmplDataCache.get(cacheKey);
37
+ if (cacheData !== undefined) { // 存在缓存使用缓存，减少请求次数
38
+ dtmplData = cacheData;
39
+ }
40
+ else {
41
+ if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
42
+ const { entities } = (yield HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] })) || {};
43
+ dtmplData = entities === null || entities === void 0 ? void 0 : entities[0];
44
+ }
45
+ else { // 查询字段指向页面的数据
46
+ dtmplData = yield HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
47
+ }
48
+ subDtmplDataCache.set(cacheKey, dtmplData || false);
49
+ }
50
+ if (!dtmplData)
51
+ return null;
52
+ const subField = valueField.subRelValueField;
53
+ const subData = dtmplData.fieldMap[subField.id];
54
+ if (subField.subRelValueField && subData) { // 存在下级关联项
55
+ return this.getSubDtmplData(subField, subData);
56
+ }
57
+ return subData;
58
+ });
59
+ this.getSecondCriteria = (field) => __awaiter(this, void 0, void 0, function* () {
60
+ const { formRef, value } = this.props;
61
+ const { relValueField, relValueField3, baseCriteria = {}, relMinValueField, relMaxValueField } = field;
62
+ const temForm = formRef.current;
63
+ if (relValueField && temForm) { // 设置默认值或查询次条件
64
+ let relValueData = temForm.getFieldValue(relValueField.id) || value[relValueField.id];
65
+ if (relValueField.subRelValueField && relValueData) {
66
+ relValueData = yield this.getSubDtmplData(relValueField, relValueData);
67
+ }
68
+ if (!relValueFieldExtControlType.includes(field.extControlType)) {
69
+ field.defaultValue = relValueData; // 非关系型字段填充默认值
70
+ }
71
+ else {
72
+ field.baseCriteria = Object.assign(Object.assign({}, (baseCriteria || {})), { "secondCriterion": relValueData });
73
+ }
74
+ field.configChanged = true;
75
+ }
76
+ if (relValueField3 && temForm) { // 设置查询三条件
77
+ let relValueData = temForm.getFieldValue(relValueField3.id) || value[relValueField3.id];
78
+ if (relValueField3.subRelValueField && relValueData) {
79
+ relValueData = yield this.getSubDtmplData(relValueField3, relValueData);
80
+ }
81
+ field.baseCriteria = Object.assign(Object.assign({}, (field.baseCriteria || {})), { "thirdCriterion": relValueData });
82
+ field.configChanged = true;
83
+ }
84
+ if (relMinValueField && temForm) { // 设置最小值
85
+ let relValueData = temForm.getFieldValue(relMinValueField.id) || value[relMinValueField.id];
86
+ if (relMinValueField.subRelValueField && relValueData) {
87
+ relValueData = yield this.getSubDtmplData(relMinValueField, relValueData);
88
+ }
89
+ field.min = relValueData;
90
+ field.configChanged = true;
91
+ }
92
+ if (relMaxValueField && temForm) { // 设置最大值
93
+ let relValueData = temForm.getFieldValue(relMaxValueField.id) || value[relMaxValueField.id];
94
+ if (relMaxValueField.subRelValueField && relValueData) {
95
+ relValueData = yield this.getSubDtmplData(relMaxValueField, relValueData);
96
+ }
97
+ field.max = relValueData;
98
+ field.configChanged = true;
99
+ }
100
+ return field;
101
+ });
102
+ // 表单关联项secondCriterion处理end
103
+ /**
104
+ * 处理表单关联项
105
+ * 匹配关联项的字段，实现值更新关联字段值变化
106
+ */
107
+ this.handleRelValueField = () => {
108
+ const { fields } = this.props;
109
+ if (!(fields === null || fields === void 0 ? void 0 : fields.length)) {
110
+ return;
111
+ }
112
+ const valueFieldMap = fields.reduce((total, field) => {
113
+ if (field.relValueField) { // 关联取值字段
114
+ const temArr = total[field.relValueField.id] || [];
115
+ const isItem = temArr.find(r => r.id === field.id);
116
+ if (!isItem) {
117
+ total[field.relValueField.id] = [...temArr, field];
118
+ }
119
+ }
120
+ if (field.relValueField3) { // 关联取值字段扩1
121
+ const temArr = total[field.relValueField3.id] || [];
122
+ const isItem = temArr.find(r => r.id === field.id);
123
+ if (!isItem) {
124
+ total[field.relValueField3.id] = [...temArr, field];
125
+ }
126
+ }
127
+ return total;
128
+ }, {});
129
+ this.setState({ valueFieldMap });
130
+ };
131
+ //关联取值:根据 parentFormInstance / this.formRef 完善 dtmplConfig
132
+ this.handleBuildInFuncFields = () => __awaiter(this, void 0, void 0, function* () {
133
+ const { fields } = this.props;
134
+ if (fields === null || fields === void 0 ? void 0 : fields.length) {
135
+ const buildInFuncFields = fields.map(field => {
136
+ var _a, _b;
137
+ if (((_a = field.requiredRuleCriteria) === null || _a === void 0 ? void 0 : _a.length) || ((_b = field.usableRuleCriteria) === null || _b === void 0 ? void 0 : _b.length) || field.relValueField ||
138
+ field.relValueField3 || field.relMinValueField || field.relMaxValueField) {
139
+ field.shouldUpdate = true;
140
+ return field;
141
+ }
142
+ return false;
143
+ }).filter(Boolean);
144
+ yield Promise.all(buildInFuncFields.map(field => this.getSecondCriteria(field)));
145
+ }
146
+ });
147
+ this.handleValuesChange = (changedValues, allValues) => {
148
+ const { onValuesChange } = this.props;
149
+ this.handleBuildInFuncFields();
150
+ onValuesChange(changedValues, allValues);
151
+ };
27
152
  }
28
153
  componentDidMount() {
29
- return __awaiter(this, void 0, void 0, function* () { });
154
+ return __awaiter(this, void 0, void 0, function* () {
155
+ this.handleBuildInFuncFields();
156
+ });
30
157
  }
31
158
  componentDidUpdate() {
32
159
  return __awaiter(this, void 0, void 0, function* () {
@@ -34,8 +161,7 @@ class FieldsEditCard extends React.PureComponent {
34
161
  });
35
162
  }
36
163
  render() {
37
- const { title, height, onOk, fields, value, onCancel, okButtonType, needConfirm, okDanger, onValuesChange, serverKey, formRef, maxColsOnRow } = this.props;
38
- const {} = this.state;
164
+ const { title, onOk, fields, value, onCancel, okButtonType, needConfirm, okDanger, serverKey, formRef, maxColsOnRow } = this.props;
39
165
  const { translate } = this.context;
40
166
  function okButton(onOk) {
41
167
  return needConfirm ? (okDanger ? (React.createElement(Popconfirm, { placement: "rightBottom", title: translate("${确定要执行提交吗}?"), onConfirm: onOk, okText: translate("${确定}"), cancelText: translate("${取消}"), okType: "danger" },
@@ -48,7 +174,7 @@ class FieldsEditCard extends React.PureComponent {
48
174
  React.createElement(Button, { onClick: this.reset }, translate("${重置}")),
49
175
  onCancel ? (React.createElement(Button, { onClick: onCancel },
50
176
  React.createElement(CloseOutlined, null))) : (""))) },
51
- React.createElement(FieldsForm, { maxColsOnRow: maxColsOnRow, serverKey: serverKey, onValuesChange: onValuesChange, fields: fields, formRef: formRef, value: value, onFinish: onOk })));
177
+ React.createElement(FieldsForm, { maxColsOnRow: maxColsOnRow, serverKey: serverKey, onValuesChange: this.handleValuesChange, fields: fields, formRef: formRef, value: value, onFinish: onOk })));
52
178
  }
53
179
  }
54
180
  FieldsEditCard.defaultProps = {
package/lib/detail/edit/fields-edit-card.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fields-edit-card.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/fields-edit-card.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAgB,UAAU,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAoB5D,MAAqB,cAAe,SAAQ,KAAK,CAAC,aAGjD;IAHD;;QAaE,UAAK,GAAG,EAAE,CAAC;QAUX,UAAK,GAAG,GAAG,EAAE;YACX,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,CAAC;QACH,CAAC,CAAC;QAEF,SAAI,GAAG,GAAG,EAAE;YACV,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACtC,CAAC,CAAC;IAuFJ,CAAC;IArGO,iBAAiB;8DAAI,CAAC;KAAA;IAEtB,kBAAkB;;YACtB,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;KAAA;IAcD,MAAM;QACJ,MAAM,EACJ,KAAK,EACL,MAAM,EACN,IAAI,EACJ,MAAM,EACN,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,QAAQ,EACR,cAAc,EACd,SAAS,EAAC,OAAO,EAAC,YAAY,EAC/B,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEnC,SAAS,QAAQ,CAAC,IAAI;YACpB,OAAO,WAAW,CAAC,CAAC,CAAC,CACnB,QAAQ,CAAC,CAAC,CAAC,CACT,oBAAC,UAAU,IACT,SAAS,EAAC,aAAa,EACvB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,EAChC,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAC1B,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAC9B,MAAM,EAAE,QAAQ;gBAEhB,oBAAC,MAAM,IAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,IACrC,SAAS,CAAC,OAAO,CAAC,CACZ,CACE,CACd,CAAC,CAAC,CAAC,CACF,oBAAC,UAAU,IACT,SAAS,EAAC,aAAa,EACvB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,EAChC,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAC1B,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC;gBAE9B,oBAAC,MAAM,IAAC,IAAI,EAAE,YAAY,IAAG,SAAS,CAAC,OAAO,CAAC,CAAU,CAC9C,CACd,CACF,CAAC,CAAC,CAAC,CACF,oBAAC,MAAM,IAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,IACtC,SAAS,CAAC,OAAO,CAAC,CACZ,CACV,CAAC;QACJ,CAAC;QAED,OAAO,CACL,oBAAC,IAAI,IACH,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,EAAC,KAAK,EAAE,YAAY,KAAG,CAAC,CAAA,CAAC,CAAC,GAAG,CAAA,CAAC,CAAA,KAAK,EAAE,EAC5C,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,EAAC,IAAI,EAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAC,EACnC,KAAK,EACH;gBACE,oBAAC,KAAK,IAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;oBAChB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;oBACpB,oBAAC,MAAM,IAAC,OAAO,EAAE,IAAI,CAAC,KAAK,IAAG,SAAS,CAAC,OAAO,CAAC,CAAU;oBACzD,QAAQ,CAAC,CAAC,CAAC,CACV,oBAAC,MAAM,IAAC,OAAO,EAAE,QAAQ;wBACvB,oBAAC,aAAa,OAAG,CACV,CACV,CAAC,CAAC,CAAC,CACF,EAAE,CACH,CACK,CACP;YAGL,oBAAC,UAAU,IAAC,YAAY,EAAE,YAAY,EACpC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,IAAI,GACF,CACT,CACR,CAAC;IACJ,CAAC;;AAhHM,2BAAY,GAAG;IACpB,WAAW,EAAE,IAAI;IACjB,KAAK,EAAE,EAAE,QAAQ,EAAE,oBAAoB,EAAE,SAAS,EAAE,oBAAoB,EAAE;IAC1E,WAAW,EAAE,KAAK;IAClB,YAAY,EAAE,SAAS;IACvB,QAAQ,EAAE,KAAK;IACf,YAAY,EAAC,CAAC;CACf,AAPkB,CAOjB;AAEK,0BAAW,GAAG,aAAa,AAAhB,CAAiB;eAdhB,cAAc"}
1
+ {"version":3,"file":"fields-edit-card.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/fields-edit-card.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAgB,UAAU,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAG3E,mCAAmC;AACnC,MAAM,iBAAiB,GAAqB,IAAI,GAAG,EAAE,CAAC;AAoBtD,MAAqB,cAAe,SAAQ,KAAK,CAAC,aAGjD;IAHD;;QAaE,UAAK,GAAG,EAAE,CAAC;QAYX,UAAK,GAAG,GAAG,EAAE;YACX,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,CAAC;QACH,CAAC,CAAC;QAEF,SAAI,GAAG,GAAG,EAAE;YACV,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACtC,CAAC,CAAC;QAEF,8BAA8B;QAC9B,oBAAe,GAAG,CAAO,UAAU,EAAE,IAAI,EAAE,EAAE;YAC3C,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjC,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,MAAM,QAAQ,GAAG,GAAG,UAAU,CAAC,YAAY,IAAI,UAAU,CAAC,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO;YAC/F,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAClD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC,CAAC,kBAAkB;gBAC/C,SAAS,GAAG,SAAS,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,IAAI,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,iEAAiE;oBAC9F,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAA,MAAM,WAAW,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAI,EAAE,CAAC;oBACpJ,SAAS,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC,CAAC,cAAc;oBACrB,SAAS,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;gBACvG,CAAC;gBACD,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,IAAI,KAAK,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,CAAC,SAAS;gBAAE,OAAO,IAAI,CAAC;YAC5B,MAAM,QAAQ,GAAG,UAAU,CAAC,gBAAgB,CAAC;YAC7C,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAChD,IAAI,QAAQ,CAAC,gBAAgB,IAAI,OAAO,EAAE,CAAC,CAAC,UAAU;gBACpD,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACjD,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAA,CAAA;QAED,sBAAiB,GAAG,CAAO,KAAK,EAAE,EAAE;YAClC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,GAAG,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC;YACvG,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAChC,IAAI,aAAa,IAAI,OAAO,EAAE,CAAC,CAAC,cAAc;gBAC5C,IAAI,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACtF,IAAI,aAAa,CAAC,gBAAgB,IAAI,YAAY,EAAE,CAAC;oBACnD,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;gBACzE,CAAC;gBACD,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oBAChE,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC,CAAE,cAAc;gBACpD,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,YAAY,mCAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,KAAE,iBAAiB,EAAE,YAAY,GAAE,CAAC;gBACpF,CAAC;gBACD,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;YAC7B,CAAC;YACD,IAAI,cAAc,IAAI,OAAO,EAAE,CAAC,CAAC,UAAU;gBACzC,IAAI,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;gBACxF,IAAI,cAAc,CAAC,gBAAgB,IAAI,YAAY,EAAE,CAAC;oBACpD,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;gBAC1E,CAAC;gBACD,KAAK,CAAC,YAAY,mCAAQ,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,KAAE,gBAAgB,EAAE,YAAY,GAAE,CAAC;gBACvF,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;YAC7B,CAAC;YACD,IAAI,gBAAgB,IAAI,OAAO,EAAE,CAAC,CAAC,QAAQ;gBACzC,IAAI,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;gBAC5F,IAAI,gBAAgB,CAAC,gBAAgB,IAAI,YAAY,EAAE,CAAC;oBACtD,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;gBAC5E,CAAC;gBACD,KAAK,CAAC,GAAG,GAAG,YAAY,CAAC;gBACzB,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;YAC7B,CAAC;YACD,IAAI,gBAAgB,IAAI,OAAO,EAAE,CAAC,CAAC,QAAQ;gBACzC,IAAI,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;gBAC5F,IAAI,gBAAgB,CAAC,gBAAgB,IAAI,YAAY,EAAE,CAAC;oBACtD,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;gBAC5E,CAAC;gBACD,KAAK,CAAC,GAAG,GAAG,YAAY,CAAC;gBACzB,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;YAC7B,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAA,CAAA;QACD,4BAA4B;QAE5B;;;WAGG;QACH,wBAAmB,GAAG,GAAG,EAAE;YACzB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,EAAE,CAAC;gBACpB,OAAO;YACT,CAAC;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACnD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS;oBAClC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;oBACnD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC;oBACnD,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC;oBACrD,CAAC;gBACH,CAAC;gBACD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,WAAW;oBACrC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;oBACpD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC;oBACnD,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC;oBACtD,CAAC;gBACH,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC;YACP,IAAI,CAAC,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC;QACnC,CAAC,CAAC;QAEF,0DAA0D;QAC1D,4BAAuB,GAAG,GAAS,EAAE;YACnC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE,CAAC;gBACnB,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;;oBAC3C,IACE,CAAA,MAAA,KAAK,CAAC,oBAAoB,0CAAE,MAAM,MAAI,MAAA,KAAK,CAAC,kBAAkB,0CAAE,MAAM,CAAA,IAAI,KAAK,CAAC,aAAa;wBAC7F,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB,EACxE,CAAC;wBACD,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;wBAC1B,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACnB,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACnF,CAAC;QACH,CAAC,CAAA,CAAA;QAED,uBAAkB,GAAG,CAAC,aAAmB,EAAE,SAAe,EAAE,EAAE;YAC5D,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC/B,cAAc,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAA;IAmFH,CAAC;IA9NO,iBAAiB;;YACrB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,CAAC;KAAA;IAEK,kBAAkB;;YACtB,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;KAAA;IAwID,MAAM;QACJ,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,MAAM,EACN,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,QAAQ,EACR,SAAS,EAAE,OAAO,EAAE,YAAY,EACjC,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEnC,SAAS,QAAQ,CAAC,IAAI;YACpB,OAAO,WAAW,CAAC,CAAC,CAAC,CACnB,QAAQ,CAAC,CAAC,CAAC,CACT,oBAAC,UAAU,IACT,SAAS,EAAC,aAAa,EACvB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,EAChC,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAC1B,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAC9B,MAAM,EAAE,QAAQ;gBAEhB,oBAAC,MAAM,IAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,IACrC,SAAS,CAAC,OAAO,CAAC,CACZ,CACE,CACd,CAAC,CAAC,CAAC,CACF,oBAAC,UAAU,IACT,SAAS,EAAC,aAAa,EACvB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,EAChC,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAC1B,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC;gBAE9B,oBAAC,MAAM,IAAC,IAAI,EAAE,YAAY,IAAG,SAAS,CAAC,OAAO,CAAC,CAAU,CAC9C,CACd,CACF,CAAC,CAAC,CAAC,CACF,oBAAC,MAAM,IAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,IACtC,SAAS,CAAC,OAAO,CAAC,CACZ,CACV,CAAC;QACJ,CAAC;QAED,OAAO,CACL,oBAAC,IAAI,IACH,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,EAAE,KAAK,EAAE,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,EAClD,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EACtC,KAAK,EACH;gBACE,oBAAC,KAAK,IAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;oBAChB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;oBACpB,oBAAC,MAAM,IAAC,OAAO,EAAE,IAAI,CAAC,KAAK,IAAG,SAAS,CAAC,OAAO,CAAC,CAAU;oBACzD,QAAQ,CAAC,CAAC,CAAC,CACV,oBAAC,MAAM,IAAC,OAAO,EAAE,QAAQ;wBACvB,oBAAC,aAAa,OAAG,CACV,CACV,CAAC,CAAC,CAAC,CACF,EAAE,CACH,CACK,CACP;YAGL,oBAAC,UAAU,IAAC,YAAY,EAAE,YAAY,EACpC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,IAAI,CAAC,kBAAkB,EACvC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,IAAI,GACd,CACG,CACR,CAAC;IACJ,CAAC;;AAzOM,2BAAY,GAAG;IACpB,WAAW,EAAE,IAAI;IACjB,KAAK,EAAE,EAAE,QAAQ,EAAE,oBAAoB,EAAE,SAAS,EAAE,oBAAoB,EAAE;IAC1E,WAAW,EAAE,KAAK;IAClB,YAAY,EAAE,SAAS;IACvB,QAAQ,EAAE,KAAK;IACf,YAAY,EAAE,CAAC;CAChB,AAPkB,CAOjB;AAEK,0BAAW,GAAG,aAAa,AAAhB,CAAiB;eAdhB,cAAc"}
package/lib/form/criteria-form.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"criteria-form.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAYpE,OAAO,EACW,YAAY,EAC5B,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAa3B,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,MAAM,KAAA,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;IACjE,cAAc,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IAC1E,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAID,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA8hB7C,CAAC;AAKF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"criteria-form.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAYpE,OAAO,EACW,YAAY,EAC5B,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAa3B,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,MAAM,KAAA,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;IACjE,cAAc,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IAC1E,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAID,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAgiB7C,CAAC;AAKF,eAAe,YAAY,CAAC"}
package/lib/form/criteria-form.js CHANGED
@@ -20,11 +20,16 @@ const CriteriaForm = (props) => {
20
20
  const initialValues = {};
21
21
  const searchSubmit = (data) => {
22
22
  let new_serial_number = new Date().getTime();
23
- if (doSearch && new_serial_number - serial_number > 3000) {
23
+ if (!doSearch) {
24
+ return;
25
+ }
26
+ if (new_serial_number - serial_number > 3000) {
24
27
  serial_number = new_serial_number;
25
28
  doSearch(Object.assign(Object.assign({}, data), { serial_number }));
26
29
  }
27
- doSearch && doSearch(Object.assign(Object.assign({}, data), { serial_number }));
30
+ else {
31
+ doSearch(Object.assign(Object.assign({}, data), { serial_number }));
32
+ }
28
33
  };
29
34
  // let currentDrillButton=null;
30
35
  const [currentDrillButton, setCurrentDrillButton] = useState(null);
package/lib/form/criteria-form.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"criteria-form.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"criteria-form.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "aldehyde",
3
- "version": "0.2.505",
3
+ "version": "0.2.507",
4
4
  "author": "cosmicparticle",
5
5
  "main": "lib/index.js",
6
6
  "module": "src/aldehyde/index.txs",
package/src/aldehyde/controls/action/index.tsx CHANGED
@@ -109,35 +109,27 @@ export default class Action extends React.PureComponent<
109
109
  if (!fieldConfig) {
110
110
  continue;
111
111
  }
112
- if (upperFormValue) {
113
- if (upperFormValue.getFieldValue(fieldConfig.id)) {
114
- value[fieldConfig.id] = ActionUtils.getFormRefValue(
115
- upperFormValue,
116
- fieldConfig.id
117
- );
118
- } else {
119
- if (dtmplValue) {
120
- if (dtmplValue["fieldMap"]) {
121
- value[fieldConfig.id] = dtmplValue
122
- ? dtmplValue["fieldMap"][fieldConfig.id]
123
- : undefined;
124
- } else {
125
- value[fieldConfig.id] = dtmplValue
126
- ? dtmplValue[fieldConfig.id]
127
- : undefined;
128
- }
129
- }
130
- }
112
+ if (upperFormValue && upperFormValue.getFieldValue(fieldConfig.id)) {
113
+ value[fieldConfig.id] = ActionUtils.getFormRefValue(
114
+ upperFormValue,
115
+ fieldConfig.id
116
+ );
131
117
  } else {
132
118
  if (dtmplValue) {
133
- if (dtmplValue["fieldMap"]) {
134
- value[fieldConfig.id] = dtmplValue
135
- ? dtmplValue["fieldMap"][fieldConfig.id]
136
- : undefined;
137
- } else {
138
- value[fieldConfig.id] = dtmplValue
139
- ? dtmplValue[fieldConfig.id]
140
- : undefined;
119
+ const { requiredRuleCriteria, usableRuleCriteria, relValueField, relValueField3, relMinValueField, relMaxValueField } = fieldConfig;
120
+ const temDtmplValue = dtmplValue["fieldMap"] ? dtmplValue["fieldMap"] : dtmplValue;
121
+ if (temDtmplValue) {
122
+ value[fieldConfig.id] = temDtmplValue[fieldConfig.id]; // 当前表单项
123
+ requiredRuleCriteria && requiredRuleCriteria.forEach(item => { // 处理必填关联数据
124
+ value[item.id] = temDtmplValue[item.id];
125
+ });
126
+ usableRuleCriteria && usableRuleCriteria.forEach(item => { // 处理可用关联数据
127
+ value[item.id] = temDtmplValue[item.id];
128
+ });
129
+ if (relValueField) value[relValueField.id] = temDtmplValue[relValueField.id]; // 次条件
130
+ if (relValueField3) value[relValueField3.id] = temDtmplValue[relValueField3.id]; // 三条件
131
+ if (relMinValueField) value[relMinValueField.id] = temDtmplValue[relMinValueField.id]; // 最小值
132
+ if (relMaxValueField) value[relMaxValueField.id] = temDtmplValue[relMaxValueField.id]; // 最大值
141
133
  }
142
134
  }
143
135
  }
package/src/aldehyde/detail/edit/fields-edit-card.tsx CHANGED
@@ -1,10 +1,16 @@
1
- import React ,{RefObject} from "react";
1
+ import React, { RefObject } from "react";
2
2
  import { Button, Card, FormInstance, Popconfirm, Space } from "antd";
3
3
  import { CloseOutlined } from "@ant-design/icons";
4
4
  import { FieldConfig } from "../../tmpl/interface";
5
5
  import { ButtonType } from "antd/es/button";
6
6
  import FieldsForm from "../../form/fields-form";
7
7
  import { LocaleContext } from "../../locale/LocaleProvider";
8
+ import HcserviceV3 from "../../tmpl/hcservice-v3";
9
+ import { relValueFieldExtControlType } from "../../controls/entry-control";
10
+ import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
11
+
12
+ // 缓存 getSubDtmplData 的请求结果（防止多次请求）
13
+ const subDtmplDataCache: Map<string, any> = new Map();
8
14
 
9
15
  interface FieldsEditCardProps {
10
16
  serverKey?: string;
@@ -18,11 +24,11 @@ interface FieldsEditCardProps {
18
24
  okButtonType?: ButtonType;
19
25
  okDanger?: boolean;
20
26
  needConfirm?: boolean;
21
- onValuesChange: (value: object,allValues) => void;
27
+ onValuesChange: (value: object, allValues) => void;
22
28
  formRef?: RefObject<FormInstance>;
23
29
  }
24
30
 
25
- interface FieldsEditCardState {}
31
+ interface FieldsEditCardState { }
26
32
 
27
33
  export default class FieldsEditCard extends React.PureComponent<
28
34
  FieldsEditCardProps,
@@ -35,13 +41,15 @@ export default class FieldsEditCard extends React.PureComponent<
35
41
  needConfirm: false,
36
42
  okButtonType: "primary",
37
43
  okDanger: false,
38
- maxColsOnRow:2,
44
+ maxColsOnRow: 2,
39
45
  };
40
46
  state = {};
41
47
  static contextType = LocaleContext;
42
48
  context: React.ContextType<typeof LocaleContext>;
43
49
 
44
- async componentDidMount() {}
50
+ async componentDidMount() {
51
+ this.handleBuildInFuncFields();
52
+ }
45
53
 
46
54
  async componentDidUpdate() {
47
55
  this.reset();
@@ -57,12 +65,133 @@ export default class FieldsEditCard extends React.PureComponent<
57
65
  this.props.formRef.current.submit();
58
66
  };
59
67
 
68
+ // 表单关联项secondCriterion处理start
69
+ getSubDtmplData = async (valueField, code) => {
70
+ const { serverKey } = this.props;
71
+ let dtmplData = null;
72
+ const cacheKey = `${valueField.extRefPageId || valueField.id}_${code.split("@R@")[0]}`; //缓存Key
73
+ const cacheData = subDtmplDataCache.get(cacheKey);
74
+ if (cacheData !== undefined) { // 存在缓存使用缓存，减少请求次数
75
+ dtmplData = cacheData;
76
+ } else {
77
+ if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
78
+ const { entities } = await HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] }) || {};
79
+ dtmplData = entities?.[0];
80
+ } else { // 查询字段指向页面的数据
81
+ dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
82
+ }
83
+ subDtmplDataCache.set(cacheKey, dtmplData || false);
84
+ }
85
+ if (!dtmplData) return null;
86
+ const subField = valueField.subRelValueField;
87
+ const subData = dtmplData.fieldMap[subField.id];
88
+ if (subField.subRelValueField && subData) { // 存在下级关联项
89
+ return this.getSubDtmplData(subField, subData);
90
+ }
91
+ return subData;
92
+ }
93
+
94
+ getSecondCriteria = async (field) => {
95
+ const { formRef, value } = this.props;
96
+ const { relValueField, relValueField3, baseCriteria = {}, relMinValueField, relMaxValueField } = field;
97
+ const temForm = formRef.current;
98
+ if (relValueField && temForm) { // 设置默认值或查询次条件
99
+ let relValueData = temForm.getFieldValue(relValueField.id) || value[relValueField.id];
100
+ if (relValueField.subRelValueField && relValueData) {
101
+ relValueData = await this.getSubDtmplData(relValueField, relValueData);
102
+ }
103
+ if (!relValueFieldExtControlType.includes(field.extControlType)) {
104
+ field.defaultValue = relValueData; // 非关系型字段填充默认值
105
+ } else {
106
+ field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
107
+ }
108
+ field.configChanged = true;
109
+ }
110
+ if (relValueField3 && temForm) { // 设置查询三条件
111
+ let relValueData = temForm.getFieldValue(relValueField3.id) || value[relValueField3.id];
112
+ if (relValueField3.subRelValueField && relValueData) {
113
+ relValueData = await this.getSubDtmplData(relValueField3, relValueData);
114
+ }
115
+ field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriterion": relValueData };
116
+ field.configChanged = true;
117
+ }
118
+ if (relMinValueField && temForm) { // 设置最小值
119
+ let relValueData = temForm.getFieldValue(relMinValueField.id) || value[relMinValueField.id];
120
+ if (relMinValueField.subRelValueField && relValueData) {
121
+ relValueData = await this.getSubDtmplData(relMinValueField, relValueData);
122
+ }
123
+ field.min = relValueData;
124
+ field.configChanged = true;
125
+ }
126
+ if (relMaxValueField && temForm) { // 设置最大值
127
+ let relValueData = temForm.getFieldValue(relMaxValueField.id) || value[relMaxValueField.id];
128
+ if (relMaxValueField.subRelValueField && relValueData) {
129
+ relValueData = await this.getSubDtmplData(relMaxValueField, relValueData);
130
+ }
131
+ field.max = relValueData;
132
+ field.configChanged = true;
133
+ }
134
+ return field;
135
+ }
136
+ // 表单关联项secondCriterion处理end
137
+
138
+ /**
139
+ * 处理表单关联项
140
+ * 匹配关联项的字段，实现值更新关联字段值变化
141
+ */
142
+ handleRelValueField = () => {
143
+ const { fields } = this.props;
144
+ if (!fields?.length) {
145
+ return;
146
+ }
147
+ const valueFieldMap = fields.reduce((total, field) => {
148
+ if (field.relValueField) { // 关联取值字段
149
+ const temArr = total[field.relValueField.id] || [];
150
+ const isItem = temArr.find(r => r.id === field.id);
151
+ if (!isItem) {
152
+ total[field.relValueField.id] = [...temArr, field];
153
+ }
154
+ }
155
+ if (field.relValueField3) { // 关联取值字段扩1
156
+ const temArr = total[field.relValueField3.id] || [];
157
+ const isItem = temArr.find(r => r.id === field.id);
158
+ if (!isItem) {
159
+ total[field.relValueField3.id] = [...temArr, field];
160
+ }
161
+ }
162
+ return total;
163
+ }, {});
164
+ this.setState({ valueFieldMap });
165
+ };
166
+
167
+ //关联取值:根据 parentFormInstance / this.formRef 完善 dtmplConfig
168
+ handleBuildInFuncFields = async () => {
169
+ const { fields } = this.props;
170
+ if (fields?.length) {
171
+ const buildInFuncFields = fields.map(field => {
172
+ if (
173
+ field.requiredRuleCriteria?.length || field.usableRuleCriteria?.length || field.relValueField ||
174
+ field.relValueField3 || field.relMinValueField || field.relMaxValueField
175
+ ) {
176
+ field.shouldUpdate = true;
177
+ return field;
178
+ }
179
+ return false;
180
+ }).filter(Boolean);
181
+ await Promise.all(buildInFuncFields.map(field => this.getSecondCriteria(field)));
182
+ }
183
+ }
184
+
185
+ handleValuesChange = (changedValues?: any, allValues?: any) => {
186
+ const { onValuesChange } = this.props;
187
+ this.handleBuildInFuncFields();
188
+ onValuesChange(changedValues, allValues);
189
+ }
60
190
 
61
191
 
62
192
  render() {
63
193
  const {
64
194
  title,
65
- height,
66
195
  onOk,
67
196
  fields,
68
197
  value,
@@ -70,10 +199,8 @@ export default class FieldsEditCard extends React.PureComponent<
70
199
  okButtonType,
71
200
  needConfirm,
72
201
  okDanger,
73
- onValuesChange,
74
- serverKey,formRef,maxColsOnRow
202
+ serverKey, formRef, maxColsOnRow
75
203
  } = this.props;
76
- const {} = this.state;
77
204
  const { translate } = this.context;
78
205
 
79
206
  function okButton(onOk) {
@@ -112,9 +239,9 @@ export default class FieldsEditCard extends React.PureComponent<
112
239
  return (
113
240
  <Card
114
241
  size={"small"}
115
- style={{width: maxColsOnRow===1? 500:10000 }}
242
+ style={{ width: maxColsOnRow === 1 ? 500 : 10000 }}
116
243
  title={title}
117
- styles={{body:{ overflow: "auto" }}}
244
+ styles={{ body: { overflow: "auto" } }}
118
245
  extra={
119
246
  <>
120
247
  <Space size={[8, 0]}>
@@ -133,12 +260,12 @@ export default class FieldsEditCard extends React.PureComponent<
133
260
  >
134
261
  <FieldsForm maxColsOnRow={maxColsOnRow}
135
262
  serverKey={serverKey}
136
- onValuesChange={onValuesChange}
263
+ onValuesChange={this.handleValuesChange}
137
264
  fields={fields}
138
265
  formRef={formRef}
139
266
  value={value}
140
267
  onFinish={onOk}
141
- ></FieldsForm>
268
+ />
142
269
  </Card>
143
270
  );
144
271
  }
package/src/aldehyde/form/criteria-form.tsx CHANGED
@@ -96,13 +96,15 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
96
96
  const initialValues = {};
97
97
  const searchSubmit = (data) => {
98
98
  let new_serial_number = new Date().getTime();
99
-
100
- if (doSearch && new_serial_number - serial_number > 3000) {
99
+ if (!doSearch) {
100
+ return;
101
+ }
102
+ if (new_serial_number - serial_number > 3000) {
101
103
  serial_number = new_serial_number;
102
104
  doSearch({ ...data, serial_number });
105
+ } else {
106
+ doSearch({ ...data, serial_number });
103
107
  }
104
-
105
- doSearch && doSearch({ ...data, serial_number });
106
108
  };
107
109
  // let currentDrillButton=null;
108
110
  const [currentDrillButton, setCurrentDrillButton] = useState(null);