aldehyde 0.2.237 → 0.2.239

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 (60) hide show
  1. package/lib/form/form-Item-group.d.ts.map +1 -1
  2. package/lib/form/form-Item-group.js +0 -1
  3. package/lib/form/form-Item-group.js.map +1 -1
  4. package/lib/hooks/use-tabs/index.js +3 -3
  5. package/lib/hooks/use-tabs/index.js.map +1 -1
  6. package/lib/layout2/components/userButton.d.ts.map +1 -1
  7. package/lib/layout2/components/userButton.js +5 -0
  8. package/lib/layout2/components/userButton.js.map +1 -1
  9. package/lib/login2/login.d.ts.map +1 -1
  10. package/lib/login2/login.js +5 -0
  11. package/lib/login2/login.js.map +1 -1
  12. package/lib/routable/dtmpl-route.d.ts.map +1 -1
  13. package/lib/routable/dtmpl-route.js +2 -2
  14. package/lib/routable/dtmpl-route.js.map +1 -1
  15. package/lib/routable/import-route.d.ts.map +1 -1
  16. package/lib/routable/import-route.js +1 -1
  17. package/lib/routable/import-route.js.map +1 -1
  18. package/lib/routable/ltmpl-route.d.ts.map +1 -1
  19. package/lib/routable/ltmpl-route.js +1 -1
  20. package/lib/routable/ltmpl-route.js.map +1 -1
  21. package/lib/routable/ttmpl-route.d.ts.map +1 -1
  22. package/lib/routable/ttmpl-route.js +1 -1
  23. package/lib/routable/ttmpl-route.js.map +1 -1
  24. package/lib/table/act-table.d.ts +7 -1
  25. package/lib/table/act-table.d.ts.map +1 -1
  26. package/lib/table/act-table.js +29 -13
  27. package/lib/table/act-table.js.map +1 -1
  28. package/lib/table/pagination.js +1 -1
  29. package/lib/table/pagination.js.map +1 -1
  30. package/lib/table/query-table.js +11 -13
  31. package/lib/table/query-table.js.map +1 -1
  32. package/lib/table/report-table.d.ts.map +1 -1
  33. package/lib/table/report-table.js +4 -2
  34. package/lib/table/report-table.js.map +1 -1
  35. package/lib/table/select-table.d.ts.map +1 -1
  36. package/lib/table/select-table.js +3 -3
  37. package/lib/table/select-table.js.map +1 -1
  38. package/lib/tmpl/interface.d.ts +1 -0
  39. package/lib/tmpl/interface.d.ts.map +1 -1
  40. package/lib/tmpl/interface.js.map +1 -1
  41. package/lib/units/index.d.ts +1 -0
  42. package/lib/units/index.d.ts.map +1 -1
  43. package/lib/units/index.js +3 -0
  44. package/lib/units/index.js.map +1 -1
  45. package/package.json +1 -1
  46. package/src/aldehyde/form/form-Item-group.tsx +0 -1
  47. package/src/aldehyde/hooks/use-tabs/index.tsx +3 -3
  48. package/src/aldehyde/layout2/components/userButton.tsx +6 -2
  49. package/src/aldehyde/login2/login.tsx +6 -1
  50. package/src/aldehyde/routable/dtmpl-route.tsx +3 -2
  51. package/src/aldehyde/routable/import-route.tsx +2 -1
  52. package/src/aldehyde/routable/ltmpl-route.tsx +2 -1
  53. package/src/aldehyde/routable/ttmpl-route.tsx +2 -1
  54. package/src/aldehyde/table/act-table.tsx +37 -13
  55. package/src/aldehyde/table/pagination.tsx +1 -1
  56. package/src/aldehyde/table/query-table.tsx +13 -13
  57. package/src/aldehyde/table/report-table.tsx +9 -7
  58. package/src/aldehyde/table/select-table.tsx +4 -3
  59. package/src/aldehyde/tmpl/interface.tsx +1 -0
  60. package/src/aldehyde/units/index.tsx +3 -0
@@ -1 +1 @@
1
- {"version":3,"file":"form-Item-group.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAC,MAAM,CAAC;CAClB;AAED,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAAa,CAC5D,eAAe,EACf,eAAe,CAChB;IACC,MAAM,CAAC,YAAY;;;MAGjB;IACF,MAAM,CAAC,WAAW;;;;;;;YAtBC,GAAG;oBAGtB,GAAA;;OAmBmC;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;gBAErC,KAAK,KAAA;IAOjB,SAAS,GAAI,QAAG,aAMd;IAEF,WAAW,GAAI,MAAM,WAAW,EAAE,aAAQ,SAYxC;IAEF,cAAc,GAAI,MAAM,WAAW,iBAUjC;IACF,YAAY,GAAI,aAAa,WAAW,EAAE,eAAU,uBAwDlD;IAEF,YAAY,0BA6EV;IAEF,MAAM;CAGP"}
1
+ {"version":3,"file":"form-Item-group.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAC,MAAM,CAAC;CAClB;AAED,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAAa,CAC5D,eAAe,EACf,eAAe,CAChB;IACC,MAAM,CAAC,YAAY;;;MAGjB;IACF,MAAM,CAAC,WAAW;;;;;;;YAtBC,GAAG;oBAGtB,GAAA;;OAmBmC;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;gBAErC,KAAK,KAAA;IAOjB,SAAS,GAAI,QAAG,aAMd;IAEF,WAAW,GAAI,MAAM,WAAW,EAAE,aAAQ,SAYxC;IAEF,cAAc,GAAI,MAAM,WAAW,iBAUjC;IACF,YAAY,GAAI,aAAa,WAAW,EAAE,eAAU,uBAuDlD;IAEF,YAAY,0BA6EV;IAEF,MAAM;CAGP"}
@@ -60,7 +60,6 @@ class FormItemGroup extends React.PureComponent {
60
60
  }
