@teamix/pro 1.2.31 → 1.2.35

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 (89) hide show
  1. package/dist/pro.css +1 -1
  2. package/dist/pro.js +16186 -16728
  3. package/dist/pro.min.css +1 -1
  4. package/dist/pro.min.js +1 -1
  5. package/es/actions/dialog-form.js +58 -9
  6. package/es/common.scss +22 -0
  7. package/es/form/Filter/index.d.ts +5 -9
  8. package/es/form/Filter/index.js +489 -152
  9. package/es/form/Filter/index.scss +33 -11
  10. package/es/form/Filter/index2.d.ts +9 -5
  11. package/es/form/Filter/index2.js +154 -370
  12. package/es/form/Filter/index2.scss +11 -33
  13. package/es/form/Filter/useSpecialProps.d.ts +1 -1
  14. package/es/form/Filter/useSpecialProps.js +9 -9
  15. package/es/form/ProForm/index.js +4 -4
  16. package/es/form/ProForm/index.scss +5 -0
  17. package/es/form/SchemaForm/index.js +5 -5
  18. package/es/form/SchemaForm/initializeDataSource.d.ts +1 -1
  19. package/es/form/SchemaForm/initializeDataSource.js +2 -2
  20. package/es/form/SchemaForm/initializeRequest.d.ts +1 -1
  21. package/es/form/SchemaForm/initializeRequest.js +41 -5
  22. package/es/form/SchemaForm/reactions.d.ts +3 -3
  23. package/es/form/SchemaForm/reactions.js +39 -19
  24. package/es/form/index.d.ts +3 -3
  25. package/es/form/index.js +3 -3
  26. package/es/form/typing.d.ts +7 -1
  27. package/es/index.d.ts +1 -1
  28. package/es/index.js +1 -1
  29. package/es/info/components/InfoValueItem/index.js +38 -12
  30. package/es/info/components/InfoValueItem/index.scss +1 -0
  31. package/es/info/components/ProInfoItem/index.js +6 -3
  32. package/es/info/components/ProInfoItem/index.scss +9 -0
  33. package/es/info/components/baseInfo/index.js +2 -1
  34. package/es/info/components/headerInfo/index.js +2 -1
  35. package/es/info/components/tableInfo/index.js +2 -1
  36. package/es/info/index.scss +2 -0
  37. package/es/info/typing.d.ts +3 -0
  38. package/es/page-header/index.js +3 -3
  39. package/es/table/components/Layout/index.js +29 -23
  40. package/es/table/components/Layout/index.scss +7 -0
  41. package/es/table/components/ToolBar/Fullscreen.js +39 -15
  42. package/es/table/components/ToolBar/index.scss +1 -0
  43. package/es/table/index.js +63 -40
  44. package/es/table/typing.d.ts +3 -0
  45. package/es/table/utils/columnRender.js +1 -1
  46. package/lib/actions/dialog-form.js +57 -10
  47. package/lib/common.scss +22 -0
  48. package/lib/form/Filter/index.d.ts +5 -9
  49. package/lib/form/Filter/index.js +504 -154
  50. package/lib/form/Filter/index.scss +33 -11
  51. package/lib/form/Filter/index2.d.ts +9 -5
  52. package/lib/form/Filter/index2.js +154 -383
  53. package/lib/form/Filter/index2.scss +11 -33
  54. package/lib/form/Filter/useSpecialProps.d.ts +1 -1
  55. package/lib/form/Filter/useSpecialProps.js +8 -8
  56. package/lib/form/ProForm/index.js +4 -4
  57. package/lib/form/ProForm/index.scss +5 -0
  58. package/lib/form/SchemaForm/index.js +5 -5
  59. package/lib/form/SchemaForm/initializeDataSource.d.ts +1 -1
  60. package/lib/form/SchemaForm/initializeDataSource.js +2 -2
  61. package/lib/form/SchemaForm/initializeRequest.d.ts +1 -1
  62. package/lib/form/SchemaForm/initializeRequest.js +41 -5
  63. package/lib/form/SchemaForm/reactions.d.ts +3 -3
  64. package/lib/form/SchemaForm/reactions.js +39 -19
  65. package/lib/form/index.d.ts +3 -3
  66. package/lib/form/index.js +8 -8
  67. package/lib/form/typing.d.ts +7 -1
  68. package/lib/index.d.ts +1 -1
  69. package/lib/index.js +1 -1
  70. package/lib/info/components/InfoValueItem/index.js +38 -12
  71. package/lib/info/components/InfoValueItem/index.scss +1 -0
  72. package/lib/info/components/ProInfoItem/index.js +6 -3
  73. package/lib/info/components/ProInfoItem/index.scss +9 -0
  74. package/lib/info/components/baseInfo/index.js +2 -1
  75. package/lib/info/components/headerInfo/index.js +2 -1
  76. package/lib/info/components/tableInfo/index.js +2 -1
  77. package/lib/info/index.scss +2 -0
  78. package/lib/info/typing.d.ts +3 -0
  79. package/lib/page-header/index.js +2 -2
  80. package/lib/table/components/Layout/index.js +29 -23
  81. package/lib/table/components/Layout/index.scss +7 -0
  82. package/lib/table/components/ToolBar/Fullscreen.js +37 -14
  83. package/lib/table/components/ToolBar/index.scss +1 -0
  84. package/lib/table/index.js +63 -40
  85. package/lib/table/typing.d.ts +3 -0
  86. package/lib/table/utils/columnRender.js +1 -1
  87. package/package.json +1 -1
  88. package/dist/212.js +0 -155705
  89. package/dist/fonts/codicon.ttf +0 -0
