@ibiz-template/runtime 0.1.35 → 0.1.37

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 (117) hide show
  1. package/dist/index.esm.js +799 -130
  2. package/dist/index.system.min.js +1 -1
  3. package/dist/index.system.min.js.map +1 -1
  4. package/out/constant/index.d.ts +1 -0
  5. package/out/constant/index.d.ts.map +1 -1
  6. package/out/constant/index.js +1 -0
  7. package/out/constant/value-op.d.ts +82 -0
  8. package/out/constant/value-op.d.ts.map +1 -0
  9. package/out/constant/value-op.js +83 -0
  10. package/out/constant/view-call-tag.d.ts +5 -1
  11. package/out/constant/view-call-tag.d.ts.map +1 -1
  12. package/out/constant/view-call-tag.js +4 -0
  13. package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts.map +1 -1
  14. package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.js +1 -0
  15. package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts +3 -3
  16. package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map +1 -1
  17. package/out/controller/control/form/form-detail/form-item/form-item.controller.js +13 -8
  18. package/out/controller/control/form/search-form/search-form.controller.d.ts +2 -2
  19. package/out/controller/control/form/search-form/search-form.controller.d.ts.map +1 -1
  20. package/out/controller/control/form/search-form/search-form.controller.js +11 -3
  21. package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.d.ts +3 -3
  22. package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.d.ts.map +1 -1
  23. package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.js +13 -8
  24. package/out/controller/control/index.d.ts +1 -0
  25. package/out/controller/control/index.d.ts.map +1 -1
  26. package/out/controller/control/index.js +1 -0
  27. package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts +38 -3
  28. package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts.map +1 -1
  29. package/out/controller/control/md-ctrl/md-ctrl.controller.js +110 -3
  30. package/out/controller/control/medit-view-panel/index.d.ts +3 -0
  31. package/out/controller/control/medit-view-panel/index.d.ts.map +1 -0
  32. package/out/controller/control/medit-view-panel/index.js +2 -0
  33. package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts +119 -0
  34. package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts.map +1 -0
  35. package/out/controller/control/medit-view-panel/medit-view-panel.controller.js +320 -0
  36. package/out/controller/control/medit-view-panel/medit-view-panel.service.d.ts +11 -0
  37. package/out/controller/control/medit-view-panel/medit-view-panel.service.d.ts.map +1 -0
  38. package/out/controller/control/medit-view-panel/medit-view-panel.service.js +9 -0
  39. package/out/controller/control/search-bar/search-bar-filter.controller.d.ts +65 -0
  40. package/out/controller/control/search-bar/search-bar-filter.controller.d.ts.map +1 -0
  41. package/out/controller/control/search-bar/search-bar-filter.controller.js +48 -0
  42. package/out/controller/control/search-bar/search-bar.controller.d.ts +63 -4
  43. package/out/controller/control/search-bar/search-bar.controller.d.ts.map +1 -1
  44. package/out/controller/control/search-bar/search-bar.controller.js +143 -9
  45. package/out/controller/utils/value-rule/value-rule.d.ts +10 -1
  46. package/out/controller/utils/value-rule/value-rule.d.ts.map +1 -1
  47. package/out/controller/utils/value-rule/value-rule.js +64 -1
  48. package/out/engine/md-view.engine.d.ts.map +1 -1
  49. package/out/engine/md-view.engine.js +2 -23
  50. package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts +14 -0
  51. package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts.map +1 -0
  52. package/out/interface/controller/controller/control/i-medit-view-panel.controller.js +1 -0
  53. package/out/interface/controller/controller/control/i-search-bar.controller.d.ts +8 -0
  54. package/out/interface/controller/controller/control/i-search-bar.controller.d.ts.map +1 -1
  55. package/out/interface/controller/controller/control/i-search-form.controller.d.ts +2 -2
  56. package/out/interface/controller/controller/control/i-search-form.controller.d.ts.map +1 -1
  57. package/out/interface/controller/controller/control/index.d.ts +1 -0
  58. package/out/interface/controller/controller/control/index.d.ts.map +1 -1
  59. package/out/interface/controller/controller/control/index.js +1 -0
  60. package/out/interface/controller/event/control/i-medit-view-panel.event.d.ts +9 -0
  61. package/out/interface/controller/event/control/i-medit-view-panel.event.d.ts.map +1 -0
  62. package/out/interface/controller/event/control/i-medit-view-panel.event.js +1 -0
  63. package/out/interface/controller/event/control/index.d.ts +1 -0
  64. package/out/interface/controller/event/control/index.d.ts.map +1 -1
  65. package/out/interface/controller/event/control/index.js +1 -0
  66. package/out/interface/controller/event/view/i-medit-view9.event.d.ts +10 -0
  67. package/out/interface/controller/event/view/i-medit-view9.event.d.ts.map +1 -0
  68. package/out/interface/controller/event/view/i-medit-view9.event.js +1 -0
  69. package/out/interface/controller/event/view/index.d.ts +1 -0
  70. package/out/interface/controller/event/view/index.d.ts.map +1 -1
  71. package/out/interface/controller/event/view/index.js +1 -0
  72. package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts +29 -0
  73. package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts.map +1 -0
  74. package/out/interface/controller/state/control/i-medit-view-panel.state.js +1 -0
  75. package/out/interface/controller/state/control/i-search-bar.state.d.ts +75 -0
  76. package/out/interface/controller/state/control/i-search-bar.state.d.ts.map +1 -1
  77. package/out/interface/controller/state/control/index.d.ts +1 -0
  78. package/out/interface/controller/state/control/index.d.ts.map +1 -1
  79. package/out/interface/controller/state/control/index.js +1 -0
  80. package/out/interface/controller/state/view/i-medit-view9.state.d.ts +11 -0
  81. package/out/interface/controller/state/view/i-medit-view9.state.d.ts.map +1 -0
  82. package/out/interface/controller/state/view/i-medit-view9.state.js +1 -0
  83. package/out/interface/controller/state/view/index.d.ts +1 -0
  84. package/out/interface/controller/state/view/index.d.ts.map +1 -1
  85. package/out/interface/controller/state/view/index.js +1 -0
  86. package/out/service/service/entity/method/method.js +2 -2
  87. package/package.json +3 -3
  88. package/src/constant/index.ts +1 -0
  89. package/src/constant/value-op.ts +82 -0
  90. package/src/constant/view-call-tag.ts +4 -0
  91. package/src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts +2 -0
  92. package/src/controller/control/form/form-detail/form-item/form-item.controller.ts +22 -9
  93. package/src/controller/control/form/search-form/search-form.controller.ts +11 -3
  94. package/src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts +18 -13
  95. package/src/controller/control/index.ts +1 -0
  96. package/src/controller/control/md-ctrl/md-ctrl.controller.ts +136 -3
  97. package/src/controller/control/medit-view-panel/index.ts +2 -0
  98. package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts +375 -0
  99. package/src/controller/control/medit-view-panel/medit-view-panel.service.ts +10 -0
  100. package/src/controller/control/search-bar/search-bar-filter.controller.ts +112 -0
  101. package/src/controller/control/search-bar/search-bar.controller.ts +165 -9
  102. package/src/controller/utils/value-rule/value-rule.ts +97 -2
  103. package/src/engine/md-view.engine.ts +2 -27
  104. package/src/interface/controller/controller/control/i-medit-view-panel.controller.ts +17 -0
  105. package/src/interface/controller/controller/control/i-search-bar.controller.ts +10 -1
  106. package/src/interface/controller/controller/control/i-search-form.controller.ts +2 -2
  107. package/src/interface/controller/controller/control/index.ts +1 -0
  108. package/src/interface/controller/event/control/i-medit-view-panel.event.ts +9 -0
  109. package/src/interface/controller/event/control/index.ts +1 -0
  110. package/src/interface/controller/event/view/i-medit-view9.event.ts +10 -0
  111. package/src/interface/controller/event/view/index.ts +1 -0
  112. package/src/interface/controller/state/control/i-medit-view-panel.state.ts +36 -0
  113. package/src/interface/controller/state/control/i-search-bar.state.ts +86 -0
  114. package/src/interface/controller/state/control/index.ts +1 -0
  115. package/src/interface/controller/state/view/i-medit-view9.state.ts +10 -0
  116. package/src/interface/controller/state/view/index.ts +1 -0
  117. package/src/service/service/entity/method/method.ts +2 -2