61
61
  return rules;
62
62
  };
63
- debugger;
64
63
  return (React.createElement(FormItem, { label: translate("${" + item.title + "}"), hidden: item.hidden, name: fieldConfig.controlType == "field-history" ? undefined : item[nameAttr], key: item.id, labelCol: maxColsOnRow == 1
65
64
  ? { span: 6 }
66
65
  : item.colSpan == 1
@@ -1 +1 @@
1
- {"version":3,"file":"form-Item-group.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEtC,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,MAAM,UAAU,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,oBAAoB,MAAM,gCAAgC,CAAC;AAElE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;AAkB3B,MAAqB,aAAc,SAAQ,KAAK,CAAC,aAGhD;IAQC,YAAY,KAAK;QACf,KAAK,CAAC,KAAK,CAAC,CAAC;QAMf,cAAS,GAAG,CAAC,GAAG,EAAE,EAAE;YAClB,OAAO,CACL,CAAC,CAAC,GAAG,IAAI,4CAA4C;gBACrD,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,UAAU,CAAC,IAAI,8BAA8B;gBACxF,OAAO,GAAG,CAAC,IAAI,KAAK,UAAU,CAC/B,CAAC;QACJ,CAAC,CAAC;QAEF,gBAAW,GAAG,CAAC,IAAiB,EAAE,QAAQ,EAAE,EAAE;YAC5C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC/B,0BAA0B;YAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,IAAI,OAAO,IAAI,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAC;gBACvC,4CAA4C;gBAC5C,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,QAAQ,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;QAEF,mBAAc,GAAG,CAAC,IAAiB,EAAE,EAAE;YACrC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC/B,IAAI,WAAW,GAAG,IAAI,CAAC;YACvB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG,IAAI,CAAC;YACrB,CAAC;YACD,UAAU;YACV,OAAO,WAAW,CAAC;QACrB,CAAC,CAAC;QACF,iBAAY,GAAG,CAAC,WAAwB,EAAE,UAAU,EAAE,EAAE;YACtD,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5E,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;YACnC,IAAI,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAEzB,MAAM,QAAQ,GAAC,CAAC,IAAI,EAAC,EAAE;;gBACrB,IAAI,KAAK,GAAC,EAAE,CAAC;gBACb,IAAI,CAAC,QAAQ,CAAA,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACxB,QAAQ,EAAE,IAAI;oBACd,OAAO,EAAE,SAAS,CAAC,UAAU,GAAG,KAAK,GAAG,GAAG,CAAC;iBAC7C,CAAC,CAAA,CAAC,CAAA,IAAI,CAAC;gBACR,IAAI,WAAW,GAAC,MAAA,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC;gBACvC,IAAG,WAAW,EAAC,CAAC;oBACd,KAAK,CAAC,IAAI,CAAC;wBACT,OAAO,EAAC,WAAW;wBACnB,OAAO,EAAC,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,UAAU,CAAC;qBAC7C,CAAC,CAAA;gBACJ,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAA;YACD,QAAQ,CAAA;YACR,OAAO,CACL,oBAAC,QAAQ,IACP,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,EACzC,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,IAAI,EAAE,WAAW,CAAC,WAAW,IAAE,eAAe,CAAC,CAAC,CAAA,SAAS,CAAA,CAAC,CAAA,IAAI,CAAC,QAAQ,CAAC,EACxE,GAAG,EAAE,IAAI,CAAC,EAAE,EACZ,QAAQ,EACN,YAAY,IAAI,CAAC;oBACf,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE;oBACb,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;wBACnB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE;wBACb,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAEjB,UAAU,EACR,YAAY,IAAI,CAAC;oBACf,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;oBACd,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;wBACnB,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;wBACd,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAGlB,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,IAAE,EAAE,CAAC,CAAA,CAAC,CAAA,SAAS,CAAA,CAAC,CAAA,IAAI,CAAC,GAAG,EACvD,YAAY,EAAE,UAAU,EACxB,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EACpB,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC;gBAErB,oBAAC,YAAY,IAAC,QAAQ,EAAE,QAAQ,EAC9B,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,EAC1C,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,IAAI,GACjB,CACO,CACZ,CAAC;QACJ,CAAC,CAAC;QAEF,iBAAY,GAAG,GAAG,EAAE;YAClB,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,SAAS,GACV,GAAG,IAAI,CAAC,KAAK,CAAC;YACf,MAAM,YAAY,GAAG,EAAE,CAAC;YAExB,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;oBAC7B,IAAI,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBAC1D,iDAAiD;oBACjD,UAAU;wBACR,UAAU,IAAI,UAAU,IAAI,CAAC;4BAC3B,CAAC,CAAC,UAAU;4BACZ,CAAC,CAAC,IAAI,CAAC,YAAY;gCACnB,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,EAAC,oBAAoB,CAAC,cAAc,CAAC,IAAI,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gCACvG,CAAC,CAAC,SAAS,CAAC;oBAChB,IAAI,QAAQ,GAAG,IAAI,CAAC;oBACpB,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ,EAAE,CAAC;wBACpC,QAAQ,GAAG,CACT,oBAAC,QAAQ,IACP,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,UAAU,EACxB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,EACpB,GAAG,EAAE,IAAI,CAAC,EAAE;4BAEZ,oBAAC,YAAY,IACX,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,EAC1C,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,IAAI,GACjB,CACO,CACZ,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACP,YAAY;wBACX,4DAA4D;wBAC5D,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAC7B,oBAAC,QAAQ,IAAC,OAAO,QAAC,YAAY,EAAE,IAAI,CAAC,YAAY,IAC9C,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,CACjC,CACZ,CAAC,CAAC,CAAC,CACF,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,CACpC,CAAC;oBACJ,CAAC;oBACD,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,OAAO,GAAG,EAAE,CAAC;YAEnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnD,IAAI,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gBAEhC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,IAAI,QAAQ,EAAE,CAAC;oBACzC,OAAO,GAAG,CAAC,CAAC;gBACd,CAAC;qBAAM,IAAI,YAAY,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;oBAC7C,OAAO,GAAG,CAAC,CAAC;gBACd,CAAC;gBACD,IAAI,GAAG,GAAG,CACR,oBAAC,GAAG,IAAC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,IAC5B,YAAY,CAAC,CAAC,CAAC,CACZ,CACP,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;YAED,MAAM,GAAG,GAAG,CACV,oBAAC,GAAG,IAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,IACzB,OAAO,CACJ,CACP,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;QA7KA,IAAI,CAAC,KAAK,GAAG;YACX,QAAQ,EAAE,EAAE;SACb,CAAC;IACJ,CAAC;IA4KD,MAAM;QACJ,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;;AA1LM,0BAAY,GAAG;IACpB,QAAQ,EAAE,IAAI;IACd,YAAY,EAAE,CAAC;CAChB,AAHkB,CAGjB;AACK,yBAAW,GAAG,aAAa,AAAhB,CAAiB;eARhB,aAAa"}
1
+ {"version":3,"file":"form-Item-group.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"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"}
@@ -66,7 +66,7 @@ export function useTabs() {
66
66
  if (!existKeepAliveTab) {
67
67
  setKeepAliveTabs([...(keepAliveTabs || []), {
68
68
  title: matchRoute.title,
69
- key: getKey(),
69
+ key: matchRoute.routePath,
70
70
  routePath: matchRoute.routePath,
71
71
  pathname: matchRoute.pathname,
72
72
  children: matchRoute.children,
@@ -79,7 +79,7 @@ export function useTabs() {
79
79
  setKeepAliveTabs(prev => {
80
80
  const index = (prev || []).findIndex(tab => tab.routePath === matchRoute.routePath);
81
81
  if (index >= 0 && prev) {
82
- prev[index].key = getKey();
82
+ prev[index].key = matchRoute.routePath;
83
83
  prev[index].pathname = matchRoute.pathname;
84
84
  prev[index].children = matchRoute.children;
85
85
  // prev[index].searchParmStr=matchRoute.searchParmStr ||""
@@ -92,7 +92,7 @@ export function useTabs() {
92
92
  setKeepAliveTabs(prev => {
93
93
  const index = (prev || []).findIndex(tab => tab.routePath === matchRoute.routePath);
94
94
  if (index >= 0 && prev) {
95
- prev[index].key = getKey();
95
+ prev[index].key = matchRoute.routePath;
96
96
  prev[index].children = matchRoute.children;
97
97
  }
98
98
  return [...(prev || [])];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/hooks/use-tabs/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/hooks/use-tabs/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,qCAAqC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAc,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAY7C,SAAS,MAAM;IACb,OAAO,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,OAAO;IACrB,SAAS;IACT,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,sBAAsB,CAAiB,eAAe,EAAE;QAChG,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,KAAK,CAAC,EAAE;YAClB,uBAAuB;YACvB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;QACpE,CAAC;KACD,CAAC,CAAC;IACJ,WAAW;IACX,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,IAAI,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC7B,QAAQ;IACR,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,YAAoB,kBAAkB,IAAI,EAAE,EAAE,EAAE;QAC/C,IAAI,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;QAC9E,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,SAAS,KAAK,kBAAkB,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtF,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACd,QAAQ,CAAC,aAAa,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,aAAa,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QACD,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC/B,gBAAgB,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;IACvC,CAAC,EACD,CAAC,kBAAkB,CAAC,CACrB,CAAC;IAEF,cAAc;IACd,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,YAAoB,kBAAkB,IAAI,EAAE,EAAE,EAAE;QACjF,IAAI,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;QAC/D,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC;QACvE,8CAA8C;IAChD,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,QAAQ;IACR,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,YAAoB,kBAAkB,IAAI,EAAE,EAAE,EAAE;QAE9E,6BAA6B;QAC7B,6EAA6E;QAC7E,EAAE;QACF,8BAA8B;QAC9B,qCAAqC;QACrC,kCAAkC;QAClC,MAAM;QACN,4BAA4B;QAC5B,MAAM;IACR,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,iBAAiB,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,CAAA,CAAC,CAAC;QAEjG,aAAa;QACb,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,gBAAgB,CAAC,CAAC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE;oBAC1C,KAAK,EAAE,UAAU,CAAC,KAAK;oBACvB,GAAG,EAAE,UAAU,CAAC,SAAS;oBACzB,SAAS,EAAE,UAAU,CAAC,SAAS;oBAC/B,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,6CAA6C;iBAC9C,CAAC,CAAC,CAAC;QACN,CAAC;aAAM,IAAI,iBAAiB,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC9D,6EAA6E;YAC7E,gBAAgB,CAAC,IAAI,CAAC,EAAE;gBACtB,MAAM,KAAK,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,UAAU,CAAC,SAAS,CAAC,CAAC;gBACpF,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;oBACvB,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC;oBACvC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAC3C,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAC3C,0DAA0D;gBAC5D,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YACvC,4EAA4E;YAC5E,gBAAgB,CAAC,IAAI,CAAC,EAAE;gBACtB,MAAM,KAAK,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,UAAU,CAAC,SAAS,CAAC,CAAC;gBACpF,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;oBACvB,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC;oBACvC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;gBAC7C,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC;QACD,qBAAqB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,kBAAkB;QAClB,QAAQ;QACR,aAAa;QACb,UAAU;QACV,OAAO,EAAE,gBAAgB;KAC1B,CAAA;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"userButton.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAU9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;AAiBzE,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA0JrC,CAAC;AAEF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"userButton.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAU9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;AAkBzE,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA6JrC,CAAC;AAEF,eAAe,UAAU,CAAC"}
@@ -16,9 +16,13 @@ import { useLocale } from "../../locale/useLocale";
16
16
  import { NavLink, useNavigate } from "react-router-dom";
17
17
  import ResetPassword from "../../layout/menu/reset-password";
18
18
  import HCDataSource from "../../tmpl/hc-data-source";
19
+ import { useSessionStorageState } from 'ahooks';
19
20
  const UserButton = (props) => {
20
21
  // translate
21
22
  const { translate, changeSiderCollapsed, getSiderCollapsed } = useLocale();
23
+ const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState('keepAliveTabs', {
24
+ defaultValue: [],
25
+ });
22
26
  // navigation
23
27
  const navigate = useNavigate();
24
28
  // 用户配置信息
@@ -53,6 +57,7 @@ const UserButton = (props) => {
53
57
  }, []);
54
58
  // logout
55
59
  const logout = () => __awaiter(void 0, void 0, void 0, function* () {
60
+ setKeepAliveTabs([]);
56
61
  yield HcserviceV3.logout2();
57
62
  navigate("/login2");
58
63
  });
@@ -1 +1 @@
1
- {"version":3,"file":"userButton.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"userButton.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/login.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAOnD,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,QAAA,MAAM,KAAK,GAAI,OAAO,aAAa,sBAmLlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/login.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAQnD,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,QAAA,MAAM,KAAK,GAAI,OAAO,aAAa,sBAuLlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
@@ -14,9 +14,13 @@ import { useLocale } from "../locale/useLocale";
14
14
  import { useParams } from "react-router-dom";
15
15
  import Units from "../units";
16
16
  import { SafetyCertificateOutlined } from "@ant-design/icons";
17
+ import { useSessionStorageState } from 'ahooks';
17
18
  const Login = (props) => {
18
19
  // locale
19
20
  const { translate } = useLocale();
21
+ const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState('keepAliveTabs', {
22
+ defaultValue: [],
23
+ });
20
24
  useEffect(() => {
21
25
  localStorage.setItem("version", "v2");
22
26
  }, []);
@@ -33,6 +37,7 @@ const Login = (props) => {
33
37
  // form
34
38
  const [form] = Form.useForm();
35
39
  const submit = () => __awaiter(void 0, void 0, void 0, function* () {
40
+ setKeepAliveTabs([]);
36
41
  try {
37
42
  const { username, password, kaptchaText } = yield form.validateFields();
38
43
  setLoading(true);
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/login.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/login.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"dtmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAOhE,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;AAsJD,wBAAsC"}
1
+ {"version":3,"file":"dtmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAQhE,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;AAsJD,wBAAsC"}
@@ -122,10 +122,10 @@ class DtmplRoute extends React.Component {
122
122
  // let params=Units.transQueryStrToParams(location.search);
123
123
  let versionId = params["versionId"];
124
124
  if (location.pathname.endsWith("detail-view")) {
125
- return (React.createElement(TabActDtmplView, { serverKey: null, goBackToLtmpl: codeSource ? undefined : this.goBackToLtmpl, goDtmpl: this.goDtmpl, sourceId: sourceId, versionId: versionId, code: code, mainCode: this.getMainCode() }));
125
+ return (React.createElement(TabActDtmplView, { key: sourceId + code + versionId, serverKey: null, goBackToLtmpl: codeSource ? undefined : this.goBackToLtmpl, goDtmpl: this.goDtmpl, sourceId: sourceId, versionId: versionId, code: code, mainCode: this.getMainCode() }));
126
126
  }
127
127
  else {
128
- return (React.createElement(DtmplEdit, { addTmplId: searchParams.get("addTmplId"), serverKey: null, addOrUpdate: this.getMode(), sourceId: sourceId, code: code, mainCode: this.getMainCode(), goBackToLtmpl: codeSource ? undefined : this.goBackToLtmpl, goDtmpl: this.goDtmpl }));
128
+ return (React.createElement(DtmplEdit, { key: sourceId + code + versionId, addTmplId: searchParams.get("addTmplId"), serverKey: null, addOrUpdate: this.getMode(), sourceId: sourceId, code: code, mainCode: this.getMainCode(), goBackToLtmpl: codeSource ? undefined : this.goBackToLtmpl, goDtmpl: this.goDtmpl }));
129
129
  }
130
130
  }
131
131
  }
@@ -1 +1 @@
1
- {"version":3,"file":"dtmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dtmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"import-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/import-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;;AAyBD,wBAA4C"}
1
+ {"version":3,"file":"import-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/import-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAKpD,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;;AAyBD,wBAA4C"}
@@ -27,7 +27,7 @@ class ExcelImportRoute extends React.PureComponent {
27
27
  render() {
28
28
  const { params, serverKey } = this.props;
29
29
  const { sourceId } = params;
30
- return (React.createElement(ExcelImport, { serverKey: serverKey, sourceId: sourceId }));
30
+ return (React.createElement(ExcelImport, { key: sourceId, serverKey: serverKey, sourceId: sourceId }));
31
31
  }
32
32
  }
33
33
  export default withRouter(ExcelImportRoute);
@@ -1 +1 @@
1
- {"version":3,"file":"import-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/import-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,UAAU,MAAM,aAAa,CAAC;AAQrC,MAAM,gBAAiB,SAAQ,KAAK,CAAC,aAGpC;IAHD;;QAIE,UAAK,GAAG,EAAE,CAAC;IAiBb,CAAC;IAfO,iBAAiB;8DAAI,CAAC;KAAA;IAE5B,IAAI,kBAAkB;QACpB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,IAAI,cAAc,KAAK,SAAS;YAAE,OAAO,IAAI,cAAc,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM;QACJ,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAC5B,OAAO,CACL,oBAAC,WAAW,IAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAgB,CACtE,CAAC;IACJ,CAAC;CACF;AACD,eAAe,UAAU,CAAC,gBAAgB,CAAC,CAAC"}
1
+ {"version":3,"file":"import-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/import-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,UAAU,MAAM,aAAa,CAAC;AASrC,MAAM,gBAAiB,SAAQ,KAAK,CAAC,aAGpC;IAHD;;QAIE,UAAK,GAAG,EAAE,CAAC;IAiBb,CAAC;IAfO,iBAAiB;8DAAI,CAAC;KAAA;IAE5B,IAAI,kBAAkB;QACpB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,IAAI,cAAc,KAAK,SAAS;YAAE,OAAO,IAAI,cAAc,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM;QACJ,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAC5B,OAAO,CACL,oBAAC,WAAW,IAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAgB,CACrF,CAAC;IACJ,CAAC;CACF;AACD,eAAe,UAAU,CAAC,gBAAgB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,EAGH,cAAc,EACd,eAAe,EAElB,MAAM,mBAAmB,CAAC;AAe3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAC,QAAQ,GAAC,QAAQ,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC5B,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;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;;AA+YD,wBAAsC"}
1
+ {"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,EAGH,cAAc,EACd,eAAe,EAElB,MAAM,mBAAmB,CAAC;AAe3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAC,QAAQ,GAAC,QAAQ,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC5B,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;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;;AAgZD,wBAAsC"}
@@ -271,7 +271,7 @@ class LtmplRoute extends React.PureComponent {
271
271
  }
272
272
  else {
273
273
  return (React.createElement(React.Fragment, null,
274
- React.createElement(ActTable, { tableType: tableType, serverKey: null, pageSize: pageSize, pageNo: pageNo, onChangePage: this.onChangePage, menuId: this.getMenuId(), operatable: rowOperatable, mainCode: mainCode, showView: this.showView, doSearch: this.onChangeSearch, doEdit: this.doEdit, doCreate: this.doCreate, sourceId: sourceId, criteriaData: criteriaData, ltmplConfig: ltmplConfig, doRAction: this.doRAction }),
274
+ React.createElement(ActTable, { key: sourceId, tableType: tableType, serverKey: null, pageSize: pageSize, pageNo: pageNo, onChangePage: this.onChangePage, menuId: this.getMenuId(), operatable: rowOperatable, mainCode: mainCode, showView: this.showView, doSearch: this.onChangeSearch, doEdit: this.doEdit, doCreate: this.doCreate, sourceId: sourceId, criteriaData: criteriaData, ltmplConfig: ltmplConfig, doRAction: this.doRAction }),
275
275
  showDraw ? (React.createElement(Drawer, { placement: "left", title: translate("${关联查询}"), closable: true, mask: false, onClose: this.doClose, open: showDraw, width: "calc(100% - 280px)", style: {
276
276
  maxWidth: 1960,
277
277
  }, extra: React.createElement(Space, null,
@@ -1 +1 @@
1
- {"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ttmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ttmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAGL,eAAe,EACf,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAM3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAC,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;;AA4ED,wBAAsC"}
1
+ {"version":3,"file":"ttmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ttmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAGL,eAAe,EACf,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAO3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAC,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;;AA4ED,wBAAsC"}
@@ -72,7 +72,7 @@ class TtmplRoute extends React.PureComponent {
72
72
  }
73
73
  else {
74
74
  return (React.createElement(React.Fragment, null,
75
- React.createElement(ActTree, { top: treeTop, ttmplConfig: ttmplConfig })));
75
+ React.createElement(ActTree, { key: ttmplConfig.sourceId, top: treeTop, ttmplConfig: ttmplConfig })));
76
76
  }
77
77
  }
78
78
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ttmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ttmpl-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAU5B,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QAIE,UAAK,GAAG;YACN,WAAW,EAAE,SAAS;SACvB,CAAC;QAYF,YAAO,GAAG,CAAC,IAAI,EAAE,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,cAAS,GAAG,GAAG,EAAE;YACf,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAS,EAAE;YACpB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;YAC5B,IAAI,WAAW,GAAgB,MAAM,YAAY,CAAC,kBAAkB,CAClE,IAAI,EACJ,QAAQ,CACT,CAAC;YACF,YAAY;YACZ,IAAI,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CACjB,GAAG,IAAI,CAAC,kBAAkB,IAAI,WAAW,CAAC,EAAE,YAAY,CACzD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC;oBACZ,WAAW,oBAAO,WAAW,CAAE;iBAChC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAA,CAAC;IA2BJ,CAAC;IAhEO,iBAAiB;;YACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,CAAC;KAAA;IAED,IAAI,kBAAkB;QACpB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,IAAI,cAAc,KAAK,SAAS;YAAE,OAAO,IAAI,cAAc,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IA+BK,kBAAkB,CAAC,SAAS;;YAChC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACxC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;YAC5B,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;YACjD,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;YAE1C,IAAI,QAAQ,IAAI,WAAW,IAAI,QAAQ,IAAI,WAAW,EAAE,CAAC;gBACvD,OAAO;YACT,CAAC;YACD,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC;KAAA;IAED,MAAM;QACJ,MAAM,EAAC,OAAO,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACnC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,oBAAC,IAAI,IAAC,OAAO,EAAE,IAAI,GAAS,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,OAAO,CACL;gBACE,oBAAC,OAAO,IAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,GAAY,CAC1D,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;;AAtEM,uBAAY,GAAG;IACpB,QAAQ,EAAE,EAAE;CACb,AAFkB,CAEjB;AAuEJ,eAAe,UAAU,CAAC,UAAU,CAAC,CAAC"}
1
+ {"version":3,"file":"ttmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ttmpl-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAW5B,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QAIE,UAAK,GAAG;YACN,WAAW,EAAE,SAAS;SACvB,CAAC;QAYF,YAAO,GAAG,CAAC,IAAI,EAAE,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,cAAS,GAAG,GAAG,EAAE;YACf,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAS,EAAE;YACpB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;YAC5B,IAAI,WAAW,GAAgB,MAAM,YAAY,CAAC,kBAAkB,CAClE,IAAI,EACJ,QAAQ,CACT,CAAC;YACF,YAAY;YACZ,IAAI,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CACjB,GAAG,IAAI,CAAC,kBAAkB,IAAI,WAAW,CAAC,EAAE,YAAY,CACzD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC;oBACZ,WAAW,oBAAO,WAAW,CAAE;iBAChC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAA,CAAC;IA2BJ,CAAC;IAhEO,iBAAiB;;YACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,CAAC;KAAA;IAED,IAAI,kBAAkB;QACpB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,IAAI,cAAc,KAAK,SAAS;YAAE,OAAO,IAAI,cAAc,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IA+BK,kBAAkB,CAAC,SAAS;;YAChC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACxC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;YAC5B,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;YACjD,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;YAE1C,IAAI,QAAQ,IAAI,WAAW,IAAI,QAAQ,IAAI,WAAW,EAAE,CAAC;gBACvD,OAAO;YACT,CAAC;YACD,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC;KAAA;IAED,MAAM;QACJ,MAAM,EAAC,OAAO,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACnC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,oBAAC,IAAI,IAAC,OAAO,EAAE,IAAI,GAAS,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,OAAO,CACL;gBACE,oBAAC,OAAO,IAAC,GAAG,EAAE,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,GAAY,CACrF,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;;AAtEM,uBAAY,GAAG;IACpB,QAAQ,EAAE,EAAE;CACb,AAFkB,CAEjB;AAuEJ,eAAe,UAAU,CAAC,UAAU,CAAC,CAAC"}
@@ -50,6 +50,7 @@ interface ActTableStat {
50
50
  showRatmplSelector?: boolean;
51
51
  aggregateVO?: AggregateVO;
52
52
  restatParams?: object;
53
+ pageInfo?: object;
53
54
  }
54
55
  declare class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
55
56
  state: {
@@ -74,6 +75,10 @@ declare class ActTable extends React.PureComponent<ActTableProps, ActTableStat>
74
75
  showRatmplSelector: boolean;
75
76
  aggregateVO: any;
76
77
  restatParams: any;
78
+ pageInfo: {
79
+ pageNo: number;
80
+ pageSize: number;
81
+ };
77
82
  };
78
83
  static contextType: React.Context<{
79
84
  locale: import("../locale/langMp").LocaleType;
@@ -101,7 +106,8 @@ declare class ActTable extends React.PureComponent<ActTableProps, ActTableStat>
101
106
  renderOhterCustomPage: () => React.JSX.Element;
102
107
  renderCustomPage: (windowPosition: "under-table" | "above-table" | "modal-window" | "left-drawer" | "right-drawer") => "" | React.JSX.Element;
103
108
  componentDidMount(): Promise<void>;
104
- componentDidUpdate(prevProps: any): Promise<void>;
109
+ componentDidUpdate(prevProps: any): Promise<boolean>;
110
+ isSameSourceQuery: (sourceId: any, criteriaData: any) => boolean;
105
111
  handleShowChart: () => void;
106
112
  handleDataAnalysis: () => void;
107
113
  unHiden: () => void;
@@ -1 +1 @@
1
- {"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"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"}
@@ -56,9 +56,13 @@ class ActTable extends React.PureComponent {
56
56
  showRatmplSelector: false,
57
57
  aggregateVO: undefined,
58
58
  restatParams: undefined,
59
+ pageInfo: { pageNo: 1, pageSize: 10 },
59
60
  };
60
61
  this.loadData = (hiddenColIds, hiddenRowCodes, sortedColConfigs) => __awaiter(this, void 0, void 0, function* () {
61
62
  const { sourceId, criteriaData, ltmplConfig, mainCode, level, pageNo, pageSize, serverKey, } = this.props;
63
+ if (!this.isSameSourceQuery(sourceId, criteriaData)) {
64
+ return;
65
+ }
62
66
  if (!ltmplConfig) {
63
67
  return;
64
68
  }
@@ -108,7 +112,7 @@ class ActTable extends React.PureComponent {
108
112
  queryKey = yield HcserviceV3.requestLtmplQueryKey(serverKey, sourceId, Object.assign(Object.assign(Object.assign({}, criteriaData), pageInfo), { mainCode }));
109
113
  }
110
114
  if (!queryKey.sourceId || queryKey.sourceId == this.props.sourceId) {
111
- this.setState({
115
+ this.setState({ pageInfo,
112
116
  disabledColIds, hiddenColIds: hiddenColIds_, hiddenRowCodes,
113
117
  sortedColConfigs, queryKey, showL2Chart: false, selectedRows: [], selectedDatas: [],
114
118
  viewModels: this.state.viewModels.length > 0 ? this.state.viewModels : ["table"],
@@ -209,6 +213,15 @@ class ActTable extends React.PureComponent {
209
213
  } }, customElement));
210
214
  }
211
215
  };
216
+ this.isSameSourceQuery = (sourceId, criteriaData) => {
217
+ if (sourceId && criteriaData && (criteriaData['sourceId'] && criteriaData['sourceId'] != sourceId)
218
+ || (criteriaData['menuId'] && criteriaData['menuId'] != sourceId)) {
219
+ return false;
220
+ }
221
+ else {
222
+ return true;
223
+ }
224
+ };
212
225
  this.handleShowChart = () => {
213
226
  this.setState({
214
227
  showL2Chart: !this.state.showL2Chart,
@@ -567,8 +580,8 @@ class ActTable extends React.PureComponent {
567
580
  };
568
581
  this.renderCriteriaForm = () => {
569
582
  let { loading, selectedRows, selectedDatas } = this.state;
570
- let { ltmplConfig, criteriaData, serverKey } = this.props;
571
- return (React.createElement(CriteriaForm, { serverKey: serverKey, loading: loading, selectedDatas: selectedDatas, selectedRows: selectedRows, doCustomButton: this.doCustomButton, ltmplConfig: ltmplConfig, data: criteriaData, doCQuery: this.doSelectedCQuery, doAction: this.doSelectedAction, doDelete: this.doDelete, doJump: this.doSelectedJump, doSearch: this.actTableDoSearch }));
583
+ let { ltmplConfig, criteriaData, serverKey, sourceId } = this.props;
584
+ return (React.createElement(CriteriaForm, { key: sourceId, serverKey: serverKey, loading: loading, selectedDatas: selectedDatas, selectedRows: selectedRows, doCustomButton: this.doCustomButton, ltmplConfig: ltmplConfig, data: criteriaData, doCQuery: this.doSelectedCQuery, doAction: this.doSelectedAction, doDelete: this.doDelete, doJump: this.doSelectedJump, doSearch: this.actTableDoSearch }));
572
585
  };
573
586
  //暂时无用
574
587
  // queryTotal = async () => {
@@ -592,7 +605,7 @@ class ActTable extends React.PureComponent {
592
605
  return undefined;
593
606
  };
594
607
  this.renderContent = () => {
595
- let { queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable, aggregateVO, } = this.state;
608
+ let { queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable, pageInfo, } = this.state;
596
609
  let { sourceId, ltmplConfig, funcMode, operatable, title, collapsible, pageSize, pageNo, onChangePage, serverKey, criteriaData, showView, doEdit, doRAction, customEditable, readOnly, tableType } = this.props;
597
610
  const { translate } = this.context;
598
611
  if (!ltmplConfig || !sourceId) {
@@ -659,14 +672,9 @@ class ActTable extends React.PureComponent {
659
672
  React.createElement(Content, { style: { overflow: "initial" } },
660
673
  displayCriteriaCard ? this.renderCriteriaForm() : null,
661
674
  loading ? (React.createElement(Table, { loading: loading })) : (tableType == "report" ? React.createElement(ReportTable, { tableProps: { scrollY: ltmplConfig.scrollY, clickDisplayTotal: !ltmplConfig.directShowTotal }, serverKey: serverKey, hiddenColIds: hiddenColIds, maxSelectedRows: this.checkBoxUseful() ? 1000 : -1, columns: tableColumns, selectedRows: selectedRows, queryKey: queryKey, onChangeRowSelection: this.changeRowSelection, leftFixedCols: ltmplConfig.leftFixedCols }) :
662
- React.createElement(QueryTable
663
- // queryTotal={this.queryTotal}
664
- , {
675
+ React.createElement(QueryTable, { key: sourceId, sourceId: sourceId,
665
676
  // queryTotal={this.queryTotal}
666
- tableProps: { scrollY: ltmplConfig.scrollY, clickDisplayTotal: !ltmplConfig.directShowTotal }, serverKey: serverKey, onChangePage: onChangePage, viewModels: viewModels, primaryColumn: ltmplConfig.primaryColumn, columnConfigs: columnConfigs, summaryConfigs: ltmplConfig.totalColumnConfigs, maxSelectedRows: this.checkBoxUseful() ? 10000 : -1, selectedRows: selectedRows, columns: tableColumns, hiddenRowCodes: hiddenRowCodes, pageInfo: {
667
- pageNo: pageNo ? pageNo : 1,
668
- pageSize: pageSize ? pageSize : ltmplConfig.defaultPageSize,
669
- }, queryKey: queryKey, onChangeRowSelection: this.changeRowSelection, subtotalXColumn: ltmplConfig.subtotalXColumn == null ||
677
+ tableProps: { scrollY: ltmplConfig.scrollY, clickDisplayTotal: !ltmplConfig.directShowTotal }, serverKey: serverKey, onChangePage: onChangePage, viewModels: viewModels, primaryColumn: ltmplConfig.primaryColumn, columnConfigs: columnConfigs, summaryConfigs: ltmplConfig.totalColumnConfigs, maxSelectedRows: this.checkBoxUseful() ? 10000 : -1, selectedRows: selectedRows, columns: tableColumns, hiddenRowCodes: hiddenRowCodes, pageInfo: pageInfo, queryKey: queryKey, onChangeRowSelection: this.changeRowSelection, subtotalXColumn: ltmplConfig.subtotalXColumn == null ||
670
678
  ltmplConfig.subtotalXColumn.length <= 0
671
679
  ? null
672
680
  : ltmplConfig.subtotalXColumn, groupIColumns: ltmplConfig.groupIColumns, doSearch: this.actTableDoSearch, sortColumnData: sortColumnData })))))))),
@@ -706,9 +714,17 @@ class ActTable extends React.PureComponent {
706
714
  }
707
715
  componentDidUpdate(prevProps) {
708
716
  return __awaiter(this, void 0, void 0, function* () {
709
- const { sourceId, criteriaData, ltmplConfig, tableType } = this.props;
717
+ const { sourceId, criteriaData, ltmplConfig, tableType, pageSize, pageNo } = this.props;
710
718
  const { translate } = this.context;
711
- let { ltmplConfig: preLtmplConfig, criteriaData: preCriteriaData, sourceId: preSourceId, } = prevProps;
719
+ let { ltmplConfig: preLtmplConfig, criteriaData: preCriteriaData, sourceId: preSourceId, pageSize: prePageSize, pageNo: prePageNo, } = prevProps;
720
+ if (!this.isSameSourceQuery(sourceId, criteriaData)) {
721
+ return false;
722
+ }
723
+ if (prePageSize != pageSize || pageNo != prePageNo) {
724
+ this.setState({
725
+ pageInfo: { pageNo, pageSize },
726
+ });
727
+ }
712
728
  let { hiddenColIds, sortedColConfigs } = this.state;
713
729
  let currentQueryParams = ProgramConfig.transQueryParamsToStr(criteriaData, false, [
714
730
  "pageSize",