@@ -1,38 +1,8 @@
1
1
  @import '../global.scss';
2
2
 
3
- $query-filter: #{$teamix-pro-form}-query-filter;
4
-
5
- .#{$query-filter} {
6
- .#{$query-filter}-inline {
7
- margin-right: 8px;
8
- margin-bottom: 8px;
9
- }
10
- .#{$query-filter}-inline-hidden {
11
- display: none;
12
- }
13
- .#{$query-filter}-tag-title {
14
- margin-right: 12px;
15
- color: var(--color-text1-8, #848484);
16
- }
17
- .#{$query-filter}-tag-content {
18
- .#{$teamix-pro-field} {
19
- display: inline-block;
20
- .#{$css-prefix}form-preview {
21
- color: var(--color-text1-2, #5a5a5a);
22
- font-weight: bold;
23
- }
24
- }
25
- }
26
- }
27
-
28
- .#{$query-filter}-advanced {
29
- .#{$css-prefix}formily-button-group {
30
- margin-top: 0;
31
- }
32
- }
33
- .#{$query-filter}-advanced,
34
- .#{$query-filter}-simple,
35
- .#{$query-filter}-light {
3
+ // 筛选
4
+ .#{$teamix-pro-form}-filter-advanced,
5
+ .#{$teamix-pro-form}-filter-simple {
36
6
  .#{$form-item-cls}-feedback-layout-popover {
37
7
  margin-bottom: 0;
38
8
  }
@@ -45,3 +15,11 @@ $query-filter: #{$teamix-pro-form}-query-filter;
45
15
  }
46
16
  }
47
17
  }
18
+
19
+ // 筛选和抽屉按钮
20
+ .#{$teamix-pro-form}-filter-advanced,
21
+ .#{$css-prefix}drawer-footer {
22
+ .#{$css-prefix}formily-button-group {
23
+ margin-top: 0;
24
+ }
25
+ }
@@ -1,6 +1,6 @@
1
1
  declare const useSpecialProps: (props: any) => {
2
2
  hasDefault: boolean;
3
- hasAsyncDefault: boolean;
3
+ hasChangeDefault: boolean;
4
4
  hasRequired: boolean;
5
5
  };
6
6
  export default useSpecialProps;