@@ -3,5 +3,6 @@ export { ViewType } from './view-type';
3
3
  export { ViewMode } from './view-mode';
4
4
  export { SysUIActionTag } from './sys-uiaction-tag';
5
5
  export { ViewCallTag } from './view-call-tag';
6
+ export { ValueOP } from './value-op';
6
7
  export * from './studio-event';
7
8
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,cAAc,gBAAgB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,cAAc,gBAAgB,CAAC"}
@@ -3,4 +3,5 @@ export { ViewType } from './view-type';
3
3
  export { ViewMode } from './view-mode';
4
4
  export { SysUIActionTag } from './sys-uiaction-tag';
5
5
  export { ViewCallTag } from './view-call-tag';
6
+ export { ValueOP } from './value-op';
6
7
  export * from './studio-event';
@@ -0,0 +1,82 @@
1
+ /**
2
+ * 值操作
3
+ * @author lxm
4
+ * @date 2023-10-13 11:37:48
5
+ * @export
6
+ * @enum {number}
7
+ */
8
+ export declare enum ValueOP {
9
+ /**
10
+ * 等于
11
+ */
12
+ 'EQ' = "EQ",
13
+ /**
14
+ * 不等于
15
+ */
16
+ 'NOT_EQ' = "NOTEQ",
17
+ /**
18
+ * 大于
19
+ */
20
+ 'GT' = "GT",
21
+ /**
22
+ * 大于等于
23
+ */
24
+ 'GT_AND_EQ' = "GTANDEQ",
25
+ /**
26
+ * 小于
27
+ */
28
+ 'LT' = "LT",
29
+ /**
30
+ * 小于等于
31
+ */
32
+ 'LT_AND_EQ' = "LTANDEQ",
33
+ /**
34
+ * 值为空
35
+ */
36
+ 'IS_NULL' = "ISNULL",
37
+ /**
38
+ * 值不为空
39
+ */
40
+ 'IS_NOT_NULL' = "ISNOTNULL",
41
+ /**
42
+ * 值在范围中
43
+ */
44
+ 'IN' = "IN",
45
+ /**
46
+ * 值不在范围中
47
+ */
48
+ 'NOT_IN' = "NOTIN",
49
+ /**
50
+ * 文本包含
51
+ */
52
+ 'LIKE' = "LIKE",
53
+ /**
54
+ * 文本左包含
55
+ */
56
+ 'LIFT_LIKE' = "LIFTLIKE",
57
+ /**
58
+ * 文本右包含
59
+ */
60
+ 'RIGHT_LIKE' = "RIGHT_LIKE",
61
+ /**
62
+ * 子数据(递归)
63
+ */
64
+ 'CHILD_OF' = "CHILDOF",
65
+ /**
66
+ * 自定义文本包含
67
+ */
68
+ 'USER_LIKE' = "USERLIKE",
69
+ /**
70
+ * 位与操作(BitAnd)(仅限整数形)
71
+ */
72
+ 'BIT_AND' = "BITAND",
73
+ /**
74
+ * 存在引用数据
75
+ */
76
+ 'EXISTS' = "EXISTS",
77
+ /**
78
+ * 不存在引用数据
79
+ */
80
+ 'NOT_EXISTS' = "NOTEXISTS"
81
+ }
82
+ //# sourceMappingURL=value-op.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"value-op.d.ts","sourceRoot":"","sources":["../../src/constant/value-op.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,OAAO;IACjB;;OAEG;IACH,IAAI,OAAO;IACX;;OAEG;IACH,QAAQ,UAAU;IAClB;;OAEG;IACH,IAAI,OAAO;IACX;;OAEG;IACH,WAAW,YAAY;IACvB;;OAEG;IACH,IAAI,OAAO;IACX;;OAEG;IACH,WAAW,YAAY;IACvB;;OAEG;IACH,SAAS,WAAW;IACpB;;OAEG;IACH,aAAa,cAAc;IAC3B;;OAEG;IACH,IAAI,OAAO;IACX;;OAEG;IACH,QAAQ,UAAU;IAClB;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,WAAW,aAAa;IACxB;;OAEG;IACH,YAAY,eAAe;IAC3B;;OAEG;IACH,UAAU,YAAY;IACtB;;OAEG;IACH,WAAW,aAAa;IACxB;;OAEG;IACH,SAAS,WAAW;IACpB;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,YAAY,cAAc;CAC3B"}
@@ -0,0 +1,83 @@
1
+ /* eslint-disable no-shadow */
2
+ /**
3
+ * 值操作
4
+ * @author lxm
5
+ * @date 2023-10-13 11:37:48
6
+ * @export
7
+ * @enum {number}
8
+ */
9
+ export var ValueOP;
10
+ (function (ValueOP) {
11
+ /**
12
+ * 等于
13
+ */
14
+ ValueOP["EQ"] = "EQ";
15
+ /**
16
+ * 不等于
17
+ */
18
+ ValueOP["NOT_EQ"] = "NOTEQ";
19
+ /**
20
+ * 大于
21
+ */
22
+ ValueOP["GT"] = "GT";
23
+ /**
24
+ * 大于等于
25
+ */
26
+ ValueOP["GT_AND_EQ"] = "GTANDEQ";
27
+ /**
28
+ * 小于
29
+ */
30
+ ValueOP["LT"] = "LT";
31
+ /**
32
+ * 小于等于
33
+ */
34
+ ValueOP["LT_AND_EQ"] = "LTANDEQ";
35
+ /**
36
+ * 值为空
37
+ */
38
+ ValueOP["IS_NULL"] = "ISNULL";
39
+ /**
40
+ * 值不为空
41
+ */
42
+ ValueOP["IS_NOT_NULL"] = "ISNOTNULL";
43
+ /**
44
+ * 值在范围中
45
+ */
46
+ ValueOP["IN"] = "IN";
47
+ /**
48
+ * 值不在范围中
49
+ */
50
+ ValueOP["NOT_IN"] = "NOTIN";
51
+ /**
52
+ * 文本包含
53
+ */
54
+ ValueOP["LIKE"] = "LIKE";
55
+ /**
56
+ * 文本左包含
57
+ */
58
+ ValueOP["LIFT_LIKE"] = "LIFTLIKE";
59
+ /**
60
+ * 文本右包含
61
+ */
62
+ ValueOP["RIGHT_LIKE"] = "RIGHT_LIKE";
63
+ /**
64
+ * 子数据(递归)
65
+ */
66
+ ValueOP["CHILD_OF"] = "CHILDOF";
67
+ /**
68
+ * 自定义文本包含
69
+ */
70
+ ValueOP["USER_LIKE"] = "USERLIKE";
71
+ /**
72
+ * 位与操作(BitAnd)(仅限整数形)
73
+ */
74
+ ValueOP["BIT_AND"] = "BITAND";
75
+ /**
76
+ * 存在引用数据
77
+ */
78
+ ValueOP["EXISTS"] = "EXISTS";
79
+ /**
80
+ * 不存在引用数据
81
+ */
82
+ ValueOP["NOT_EXISTS"] = "NOTEXISTS";
83
+ })(ValueOP || (ValueOP = {}));
@@ -21,6 +21,10 @@ export declare enum ViewCallTag {
21
21
  /**
22
22
  * 校验数据(编辑视图才用)
23
23
  */
24
- 'VALIDATE' = "Validate"
24
+ 'VALIDATE' = "Validate",
25
+ /**
26
+ * 切换折叠(首页视图才用)
27
+ */
28
+ 'TOGGLE_COLLAPSE' = "ToggleCollapse"
25
29
  }
