@teamix/pro 1.2.13 → 1.2.17

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 (203) hide show
  1. package/dist/212.js +798 -766
  2. package/dist/pro.css +1 -1
  3. package/dist/pro.js +1668 -1751
  4. package/dist/pro.min.css +1 -1
  5. package/dist/pro.min.js +1 -1
  6. package/es/actions/dialog-component.js +2 -2
  7. package/es/actions/dialog-form.js +2 -2
  8. package/es/actions/dialog.js +5 -3
  9. package/es/actions/index.d.ts +2 -0
  10. package/es/actions/index.js +30 -16
  11. package/es/actions/link.js +2 -2
  12. package/es/actions/request.js +2 -2
  13. package/es/actions/utils.js +2 -2
  14. package/es/card/card-container.js +2 -2
  15. package/es/card/divider.js +2 -2
  16. package/es/card/index.d.ts +6 -3
  17. package/es/card/index.js +11 -6
  18. package/es/card/index.scss +4 -0
  19. package/es/card/selectable.js +2 -2
  20. package/es/card/tab.js +2 -2
  21. package/es/form/Components/Editable/index.js +2 -2
  22. package/es/form/Components/FormGroup/index.js +2 -2
  23. package/es/form/Components/LightFilter/componentMap.d.ts +2 -0
  24. package/es/form/Components/LightFilter/componentMap.js +5 -0
  25. package/es/form/Components/LightFilter/index.d.ts +15 -0
  26. package/es/form/Components/{QueryFilter → LightFilter}/index.js +45 -44
  27. package/es/form/Components/LightFilter/index.scss +74 -0
  28. package/es/form/Components/ProField/index.js +2 -2
  29. package/es/form/Components/Text/index.js +2 -2
  30. package/es/form/Filter/index.js +4 -4
  31. package/es/form/Filter/index.scss +0 -46
  32. package/es/form/Filter/index2.d.ts +1 -1
  33. package/es/form/Filter/index2.js +163 -115
  34. package/es/form/Filter/index2.scss +73 -0
  35. package/es/form/ProForm/index.js +3 -2
  36. package/es/form/ProForm/index.scss +9 -9
  37. package/es/form/ProForm/useAutoSubmit.js +2 -2
  38. package/es/form/ProForm/useFieldRequest.js +2 -2
  39. package/es/form/ProForm/useFormDisplayValues.js +46 -15
  40. package/es/form/ProForm/useInitialRequest.js +2 -2
  41. package/es/form/SchemaForm/adapterType.js +1 -0
  42. package/es/form/SchemaForm/index.js +5 -5
  43. package/es/form/SchemaForm/initializeArrayCards.js +2 -2
  44. package/es/form/SchemaForm/initializeArrayCollapse.js +2 -2
  45. package/es/form/SchemaForm/initializeArrayItems.js +2 -2
  46. package/es/form/SchemaForm/initializeArrayTable.js +2 -2
  47. package/es/form/SchemaForm/initializeFormButton.js +2 -2
  48. package/es/form/SchemaForm/initializeFormCollapse.js +2 -2
  49. package/es/form/SchemaForm/initializeFormGroup.js +2 -2
  50. package/es/form/SchemaForm/initializeFormStep.js +2 -2
  51. package/es/form/SchemaForm/initializeFormTab.js +2 -2
  52. package/es/form/SchemaForm/initializeReactions.js +2 -2
  53. package/es/form/SchemaForm/initializeRules.js +2 -2
  54. package/es/form/SchemaForm/reactions.js +4 -8
  55. package/es/form/fieldTypeMap.js +1 -0
  56. package/es/form/global.scss +1 -0
  57. package/es/form/index.d.ts +9 -9
  58. package/es/form/index.js +2 -2
  59. package/es/form/typing.d.ts +6 -0
  60. package/es/form/utils.js +2 -2
  61. package/es/form/warning.js +2 -2
  62. package/es/index.d.ts +1 -1
  63. package/es/index.js +1 -1
  64. package/es/info/components/InfoGroup/index.js +2 -2
  65. package/es/info/components/InfoValueItem/index.js +2 -2
  66. package/es/info/components/tableInfo/index.js +2 -2
  67. package/es/info/index.js +2 -2
  68. package/es/info/utils/index.js +2 -2
  69. package/es/nocode/configurators/ProTable.js +1 -0
  70. package/es/nocode/pages/playground.js +2 -2
  71. package/es/nocode/pages/renderer.js +5 -5
  72. package/es/nocode/playground.js +2 -2
  73. package/es/page-header/index.d.ts +1 -2
  74. package/es/page-header/index.js +4 -14
  75. package/es/sidebar/components/sidebar-container/index.js +2 -2
  76. package/es/sidebar/components/tree/index.js +2 -2
  77. package/es/sidebar/index.js +2 -2
  78. package/es/table/components/Filter/index.js +44 -18
  79. package/es/table/components/Layout/index.js +3 -3
  80. package/es/table/components/QuickAction/index.js +3 -3
  81. package/es/table/components/ToolBar/FilterColumnIcon.js +54 -19
  82. package/es/table/components/ToolBar/index.js +2 -2
  83. package/es/table/components/ToolBar/index.scss +1 -0
  84. package/es/table/index.js +11 -4
  85. package/es/table/typing.d.ts +6 -2
  86. package/es/table/utils/columnRender.js +29 -8
  87. package/es/table/utils/genProColumnToColumn.js +2 -2
  88. package/es/table/utils/index.js +9 -3
  89. package/es/table/utils/useTableSelection.js +2 -2
  90. package/es/templates/List/index.js +2 -2
  91. package/es/utils/message.d.ts +1 -1
  92. package/es/utils/message.js +9 -9
  93. package/lib/actions/dialog-component.js +2 -2
  94. package/lib/actions/dialog-form.js +3 -3
  95. package/lib/actions/dialog.js +6 -4
  96. package/lib/actions/index.d.ts +2 -0
  97. package/lib/actions/index.js +30 -16
  98. package/lib/actions/link.js +2 -2
  99. package/lib/actions/request.js +2 -2
  100. package/lib/actions/utils.js +2 -2
  101. package/lib/card/card-container.js +2 -2
  102. package/lib/card/divider.js +2 -2
  103. package/lib/card/index.d.ts +6 -3
  104. package/lib/card/index.js +11 -6
  105. package/lib/card/index.scss +4 -0
  106. package/lib/card/selectable.js +2 -2
  107. package/lib/card/tab.js +2 -2
  108. package/lib/field/index.js +1 -1
  109. package/lib/form/Components/Editable/index.js +3 -3
  110. package/lib/form/Components/FormGroup/index.js +2 -2
  111. package/lib/form/Components/LightFilter/componentMap.d.ts +2 -0
  112. package/lib/form/Components/LightFilter/componentMap.js +12 -0
  113. package/lib/form/Components/LightFilter/index.d.ts +15 -0
  114. package/lib/form/Components/{QueryFilter → LightFilter}/index.js +50 -44
  115. package/lib/form/Components/LightFilter/index.scss +74 -0
  116. package/lib/form/Components/ProField/index.js +2 -2
  117. package/lib/form/Components/Text/index.js +2 -2
  118. package/lib/form/Filter/index.js +5 -5
  119. package/lib/form/Filter/index.scss +0 -46
  120. package/lib/form/Filter/index2.d.ts +1 -1
  121. package/lib/form/Filter/index2.js +165 -115
  122. package/lib/form/Filter/index2.scss +73 -0
  123. package/lib/form/ProForm/index.js +4 -3
  124. package/lib/form/ProForm/index.scss +9 -9
  125. package/lib/form/ProForm/useAutoSubmit.js +2 -2
  126. package/lib/form/ProForm/useFieldRequest.js +2 -2
  127. package/lib/form/ProForm/useFormDisplayValues.js +47 -15
  128. package/lib/form/ProForm/useInitialRequest.js +2 -2
  129. package/lib/form/SchemaForm/adapterType.js +1 -0
  130. package/lib/form/SchemaForm/index.js +6 -6
  131. package/lib/form/SchemaForm/initializeArrayCards.js +2 -2
  132. package/lib/form/SchemaForm/initializeArrayCollapse.js +2 -2
  133. package/lib/form/SchemaForm/initializeArrayItems.js +2 -2
  134. package/lib/form/SchemaForm/initializeArrayTable.js +2 -2
  135. package/lib/form/SchemaForm/initializeFormButton.js +2 -2
  136. package/lib/form/SchemaForm/initializeFormCollapse.js +2 -2
  137. package/lib/form/SchemaForm/initializeFormGroup.js +2 -2
  138. package/lib/form/SchemaForm/initializeFormStep.js +2 -2
  139. package/lib/form/SchemaForm/initializeFormTab.js +2 -2
  140. package/lib/form/SchemaForm/initializeReactions.js +2 -2
  141. package/lib/form/SchemaForm/initializeRules.js +2 -2
  142. package/lib/form/SchemaForm/reactions.js +3 -7
  143. package/lib/form/fieldTypeMap.js +1 -0
  144. package/lib/form/global.scss +1 -0
  145. package/lib/form/index.d.ts +9 -9
  146. package/lib/form/index.js +3 -3
  147. package/lib/form/typing.d.ts +6 -0
  148. package/lib/form/utils.js +2 -2
  149. package/lib/form/warning.js +2 -2
  150. package/lib/hooks/index.js +1 -1
  151. package/lib/index.d.ts +1 -1
  152. package/lib/index.js +2 -2
  153. package/lib/info/components/InfoGroup/index.js +3 -3
  154. package/lib/info/components/InfoValueItem/index.js +3 -3
  155. package/lib/info/components/tableInfo/index.js +3 -3
  156. package/lib/info/index.js +3 -3
  157. package/lib/info/utils/index.js +2 -2
  158. package/lib/nocode/configurators/ProTable.js +1 -0
  159. package/lib/nocode/configurators/index.js +1 -1
  160. package/lib/nocode/pages/playground.js +3 -3
  161. package/lib/nocode/pages/renderer.js +5 -5
  162. package/lib/nocode/playground.js +3 -3
  163. package/lib/page-container/index.js +1 -1
  164. package/lib/page-header/index.d.ts +1 -2
  165. package/lib/page-header/index.js +6 -17
  166. package/lib/sidebar/components/sidebar-container/index.js +2 -2
  167. package/lib/sidebar/components/tree/index.js +3 -3
  168. package/lib/sidebar/index.js +3 -3
  169. package/lib/skeleton/index.js +1 -1
  170. package/lib/table/components/Filter/index.js +45 -19
  171. package/lib/table/components/Layout/index.js +3 -3
  172. package/lib/table/components/QuickAction/index.js +3 -3
  173. package/lib/table/components/ToolBar/DensityIcon.js +1 -1
  174. package/lib/table/components/ToolBar/FilterColumnIcon.js +55 -20
  175. package/lib/table/components/ToolBar/FullScreenIcon.js +1 -1
  176. package/lib/table/components/ToolBar/Fullscreen.js +1 -1
  177. package/lib/table/components/ToolBar/index.js +2 -2
  178. package/lib/table/components/ToolBar/index.scss +1 -0
  179. package/lib/table/index.js +11 -4
  180. package/lib/table/typing.d.ts +6 -2
  181. package/lib/table/utils/columnRender.js +29 -8
  182. package/lib/table/utils/genProColumnToColumn.js +2 -2
  183. package/lib/table/utils/index.js +9 -3
  184. package/lib/table/utils/useTableSelection.js +2 -2
  185. package/lib/templates/List/index.js +3 -3
  186. package/lib/utils/index.js +1 -1
  187. package/lib/utils/message.d.ts +1 -1
  188. package/lib/utils/message.js +9 -9
  189. package/package.json +2 -2
  190. package/es/form/Components/Query/index.d.ts +0 -4
  191. package/es/form/Components/Query/index.js +0 -70
  192. package/es/form/Components/Query/index.scss +0 -85
  193. package/es/form/Components/QueryFilter/index.d.ts +0 -3
  194. package/es/utils/components/tags/index.d.ts +0 -15
  195. package/es/utils/components/tags/index.js +0 -94
  196. package/es/utils/components/tags/index.scss +0 -12
  197. package/lib/form/Components/Query/index.d.ts +0 -4
  198. package/lib/form/Components/Query/index.js +0 -91
  199. package/lib/form/Components/Query/index.scss +0 -85
  200. package/lib/form/Components/QueryFilter/index.d.ts +0 -3
  201. package/lib/utils/components/tags/index.d.ts +0 -15
  202. package/lib/utils/components/tags/index.js +0 -114
  203. package/lib/utils/components/tags/index.scss +0 -12