@@ -11,8 +11,9 @@ var _utils = require("@teamix/utils");
11
11
  var useSpecialProps = function useSpecialProps(props) {
12
12
  var initialValues = props.initialValues,
13
13
  initialRequest = props.initialRequest;
14
- var hasDefault = !!initialValues;
15
- var hasAsyncDefault = !!initialRequest;
14
+ var hasChangeDefault = !!initialValues || !!initialRequest; // 会触发onChange的默认值
15
+
16
+ var hasDefault = hasChangeDefault;
16
17
  var hasRequired = false;
17
18
 
18
19
  var hasDefaultOrRule = function hasDefaultOrRule(schema) {
@@ -20,13 +21,12 @@ var useSpecialProps = function useSpecialProps(props) {
20
21
  var value = item.default,
21
22
  required = item.required,
22
23
  rules = item.rules,
23
- request = item.request,
24
24
  dataSource = item.dataSource,
25
- children = item.children;
26
- hasDefault = hasDefault || (0, _utils.isSignificative)(value);
25
+ children = item.children; // 字符串变量配置default值会触发onChange
26
+
27
+ hasChangeDefault = hasChangeDefault || !!((0, _utils.isPureObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
28
+ hasDefault = hasDefault || (0, _utils.isUsable)(value);
27
29
  hasRequired = hasRequired || required || !!rules;
28
- hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
29
- !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
30
30
 
31
31
  if (children === null || children === void 0 ? void 0 : children.length) {
32
32
  hasDefaultOrRule(children);
@@ -37,7 +37,7 @@ var useSpecialProps = function useSpecialProps(props) {
37
37
  hasDefaultOrRule(props.schema);
38
38
  return {
39
39
  hasDefault: hasDefault,
40
- hasAsyncDefault: hasAsyncDefault,
40
+ hasChangeDefault: hasChangeDefault,
41
41
  hasRequired: hasRequired
42
42
  };
43
43
  };
@@ -31,7 +31,7 @@ var _validate = _interopRequireDefault(require("../locales/validate"));
31
31
 
32
32
  require("./index.scss");
33
33
 
34
- var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "className"];
34
+ var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
35
35
 
36
36
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
37
37
 
@@ -68,6 +68,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
68
68
  onChange = _ref.onChange,
69
69
  onSubmit = _ref.onSubmit,
70
70
  onSubmitFailed = _ref.onSubmitFailed,
71
+ onInitialComplete = _ref.onInitialComplete,
71
72
  className = _ref.className,
72
73
  otherProps = _objectWithoutProperties(_ref, _excluded);
73
74
 
@@ -118,13 +119,12 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
118
119
  (0, _react.useEffect)(function () {
119
120
  if (initialValues) {
120
121
  form.setInitialValues(initialValues);
122
+ onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
121
123
  } else if (initialRequest) {
122
124
  (0, _useInitialRequest.default)(initialRequest).then(function (values) {
123
125
  form.setInitialValues(values);
124
126
  }).finally(function () {
125
- initialRequest.onComplete && initialRequest.onComplete(undefined, undefined, {
126
- form: form
127
- });
127
+ onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
128
128
  });
129
129
  }
130
130
  }, []); // 配置国际化
@@ -143,6 +143,11 @@
143
143
  height: $inset-font-weight-medium;
144
144
  line-height: $inset-font-weight-medium;
145
145
  }
146
+ .#{$css-prefix}select-multiple {
147
+ .#{$css-prefix}input.#{$css-prefix}medium {
148
+ height: auto;
149
+ }
150
+ }
146
151
  }
147
152
  }
148
153
  }
@@ -242,18 +242,18 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
242
242
  var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps); // 初始化request
243
243
 
244
244
 
245
- var _initializeRequest = (0, _initializeRequest2.default)(request, suffix),
245
+ var _initializeRequest = (0, _initializeRequest2.default)(request, "".concat(suffix, "r")),
246
246
  requestReactions = _initializeRequest.reactions,