26
30
  //# sourceMappingURL=view-call-tag.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"view-call-tag.d.ts","sourceRoot":"","sources":["../../src/constant/view-call-tag.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,WAAW;IACrB;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,UAAU,YAAY;IACtB;;OAEG;IACH,cAAc,eAAe;IAC7B;;OAEG;IACH,UAAU,aAAa;CACxB"}
1
+ {"version":3,"file":"view-call-tag.d.ts","sourceRoot":"","sources":["../../src/constant/view-call-tag.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,WAAW;IACrB;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,UAAU,YAAY;IACtB;;OAEG;IACH,cAAc,eAAe;IAC7B;;OAEG;IACH,UAAU,aAAa;IACvB;;OAEG;IACH,iBAAiB,mBAAmB;CACrC"}
@@ -24,4 +24,8 @@ export var ViewCallTag;
24
24
  * 校验数据(编辑视图才用)
25
25
  */
26
26
  ViewCallTag["VALIDATE"] = "Validate";
27
+ /**
28
+ * 切换折叠(首页视图才用)
29
+ */
30
+ ViewCallTag["TOGGLE_COLLAPSE"] = "ToggleCollapse";
27
31
  })(ViewCallTag || (ViewCallTag = {}));
@@ -1 +1 @@
1
- {"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAQtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAa1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}
1
+ {"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAQtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAa1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}
@@ -70,6 +70,7 @@ export class PortletPartController {
70
70
  await this.onInit();
71
71
  }
72
72
  async onInit() {
73
+ this.onDataChange = this.onDataChange.bind(this);
73
74
  // 初始化布局参数
74
75
  const { layoutPos, sysCss } = this.model;
75
76
  // 初始化高宽
@@ -51,10 +51,10 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
51
51
  * 值规则
52
52
  *
53
53
  * @author lxm
54
- * @date 2022-09-01 22:09:49
55
- * @type {IData}
54
+ * @date 2023-10-18 03:39:23
55
+ * @type {IData[]}
56
56
  */
57
- rules: IData;
57
+ rules: IData[];
58
58
  /**
59
59
  * 表单项名称
60
60
  *
@@ -1 +1 @@
1
- {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAa1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAWhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAO1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;CAkBlE"}
1
+ {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAOvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAWhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAO1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;CAkBlE"}
@@ -6,7 +6,7 @@ import { getEditorProvider } from '../../../../../register';
6
6
  import { Srfuf } from '../../../../../service';
7
7
  import { filterValueRules } from '../../../../../utils';
8
8
  import { FormNotifyState } from '../../../../constant';
9
- import { generateRules, getDefaultValue } from '../../../../utils';
9
+ import { generateEditorRules, generateRules, getDefaultValue, } from '../../../../utils';
10
10
  export class FormItemController extends FormDetailController {
11
11
  createState() {
12
12
  var _a;
@@ -61,8 +61,8 @@ export class FormItemController extends FormDetailController {
61
61
  * 值规则
62
62
  *
63
63
  * @author lxm
64
- * @date 2022-09-01 22:09:49
65
- * @type {IData}
64
+ * @date 2023-10-18 03:39:23
65
+ * @type {IData[]}
66
66
  */
67
67
  this.rules = [];
68
68
  this.context = form.context;
@@ -129,13 +129,18 @@ export class FormItemController extends FormDetailController {
129
129
  * @returns {*}
130
130
  */
131
131
  async initRules() {
132
+ this.rules = [];
132
133
  const formItemsVRs = filterValueRules(this.form.model.deformItemVRs || [], this.name);
133
- if (!formItemsVRs) {
134
- return;
134
+ if (formItemsVRs) {
135
+ this.rules.push(...generateRules(formItemsVRs, this.name, this.valueItemName));
136
+ }
137
+ if (this.model.editor) {
138
+ this.rules.push(...generateEditorRules(this.model.editor));
139
+ }
140
+ if (this.rules.length > 0) {
141
+ // 初始化async-validator实例
142
+ this.validator = new Schema({ [this.name]: this.rules });
135
143
  }
136
- this.rules = generateRules(formItemsVRs, this.name, this.valueItemName);
137
- // 初始化async-validator实例
138
- this.validator = new Schema({ [this.name]: this.rules });
139
144
  }
140
145
  /**
141
146
  * 计算启用条件的禁用
@@ -32,13 +32,13 @@ export declare class SearchFormController extends FormController<IDESearchForm,
32
32
  */
33
33
  load(): Promise<IData>;
34
34
  /**
35
- * 获取搜索表单的视图过滤参数
35
+ * 获取搜索表单的过滤参数
36
36
  *
37
37
  * @author lxm
38
38
  * @date 2022-09-22 17:09:21
39
39
  * @returns {*} {IParams}
40
40
  */
41
- getParams(): IParams;
41
+ getFilterParams(): IParams;
42
42
  /**
43
43
  * 执行搜索行为
44
44
  * @author lxm
@@ -1 +1 @@
1
- {"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;cAEZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAS1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAwB5B;;;;;;OAMG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAOnD"}
1
+ {"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;cAEZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAS1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAwB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IAY1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAOnD"}
@@ -59,14 +59,22 @@ export class SearchFormController extends FormController {
59
59
  return this.data;
60
60
  }
61
61
  /**
62
- * 获取搜索表单的视图过滤参数
62
+ * 获取搜索表单的过滤参数
63
63
  *
64
64
  * @author lxm
65
65
  * @date 2022-09-22 17:09:21
66
66
  * @returns {*} {IParams}
67
67
  */
68
- getParams() {
69
- return Object.assign({}, this.data.getOrigin());
68
+ getFilterParams() {
69
+ const filterParams = {};
70
+ Object.keys(this.state.data).forEach(key => {
71
+ const value = this.state.data[key];
72
+ // 排除空值
73
+ if (value !== null && value !== undefined && value !== '') {
74
+ filterParams[key] = value;
75
+ }
76
+ });
77
+ return filterParams;
70
78
  }
71
79
  /**
72
80
  * 执行搜索行为
@@ -38,10 +38,10 @@ export declare class GridFieldEditColumnController extends GridFieldColumnContro
38
38
  * 值规则
39
39
  *
40
40
  * @author lxm
41
- * @date 2022-09-01 22:09:49
42
- * @type {IData}
41
+ * @date 2023-10-18 03:39:40
42
+ * @type {IData[]}
43
43
  */
44
- rules: IData;
44
+ rules: IData[];
45
45
  /**
46
46
  * 表格编辑项校验器实例
47
47
  *
@@ -1 +1 @@
1
- {"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAM3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBpD"}
1
+ {"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAM3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBpD"}
@@ -6,7 +6,7 @@ import { findEditItem } from '../../../../../model';
6
6
  import { getEditorProvider } from '../../../../../register';
7
7
  import { Srfuf } from '../../../../../service';
8
8
  import { filterValueRules } from '../../../../../utils';
9
- import { generateRules } from '../../../../utils';
9
+ import { generateEditorRules, generateRules } from '../../../../utils';
10
10
  import { GridFieldColumnController } from '../grid-field-column';
11
11
  /**
12
12
  * 表格属性列(开启行编辑)控制器
@@ -21,8 +21,8 @@ export class GridFieldEditColumnController extends GridFieldColumnController {
21
21
  * 值规则
22
22
  *
23
23
  * @author lxm
24
- * @date 2022-09-01 22:09:49
25
- * @type {IData}
24
+ * @date 2023-10-18 03:39:40
25
+ * @type {IData[]}
26
26
  */
27
27
  this.rules = [];
28
28
  }
@@ -101,13 +101,18 @@ export class GridFieldEditColumnController extends GridFieldColumnController {
101
101
  * @returns {*}
102
102
  */
103
103
  async initRules() {
104
+ this.rules = [];
104
105
  const editItemsVRs = filterValueRules(this.grid.model.degridEditItemVRs || [], this.fieldName);
105
- if (!editItemsVRs) {
106
- return;
106
+ if (editItemsVRs) {
107
+ this.rules.push(...generateRules(editItemsVRs, this.fieldName, this.valueItemName));
108
+ }
109
+ if (this.editItem.editor) {
110
+ this.rules.push(...generateEditorRules(this.editItem.editor));
111
+ }
112
+ if (this.rules.length > 0) {
113
+ // 初始化async-validator实例
114
+ this.validator = new Schema({ [this.fieldName]: this.rules });
107
115
  }
108
- this.rules = generateRules(editItemsVRs, this.fieldName, this.valueItemName);
109
- // 初始化async-validator实例
110
- this.validator = new Schema({ [this.fieldName]: this.rules });
111
116
  }
112
117
  /**
113
118
  * 设置行属性的值
@@ -21,4 +21,5 @@ export * from './md-ctrl/index';
21
21
  export * from './kanban/index';
22
22
  export * from './tree-grid-ex/index';
23
23
  export * from './tree-grid/index';
24
+ export * from './medit-view-panel/index';
24
25
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC"}
@@ -21,3 +21,4 @@ export * from './md-ctrl/index';
21
21
  export * from './kanban/index';
22
22
  export * from './tree-grid-ex/index';
23
23
  export * from './tree-grid/index';
24
+ export * from './medit-view-panel/index';
@@ -1,5 +1,5 @@
1
1
  import { IDEMobMDCtrl, IUIActionGroup, IUIActionGroupDetail } from '@ibiz/model-core';
2
- import { IMobMDCtrlEvent, IMobMDCtrlController, IMobMdCtrlState, IMobMDCtrlRowState, MDCtrlLoadParams } from '../../../interface';
2
+ import { IMobMDCtrlEvent, IMobMDCtrlController, IMobMdCtrlState, IMobMDCtrlRowState, MDCtrlLoadParams, CodeListItem } from '../../../interface';
3
3
  import { MDCtrlService } from './md-ctrl.service';
4
4
  import { MobMDCtrlRowState } from './md-ctrl-row.state';
5
5
  import { MDControlController } from '../../common';
@@ -7,6 +7,15 @@ import { ControlVO } from '../../../service';
7
7
  export declare class MDCtrlController extends MDControlController<IDEMobMDCtrl, IMobMdCtrlState, IMobMDCtrlEvent> implements IMobMDCtrlController {
8
8
  service: MDCtrlService;
9
9
  protected initState(): void;
10
+ /**
11
+ * 分组代码表项集合
12
+ *
13
+ * @author zk
14
+ * @date 2023-10-11 04:10:06
15
+ * @type {readonly}
16
+ * @memberof MDCtrlController
17
+ */
18
+ groupCodeListItems?: readonly CodeListItem[];
10
19
  protected onCreated(): Promise<void>;
11
20
  /**
12
21
  * 设置排序
@@ -40,7 +49,7 @@ export declare class MDCtrlController extends MDControlController<IDEMobMDCtrl,
40
49
  * @author zk
41
50
  * @date 2023-05-26 02:05:46
42
51
  * @param {IData[]} items
43
- * @memberof ListController
52
+ * @memberof MDCtrlController
44
53
  */
45
54
  setData(items: IData[]): void;
46
55
  /**
@@ -49,7 +58,7 @@ export declare class MDCtrlController extends MDControlController<IDEMobMDCtrl,
49
58
  * @author zk
50
59
  * @date 2023-05-26 02:05:35
51
60
  * @return {*} {IData[]}
52
- * @memberof ListController
61
+ * @memberof MDCtrlController
53
62
  */
54
63
  getAllData(): IData[];
55
64
  /**
@@ -73,5 +82,31 @@ export declare class MDCtrlController extends MDControlController<IDEMobMDCtrl,
73
82
  */
74
83
  protected initActionStates(row: MobMDCtrlRowState): void;
75
84
  protected initUIActionGroup(row: MobMDCtrlRowState, group: IUIActionGroup): void;
85
+ /**
86
+ * 处理数据分组
87
+ *
88
+ * @memberof MDCtrlController
89
+ */
90
+ protected handleDataGroup(): Promise<void>;
91
+ /**
92
+ * 处理自动分组
93
+ *
94
+ * @memberof MDCtrlController
95
+ */
96
+ protected handleAutoGroup(): void;
97
+ /**
98
+ * 加载并初始化分组代码表项集合
99
+ * @author lxm
100
+ * @date 2023-08-29 05:11:39
101
+ * @protected
102
+ * @return {*} {Promise<void>}
103
+ */
104
+ protected initGroupCodeListItems(): Promise<void>;
105
+ /**
106
+ * 处理代码表分组
107
+ *
108
+ * @memberof MDCtrlController
109
+ */
110
+ protected handleCodeListGroup(): Promise<void>;
76
111
  }
77
112
  //# sourceMappingURL=md-ctrl.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,qBAAa,gBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,eAAe,EAAE,eAAe,CAC1E,YAAW,oBAAoB;IAEvB,OAAO,EAAE,aAAa,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAcnD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAO/B;;;;;;;OAOG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAgBvE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAQ7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;;;;;;OASG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,kBAAkB,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI;IAUxD,SAAS,CAAC,iBAAiB,CACzB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,cAAc,GACpB,IAAI;CAoBR"}
1
+ {"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAEhB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,qBAAa,gBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,eAAe,EAAE,eAAe,CAC1E,YAAW,oBAAoB;IAEvB,OAAO,EAAE,aAAa,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;cAE7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAcnD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAO/B;;;;;;;OAOG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,KAAK,EAAE,CAAC;IAkBnB;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAQ7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;;;;;;OASG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,kBAAkB,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI;IAUxD,SAAS,CAAC,iBAAiB,CACzB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,cAAc,GACpB,IAAI;IAqBP;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAchD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IA+BjC;;;;;;OAMG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavD;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAiCrD"}