@@ -0,0 +1,73 @@
1
+ @import '../global.scss';
2
+
3
+ $query-filter: #{$teamix-pro-form}-query-filter;
4
+
5
+ .#{$query-filter} {
6
+ .#{$query-filter}-inline {
7
+ display: flex;
8
+ justify-content: space-between;
9
+ }
10
+ .#{$query-filter}-left {
11
+ display: flex;
12
+ }
13
+ .#{$query-filter}-addonBefore {
14
+ flex: 0 1 auto;
15
+ margin-right: 8px;
16
+ }
17
+ .#{$query-filter}-inline-form {
18
+ flex: 0 0 auto;
19
+ margin-right: 8px;
20
+ margin-bottom: 8px;
21
+ }
22
+ .#{$query-filter}-toggle {
23
+ margin-bottom: 8px;
24
+ }
25
+ .#{$query-filter}-addonAfter {
26
+ flex: 0 1 auto;
27
+ margin-left: 8px;
28
+ }
29
+ .#{$query-filter}-tag-title {
30
+ margin-right: 12px;
31
+ color: var(--color-text1-8, #848484);
32
+ }
33
+ .#{$query-filter}-tag-content {
34
+ .#{$teamix-pro-field} {
35
+ display: inline-block;
36
+ .#{$css-prefix}form-preview {
37
+ color: var(--color-text1-2, #5a5a5a);
38
+ font-weight: bold;
39
+ }
40
+ }
41
+ }
42
+ .#{$query-filter}-tag-hidden {
43
+ display: none;
44
+ }
45
+ .#{$query-filter}-advanced-wrap {
46
+ padding: 16px;
47
+ background-color: var(--color-fill1-2, #f7f7f7);
48
+ }
49
+ .#{$query-filter}-advanced-wrap-hidden {
50
+ display: none;
51
+ }
52
+
53
+ .#{$query-filter}-advanced {
54
+ .#{$css-prefix}formily-button-group {
55
+ margin-top: 0;
56
+ }
57
+ }
58
+ .#{$query-filter}-advanced,
59
+ .#{$query-filter}-simple,
60
+ .#{$query-filter}-light {
61
+ .#{$form-item-cls}-feedback-layout-popover {
62
+ margin-bottom: 0;
63
+ }
64
+ .#{$css-prefix}date-picker2-input {
65
+ .#{$css-prefix}input {
66
+ width: inherit;
67
+ input {
68
+ width: inherit;
69
+ }
70
+ }
71
+ }
72
+ }
73
+ }
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
4
 
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
@@ -39,9 +39,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
39
39
 