247
- requestScope = _initializeRequest.scope; // 初始化dataSource
247
+ requestScope = _initializeRequest.scope; // 初始化dataSource,如果readPretty为字符串表达式将失去loading等状态,仍可配置dataSource
248
248
 
249
249
 
250
- var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, suffix),
250
+ var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d"), newItem.readPretty),
251
251
  defaultDataSource = _initializeDataSource.dataSource,
252
252
  dataSourceReactions = _initializeDataSource.reactions,
253
- dataSourceScope = _initializeDataSource.scope; // 初始化rules
253
+ dataSourceScope = _initializeDataSource.scope; // 初始化rules validator
254
254
 
255
255
 
256
- var _initializeRules = (0, _initializeRules2.default)(rules, suffix),
256
+ var _initializeRules = (0, _initializeRules2.default)(rules, "".concat(suffix, "v")),
257
257
  defaultRules = _initializeRules.rules,
258
258
  rulesScope = _initializeRules.scope; // 合并reactions,初始化reactions
259
259
 
@@ -1,6 +1,6 @@
1
1
  import type { ProFormRequestConfig } from '../typing';
2
2
  interface IInitializeDataSource {
3
- (requestConfig?: ProFormRequestConfig | any, suffix?: string): {
3
+ (requestConfig?: ProFormRequestConfig | any, suffix?: string, readPretty?: string | boolean): {
4
4
  dataSource?: any[];
5
5
  reactions: any[];
6
6
  scope: {
@@ -9,12 +9,12 @@ var _utils = require("@teamix/utils");
9
9
 
10
10
  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; }
11
11
 
12
- var initializeDataSource = function initializeDataSource(dataSource, suffix) {
12
+ var initializeDataSource = function initializeDataSource(dataSource, suffix, readPretty) {
13
13
  if ((0, _utils.isPlainObj)(dataSource)) {
14
14
  var requestConfig = dataSource;
15
15
  var requestConfigName = "$requestConfig_".concat(suffix);
16
16
  return {
17
- reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
17
+ reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context,").concat(readPretty, ")}}")],
18
18
  scope: _defineProperty({}, requestConfigName, requestConfig)
19
19
  };
20
20
  }
@@ -1,6 +1,6 @@
1
1
  import type { ProFormRequestConfig } from '../typing';
2
2
  interface IInitializeRequest {
3
- (requestConfig?: ProFormRequestConfig, suffix?: string): {
3
+ (requestConfig?: ProFormRequestConfig | ProFormRequestConfig[], suffix?: string): {
4
4
  reactions: any[];
5
5
  scope: {
6
6
  [x: string]: any;
@@ -5,15 +5,51 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
+ var _utils = require("@teamix/utils");
9
+
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
+
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
+
8
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; }
9
15
 
16
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
17
+
18
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
19
+
20
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
21
+
22
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
23
+
24
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
25
+
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
+
10
28
  var initializeRequest = function initializeRequest(requestConfig, suffix) {
11
29
  if (requestConfig) {
12
- var requestConfigName = "$requestConfig_".concat(suffix);
13
- return {
14
- reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
15
- scope: _defineProperty({}, requestConfigName, requestConfig)
16
- };
30
+ if ((0, _utils.isArr)(requestConfig)) {
31
+ var reactionsMap = [];
32
+ var scopeMap = {};
33
+ requestConfig.forEach(function (item, index) {
34
+ var _initializeRequest = initializeRequest(item, "".concat(suffix).concat(index)),
35
+ reactions = _initializeRequest.reactions,
36
+ scope = _initializeRequest.scope;
37
+
38
+ reactionsMap = [].concat(_toConsumableArray(reactionsMap), _toConsumableArray(reactions));
39
+ scopeMap = _objectSpread(_objectSpread({}, scopeMap), scope);
40
+ });
41
+ return {
42
+ reactions: reactionsMap,
43
+ scope: scopeMap
44
+ };
45
+ } else {
46
+ var requestConfigName = "$requestConfig_".concat(suffix);
47
+ var requestIndex = (/\d{1,}\w(\d{0,})/g.exec(suffix) || [])[1];
48
+ return {
49
+ reactions: ["{{$common($request,".concat(requestConfigName, ",context,").concat(requestIndex, ")}}")],
50
+ scope: _defineProperty({}, requestConfigName, requestConfig)
51
+ };
52
+ }
17
53
  }
18
54
 
19
55
  return {
@@ -1,6 +1,6 @@
1
1
  import type { ProFormRequestConfig } from '../typing';
2
- declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any) => Promise<unknown>;
3
- declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
2
+ declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: string | number) => Promise<unknown>;
3
+ declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any, index: string) => (field: any) => any;
4
4
  declare const $validator: (services: any, requestConfig: ProFormRequestConfig, context: any) => (value: any, rules: any, { field }: any) => any;
5
- declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
5
+ declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any, readPretty: any) => (field: any) => any;
6
6
  export { $request, $common, $dataSource, $validator };
@@ -14,10 +14,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
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
 
16
16
  // 配置请求
17
- var $request = function $request(field, requestConfig, context) {
17
+ var $request = function $request(field, requestConfig, context, type) {
18
18
  var _field$data;
19
19
 
20
- var refresh = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
20
+ // let refresh
21
+ // if(isStr(type)){
22
+ // refresh = field.data?.refreshMap?.[type]
23
+ // }else if(isNum(type)){
24
+ // }else{
25
+ // refresh = field.data?.refresh;
26
+ // }
27
+ var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
21
28
  var beforeRequest = requestConfig.beforeRequest,
22
29
  onSuccess = requestConfig.onSuccess;
23
30
  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
@@ -36,9 +43,9 @@ var $request = function $request(field, requestConfig, context) {
36
43
 
37
44
  exports.$request = $request;
38
45
 
39
- var $common = function $common(services, requestConfig, context) {
46
+ var $common = function $common(services, requestConfig, context, index) {
40
47
  return function (field) {
41
- return services(field, requestConfig, context).then(function (res) {
48
+ return services(field, requestConfig, context, index || 'common').then(function (res) {
42
49
  return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
43
50
  });
44
51
  };
@@ -50,7 +57,7 @@ exports.$common = $common;
50
57
  var $validator = function $validator(services, requestConfig, context) {
51
58
  return function (value, rules, _ref) {
52
59
  var field = _ref.field;
53
- return services(field, requestConfig, context).then(function (res) {
60
+ return services(field, requestConfig, context, 'validator').then(function (res) {
54
61
  return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
55
62
  });
56
63
  };
@@ -59,28 +66,41 @@ var $validator = function $validator(services, requestConfig, context) {
59
66
 
60
67
  exports.$validator = $validator;
61
68
 
62
- var $dataSource = function $dataSource(services, requestConfig, context) {
69
+ var $dataSource = function $dataSource(services, requestConfig, context, readPretty) {
63
70
  return function (field) {
64
- field.setState({
65
- loading: true,
66
- readOnly: true
67
- });
71
+ if (!readPretty) {
72
+ field.setState({
73
+ loading: true,
74
+ readOnly: true
75
+ });
76
+ }
77
+
68
78
  return services(field, requestConfig, context).then(function (res) {
69
79
  var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
70
80
  var clearValue = isValueInDataSource ? {} : {
71
81
  value: undefined
72
82
  };
73
- field.setState(_objectSpread({
74
- dataSource: res,
75
- loading: false,
76
- readOnly: false
77
- }, clearValue));
83
+
84
+ if (!readPretty) {
85
+ field.setState(_objectSpread({
86
+ dataSource: res,
87
+ loading: false,
88
+ readOnly: false
89
+ }, clearValue));
90
+ } else {
91
+ field.setState({
92
+ dataSource: res
93
+ });
94
+ }
95
+
78
96
  return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
79
97
  }).catch(function () {
80
- field.setState({
81
- loading: false,
82
- readOnly: false
83
- });
98
+ if (!readPretty) {
99
+ field.setState({
100
+ loading: false,
101
+ readOnly: false
102
+ });
103
+ }
84
104
  });
85
105
  };
86
106
  };
@@ -109,10 +109,10 @@ export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, Fo
109
109
  /**
110
110
  * 导出 Filter 组件
111
111
  */
112
- import { AdvancedFilter, SimpleFilter } from './Filter';
113
- import { QueryFilter } from './Filter/index2';
112
+ import { QueryFilter } from './Filter';
114
113
  import { QueryFilterLayout } from './Filter/Layout';
115
- export { AdvancedFilter, SimpleFilter, QueryFilter, QueryFilterLayout };
114
+ import { AdvancedFilter, SimpleFilter } from './Filter/index2';
115
+ export { QueryFilter, QueryFilterLayout, AdvancedFilter, SimpleFilter };
116
116
  /**
117
117
  * 导出 ProForm 组件,支持快速搭建表单
118
118
  */
package/lib/form/index.js CHANGED
@@ -23,15 +23,15 @@ var _exportNames = {
23
23
  FormConsumer: true,
24
24
  useForm: true,
25
25
  customComponent: true,
26
- AdvancedFilter: true,
27
- SimpleFilter: true,
28
26
  QueryFilter: true,
29
- QueryFilterLayout: true
27
+ QueryFilterLayout: true,
28
+ AdvancedFilter: true,
29
+ SimpleFilter: true
30
30
  };
31
31
  Object.defineProperty(exports, "AdvancedFilter", {
32
32
  enumerable: true,
33
33
  get: function get() {
34
- return _Filter.AdvancedFilter;
34
+ return _index.AdvancedFilter;
35
35
  }
36
36
  });
37
37
  Object.defineProperty(exports, "FormCollapse", {
@@ -73,7 +73,7 @@ Object.defineProperty(exports, "FormTab", {
73
73
  Object.defineProperty(exports, "QueryFilter", {
74
74
  enumerable: true,
75
75
  get: function get() {
76
- return _index.QueryFilter;
76
+ return _Filter.QueryFilter;
77
77
  }
78
78
  });
79
79
  Object.defineProperty(exports, "QueryFilterLayout", {
@@ -85,7 +85,7 @@ Object.defineProperty(exports, "QueryFilterLayout", {
85
85
  Object.defineProperty(exports, "SimpleFilter", {
86
86
  enumerable: true,
87
87
  get: function get() {
88
- return _Filter.SimpleFilter;
88
+ return _index.SimpleFilter;
89
89
  }
90
90
  });
91
91
  Object.defineProperty(exports, "createForm", {
@@ -168,10 +168,10 @@ var _customComponent = require("./ProForm/customComponent");
168
168
 
169
169
  var _Filter = require("./Filter");
170
170
 
171
- var _index = require("./Filter/index2");
172
-
173
171
  var _Layout = require("./Filter/Layout");
174
172
 
173
+ var _index = require("./Filter/index2");
174
+
175
175
  var _ProForm = _interopRequireDefault(require("./ProForm"));
176
176
 
177
177
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -44,7 +44,7 @@ export interface ProFormSchemaItem {
44
44
  readPretty?: boolean | string;
45
45
  pattern?: FieldPatternTypes;
46
46
  default?: any;
47
- request?: ProFormRequestConfig;
47
+ request?: ProFormRequestConfig | ProFormRequestConfig[];
48
48
  data?: AnyObject;
49
49
  }
50
50
  export declare type ProFormSchema = ProFormSchemaItem[];
@@ -63,6 +63,7 @@ export interface ProFormProps extends IFormLayoutProps {
63
63
  onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
64
64
  onSubmit?: ((values: any) => any) | CommonRequestConfig;
65
65
  onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
66
+ onInitialComplete?: (form: FormType) => void;
66
67
  }
67
68
  export interface FilterProps extends ProFormProps {
68
69
  form: FormType;
@@ -88,6 +89,8 @@ export interface QueryFilterProps extends ProFormProps {
88
89
  triggerType?: 'keydown' | 'change' | 'submit';
89
90
  /** 表单展示形式 */
90
91
  mode?: 'inline' | 'panel';
92
+ /** 面板模式下是否仅展示面板 */
93
+ purePanel?: boolean;
91
94
  /** 面板是否默认展开,仅在 mode='panel' 时生效 */
92
95
  expand?: boolean;
93
96
  /** 顶部筛选区前缀 */
@@ -112,6 +115,9 @@ export interface QueryFilterProps extends ProFormProps {
112
115
  /**
113
116
  * 兼容性导出
114
117
  */
118
+ /**
119
+ * @deprecated 将在未来移除该组件,建议使用 QueryFilter 代替
120
+ */
115
121
  export interface IFilterProps extends ProFormProps {
116
122
  triggerType?: 'keydown' | 'change' | 'submit';
117
123
  onFilter?: (values: any) => void;
package/lib/index.d.ts CHANGED
@@ -24,5 +24,5 @@ export * from './skeleton';
24
24
  export * from './table';
25
25
  export * from './utils';
26
26
  export * from './step';
27
- declare const version = "1.2.31";
27
+ declare const version = "1.2.35";
28
28
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };
package/lib/index.js CHANGED
@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
285
285
  // 设置图标源
286
286
  _icon.default.setConfig(_utils.default.getTeamixIconConfig());
287
287
 
288
- var version = '1.2.31';
288
+ var version = '1.2.35';
289
289
  exports.version = version;
@@ -25,7 +25,7 @@ var _components = require("@alicloudfe/components");
25
25
 
26
26
  var _actions = require("../../../actions");
27
27
 
28
- var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource", "context"];
28
+ var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource", "context", "props"];
29
29
 
30
30
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
31
31
 
@@ -41,12 +41,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
41
41
 
42
42
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
43
43
 
44
- 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; }
45
-
46
- 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; }
47
-
48
- 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; }
49
-
50
44
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
51
45
 
52
46
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -59,6 +53,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
59
53
 
60
54
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
61
55
 
56
+ 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; }
57
+
58
+ 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; }
59
+
60
+ 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; }
61
+
62
62
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
63
63
 
64
64
  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; }
@@ -76,6 +76,7 @@ var InfoValueItem = function InfoValueItem(props) {
76
76
  actionRef = props.actionRef,
77
77
  dataSource = props.dataSource,
78
78
  context = props.context,
79
+ fieldProps = props.props,
79
80
  others = _objectWithoutProperties(props, _excluded);
80
81
 
81
82
  var dataIndex = infoItem.dataIndex,
@@ -89,7 +90,8 @@ var InfoValueItem = function InfoValueItem(props) {
89
90
  _infoItem$successMess = infoItem.successMessage,
90
91
  successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
91
92
  actions = infoItem.actions,
92
- extra = infoItem.extra; // 获取处理过的 render
93
+ extra = infoItem.extra,
94
+ valueType = infoItem.valueType; // 获取处理过的 render
93
95
 
94
96
  var getRender = function getRender() {
95
97
  var _processRenderFunctio;
@@ -101,7 +103,31 @@ var InfoValueItem = function InfoValueItem(props) {
101
103
  }
102
104
 
103
105
  var newRender = processBuriedPoint((_processRenderFunctio = processRenderFunction(render !== null && render !== void 0 ? render : {}, value, record)) !== null && _processRenderFunctio !== void 0 ? _processRenderFunctio : {}, value, record);
106
+
107
+ if (valueType === 'selectGroup') {
108
+ newRender = _objectSpread(_objectSpread({
109
+ maxShowNumber: 'auto',
110
+ foldText: 'more'
111
+ }, newRender), {}, {
112
+ ellipsis: false
113
+ });
114
+ }
115
+
104
116
  return newRender;
117
+ };
118
+
119
+ var getFieldProps = function getFieldProps() {
120
+ if (valueType === 'selectGroup') {
121
+ return _objectSpread({
122
+ valueAlias: {
123
+ value: 'TagValue',
124
+ key: 'TagKey'
125
+ },
126
+ layout: 'compact'
127
+ }, fieldProps);
128
+ }
129
+
130
+ return fieldProps;
105
131
  }; // 获取处理过的 dataSource
106
132
 
107
133
 
@@ -300,12 +326,12 @@ var InfoValueItem = function InfoValueItem(props) {
300
326
  onMouseLeave: function onMouseLeave() {
301
327
  setEditVisible(false);
302
328
  }
303
- }, /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread({
329
+ }, /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread(_objectSpread({
304
330
  type: type,
305
331
  value: value,
306
332
  render: getRender(),
307
333
  dataSource: getDataSource()
308
- }, others)), /*#__PURE__*/_react.default.createElement(_popConfirm.default, {
334
+ }, others), getFieldProps())), /*#__PURE__*/_react.default.createElement(_popConfirm.default, {
309
335
  visible: popConfirmVisible,
310
336
  content: renderContent(),
311
337
  triggerType: "click",
@@ -332,12 +358,12 @@ var InfoValueItem = function InfoValueItem(props) {
332
358
 
333
359
  return /*#__PURE__*/_react.default.createElement("div", {
334
360
  className: cls('item-value')
335
- }, /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread({
361
+ }, /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread(_objectSpread({
336
362
  type: type,
337
363
  value: value,
338
364
  render: getRender(),
339
365
  dataSource: getDataSource()
340
- }, others)), renderAction(), extra && extra);
366
+ }, others), getFieldProps())), renderAction(), extra && extra);
341
367
  };
342
368
 
343
369
  var _default = InfoValueItem;
@@ -20,6 +20,7 @@
20
20
  &-item-value {
21
21
  display: flex;
22
22
  align-items: center;
23
+ width: 100%;
23
24
  }
24
25
 
25
26
  }
@@ -36,7 +36,8 @@ var ProInfoItem = function ProInfoItem(prop) {
36
36
  return /*#__PURE__*/_react.default.createElement("div", {
37
37
  className: cls()
38
38
  }, /*#__PURE__*/_react.default.createElement(Row, {
39
- gutter: 10
39
+ gutter: 10,
40
+ className: cls('base-row')
40
41
  }, /*#__PURE__*/_react.default.createElement(Col, {
41
42
  span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
42
43
  className: cls('label')
@@ -51,7 +52,7 @@ var ProInfoItem = function ProInfoItem(prop) {
51
52
  className: cls('value')
52
53
  }, loading && /*#__PURE__*/_react.default.createElement("div", {
53
54
  className: cls('base-skeleton-box')
54
- }, /*#__PURE__*/_react.default.createElement(_.ProSkeletonRaw.Info.Item, null)), !loading && /*#__PURE__*/_react.default.createElement("div", null, value))));
55
+ }, /*#__PURE__*/_react.default.createElement(_.ProSkeletonRaw.Info.Item, null)), !loading && value)));
55
56
  }
56
57
 
57
58
  if (headerInfoLayout) {
@@ -59,7 +60,9 @@ var ProInfoItem = function ProInfoItem(prop) {
59
60
  labelGutter = _headerInfoLayout$lab === void 0 ? '16px' : _headerInfoLayout$lab;
60
61
  return /*#__PURE__*/_react.default.createElement("div", {
61
62
  className: cls()
62
- }, /*#__PURE__*/_react.default.createElement(Row, null, /*#__PURE__*/_react.default.createElement("div", {
63
+ }, /*#__PURE__*/_react.default.createElement(Row, {
64
+ className: cls('header-row')
65
+ }, /*#__PURE__*/_react.default.createElement("div", {
63
66
  className: cls('header-label')
64
67
  }, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
65
68
  label: label,