40
40
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
41
41
 
42
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
42
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
43
43
 
44
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
44
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
45
45
 
46
46
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
47
47
 
@@ -105,6 +105,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
105
105
  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]); // 添加onChange
106
106
 
107
107
  (0, _react.useEffect)(function () {
108
+ form.removeEffects('onChange');
108
109
  form.addEffects('onChange', function () {
109
110
  (0, _core.onFormValuesChange)(function (form) {
110
111
  if (onChange) {
@@ -32,11 +32,11 @@
32
32
  > .#{$form-item-cls}-control-content {
33
33
  > .#{$form-item-cls}-control-content-component {
34
34
  line-height: initial;
35
- > .teamix-pro-field-checkbox,
36
- .teamix-pro-field-radio,
37
- .teamix-pro-field-switch,
38
- .teamix-pro-field-colorradio,
39
- .teamix-pro-field-range,
35
+ > .#{$teamix-pro-field}-checkbox,
36
+ .#{$teamix-pro-field}-radio,
37
+ .#{$teamix-pro-field}-switch,
38
+ .#{$teamix-pro-field}-colorradio,
39
+ .#{$teamix-pro-field}-range,
40
40
  .#{$css-prefix}btn-text {
41
41
  line-height: var(--form-element-medium-height, 32px);
42
42
  }
@@ -160,11 +160,11 @@
160
160
  margin-right: 4px;
161
161
  }
162
162
  }
163
- .teamix-pro-field-money button,
164
- .teamix-pro-field-icon button {
163
+ .#{$teamix-pro-field}-money button,
164
+ .#{$teamix-pro-field}-icon button {
165
165
  border: 0 !important;
166
166
  }
167
- .teamix-pro-field-color-swatch {
167
+ .#{$teamix-pro-field}-color-swatch {
168
168
  box-shadow: none !important;
169
169
  }
170
170
  .#{$css-prefix}date-picker2-input,
@@ -273,7 +273,7 @@
273
273
 
274
274
  /* hack todo remove */
275
275
  .#{$form-item-cls}-control-content-component {
276
- .teamix-pro-field-tooltip.teamix-pro-field-checkbox {
276
+ .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {
277
277
  .teamix-pro-lable-icon-tip-icon {
278
278
  transform: translate(0px, 4px);
279
279
  }
@@ -9,9 +9,9 @@ var _reactRouterDom = require("react-router-dom");
9
9
 
10
10
  var _utils = require("@teamix/utils");
11
11
 
12
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
12
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
13
13
 
14
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
14
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
15
15
 
16
16
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
17
17
 
@@ -9,9 +9,9 @@ var _react = require("@formily/react");
9
9
 
10
10
  var _utils = require("@teamix/utils");
11
11
 
12
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
12
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
13
13
 
14
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
14
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
15
15
 
16
16
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
17
17
 
@@ -7,6 +7,8 @@ exports.useFormDisplayValues = exports.getFormDisplayValues = void 0;
7
7
 
8
8
  var _react = require("@formily/react");
9
9
 
10
+ var _reactive = require("@formily/reactive");
11
+
10
12
  var _utils = require("@teamix/utils");
11
13
 
12
14
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -34,33 +36,63 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
34
36
  */
35
37
  var getDisplayValues = function getDisplayValues(form, values) {
36
38
  var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
37
- var displayValues; // 判断值的类型,递归获取每个值在该结构中的完整路径
39
+ var displayValues; // 拼接路径
40
+
41
+ var connectPath = function connectPath(path) {
42
+ return prefix ? "".concat(prefix, ".").concat(path) : "".concat(path);
43
+ }; // 根据值路径获取地址
44
+
45
+
46
+ var getAddress = function getAddress(path) {
47
+ return form.indexes[path];
48
+ }; // 判断布局、自增的值还是字段的值(字段值是对象、数组,内部的值特点为非数组、对象的叶子值,并且在form没有路径)
49
+
50
+
51
+ var isFieldValue = function isFieldValue(value, path) {
52
+ return !(0, _utils.isPlainObj)(value) && !(0, _utils.isArr)(value) && !getAddress(connectPath(path));
53
+ };
54
+
55
+ var isLayoutValue = function isLayoutValue(object) {
56
+ var _Object$entries$ = _slicedToArray(Object.entries(object)[0], 2),
57
+ key = _Object$entries$[0],
58
+ value = _Object$entries$[1];
38
59
 
39
- if ((0, _utils.isPlainObj)(values)) {
60
+ return !isFieldValue(value, key);
61
+ };
62
+
63
+ var isArrayValue = function isArrayValue(array) {
64
+ return !isFieldValue(array[0], 0);
65
+ }; // 判断值的类型,递归获取每个值在该结构中的完整路径
66
+
67
+
68
+ if ((0, _utils.isPlainObj)(values) && isLayoutValue(values)) {
69
+ // 如果值是对象且是布局对象的值
40
70
  displayValues = {};
41
71
  Object.entries(values).forEach(function (_ref) {
42
72
  var _ref2 = _slicedToArray(_ref, 2),
43
73
  key = _ref2[0],
44
74
  value = _ref2[1];
45
75
 
46
- var path = prefix ? "".concat(prefix, ".").concat(key) : "".concat(key);
47
- displayValues[key] = getDisplayValues(form, value, path);
76
+ displayValues[key] = getDisplayValues(form, value, connectPath(key));
48
77
  });
49
- } else if ((0, _utils.isArr)(values)) {
50
- displayValues = []; // todo 如果对象或数组的值不再是对象或数组,并且找不到路径,判断为非复合组件,直接返回原始值
51
-
78
+ } else if ((0, _utils.isArr)(values) && isArrayValue(values)) {
79
+ // 如果值是数组且是自增数组的值
80
+ displayValues = [];
52
81
  values.map(function (value, index) {
53
- var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
54
- displayValues[index] = getDisplayValues(form, value, path);
82
+ displayValues[index] = getDisplayValues(form, value, connectPath(index));
55
83
  });
56
84
  } else {
85
+ var _values$value;
86
+
57
87
  // 通过值的完整路径获取字段address(从form实例的indexes中),然后获取该字段的value在该字段dataSource中对应的label
58
- var address = form.indexes[prefix];
59
- var field = form.query(address).take();
88
+ var field = form.query(getAddress(prefix)).take();
89
+ var realValue = (_values$value = values === null || values === void 0 ? void 0 : values.value) !== null && _values$value !== void 0 ? _values$value : values; // 针对单个字段的值是对象
90
+
60
91
  displayValues = {
61
92
  title: field === null || field === void 0 ? void 0 : field.title,
62
- value: values,
63
- displayValue: (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, values)
93
+ component: field === null || field === void 0 ? void 0 : field.component[0],
94
+ value: realValue,
95
+ displayValue: (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, realValue)
64
96
  };
65
97
  }
66
98
 
@@ -69,13 +101,13 @@ var getDisplayValues = function getDisplayValues(form, values) {
69
101
 
70
102
  var useFormDisplayValues = function useFormDisplayValues() {
71
103
  var form = (0, _react.useForm)();
72
- return getDisplayValues(form, form.values);
104
+ return getDisplayValues(form, (0, _reactive.toJS)(form.values));
73
105
  };
74
106
 
75
107
  exports.useFormDisplayValues = useFormDisplayValues;
76
108
 
77
109
  var getFormDisplayValues = function getFormDisplayValues(form) {
78
- return getDisplayValues(form, form.values);
110
+ return getDisplayValues(form, (0, _reactive.toJS)(form.values));
79
111
  };
80
112
 
81
113
  exports.getFormDisplayValues = getFormDisplayValues;
@@ -7,9 +7,9 @@ exports.default = void 0;
7
7
 
8
8
  var _utils = require("@teamix/utils");
9
9
 
10
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
10
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
 
12
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
13
 
14
14
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
15
15
 
@@ -20,6 +20,7 @@ var typeMap = (_typeMap = {
20
20
  Percent: 'number',
21
21
  Money: 'number',
22
22
  Select: 'string',
23
+ MenuSelect: 'string',
23
24
  MultipleSelect: 'array',
24
25
  TreeSelect: 'string',
25
26
  Cascader: 'string',
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
4
 
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
@@ -21,7 +21,7 @@ var _Editable = require("../Components/Editable");
21
21
 
22
22
  var _FormGroup = _interopRequireDefault(require("../Components/FormGroup"));
23
23
 
24
- var _QueryFilter = _interopRequireDefault(require("../Components/QueryFilter"));
24
+ var _LightFilter = _interopRequireDefault(require("../Components/LightFilter"));
25
25
 
26
26
  var _index = _interopRequireDefault(require("../Components/Text/index"));
27
27
 
@@ -95,9 +95,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
95
95
 
96
96
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
97
97
 
98
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
98
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
99
99
 
100
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
100
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
101
101
 
102
102
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
103
103
 
@@ -130,9 +130,9 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
130
130
  EditableDrawer: _Editable.EditableDrawer,
131
131
  EditablePopover: _Editable.EditablePopover,
132
132
  FormGroup: _FormGroup.default,
133
- QueryFilter: _QueryFilter.default,
134
133
  Upload: _formily.Upload,
135
134
  Affix: _components.Affix,
135
+ LightFilter: _LightFilter.default,
136
136
  Text: _index.default
137
137
  })
138
138
  });
@@ -285,7 +285,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
285
285
  type: 'object',
286
286
  properties: formatSchema(schema)
287
287
  };
288
- }, []); // console.log(proFormSchema);
288
+ }, [schema]); // console.log(proFormSchema);
289
289
 
290
290
  return /*#__PURE__*/_react.default.createElement(SchemaField, {
291
291
  schema: proFormSchema,
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
8
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
9
 
10
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
10
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
11
11
 
12
12
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
13
13
 
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
8
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
9
 
10
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
10
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
11
11
 
12
12
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
13
13
 
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
8
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
9
 
10
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
10
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
11
11
 
12
12
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
13
13
 
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  var _excluded = ["title", "decoratorProps"];
8
8
 
9
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
9
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
10
10
 
11
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
11
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
12
12
 
13
13
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
14
14
 
@@ -13,9 +13,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
13
13
 
14
14
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
15
15
 
16
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
16
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
17
17
 
18
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
18
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19
19
 
20
20
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
21
21
 
@@ -7,9 +7,9 @@ exports.default = void 0;
7
7
  var _excluded = ["children", "title", "props"],
8
8
  _excluded2 = ["children"];
9
9
 
10
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
10
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
 
12
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
13
 
14
14
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
15
15
 
@@ -7,9 +7,9 @@ exports.default = void 0;
7
7
  var _excluded = ["props", "children", "title"],
8
8
  _excluded2 = ["props", "children"];
9
9
 
10
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
10
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
 
12
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
13
 
14
14
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
15
15
 
@@ -7,9 +7,9 @@ exports.default = void 0;
7
7
  var _excluded = ["props", "children", "title"],
8
8
  _excluded2 = ["col", "style"];
9
9
 
10
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
10
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
 
12
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
13
 
14
14
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
15
15
 
@@ -7,9 +7,9 @@ exports.default = void 0;
7
7
  var _excluded = ["props", "children", "title"],
8
8
  _excluded2 = ["props", "children"];
9
9
 
10
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
10
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
 
12
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
13
 
14
14
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
15
15
 
@@ -13,9 +13,9 @@ var _schemaNameMap = _interopRequireDefault(require("../schemaNameMap"));
13
13
 
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
 
16
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
16
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
17
17
 
18
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
18
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19
19
 
20
20
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
21
21
 
@@ -25,9 +25,9 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
25
25
 
26
26
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
27
27
 
28
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
28
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
29
29
 
30
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
30
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
31
31
 
32
32
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
33
33
 
@@ -7,9 +7,9 @@ exports.$validator = exports.$request = exports.$dataSource = exports.$context =
7
7
 
8
8
  var _utils = require("@teamix/utils");
9
9
 
10
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
10
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
 
12
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
13
 
14
14
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
15
15
 
@@ -68,11 +68,7 @@ var $dataSource = function $dataSource(services, onComplete, context) {
68
68
  readOnly: true
69
69
  });
70
70
  return services(field, context).then(function (res) {
71
- var _res$map;
72
-
73
- var isValueInDataSource = res === null || res === void 0 ? void 0 : (_res$map = res.map(function (v) {
74
- return v.value;
75
- })) === null || _res$map === void 0 ? void 0 : _res$map.includes(field.value);
71
+ var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
76
72
  var clearValue = isValueInDataSource ? {} : {
77
73
  value: undefined
78
74
  };
@@ -12,6 +12,7 @@ var fieldTypeMap = {
12
12
  Percent: 'percent',
13
13
  Money: 'money',
14
14
  Select: 'select',
15
+ MenuSelect: 'menuSelect',
15
16
  MultipleSelect: 'multipleSelect',
16
17
  TreeSelect: 'treeSelect',
17
18
  Cascader: 'cascader',
@@ -2,6 +2,7 @@
2
2
 
3
3
  $form-item-cls: #{$css-prefix}formily-item;
4
4
  $teamix-pro-form: teamix-pro-form;
5
+ $teamix-pro-field: teamix-pro-field;
5
6
 
6
7
  $inset-font-weight-medium: calc(
7
8
  var(--form-element-medium-height, 32px) - var(--input-border-width, 1px) * 2