@zat-design/sisyphus-react 3.2.1-beta.2 → 3.2.1-beta.4

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 (33) hide show
  1. package/dist/index.esm.css +3 -3
  2. package/es/ProDownload/utils.js +2 -0
  3. package/es/ProForm/components/render/Render.js +8 -3
  4. package/es/ProForm/components/render/RenderFields.js +5 -7
  5. package/es/ProForm/style/index.less +2 -2
  6. package/es/ProForm/utils/contrastOriginal.d.ts +10 -1
  7. package/es/ProForm/utils/contrastOriginal.js +15 -18
  8. package/es/ProForm/utils/useChanged.d.ts +15 -1
  9. package/es/ProForm/utils/useChanged.js +25 -7
  10. package/es/ProTabs/style/index.less +1 -1
  11. package/es/ProTree/style/index.less +0 -6
  12. package/lib/ProEditTable/components/RenderField/index.js +2 -0
  13. package/lib/ProForm/components/base/RangePicker/index.js +1 -1
  14. package/lib/ProForm/components/old/InputRange/index.js +0 -1
  15. package/lib/ProForm/components/old/ProCertValidity/index.js +1 -1
  16. package/lib/ProForm/components/render/Render.js +9 -3
  17. package/lib/ProForm/components/render/RenderFields.js +5 -7
  18. package/lib/ProForm/style/index.less +2 -2
  19. package/lib/ProForm/utils/contrastOriginal.d.ts +10 -1
  20. package/lib/ProForm/utils/contrastOriginal.js +14 -17
  21. package/lib/ProForm/utils/useChanged.d.ts +15 -1
  22. package/lib/ProForm/utils/useChanged.js +25 -7
  23. package/lib/ProTable/components/TableResizable/index.js +8 -0
  24. package/lib/ProTabs/index.js +1 -0
  25. package/lib/ProTabs/style/index.less +1 -1
  26. package/lib/ProThemeTools/index.js +1 -0
  27. package/lib/ProTree/components/Tree.js +7 -0
  28. package/lib/ProTree/index.js +0 -1
  29. package/lib/ProTree/style/index.less +0 -6
  30. package/lib/ProTreeModal/components/Tree.js +1 -0
  31. package/lib/ProUpload/index.js +7 -0
  32. package/lib/old/ProCertValidity/index.js +1 -1
  33. package/package.json +1 -1
@@ -1509,7 +1509,7 @@
1509
1509
  width: 48px;
1510
1510
  }
1511
1511
  .pro-tabs .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
1512
- padding: 0;
1512
+ padding: 0 !important;
1513
1513
  }
1514
1514
  .pro-tabs .ant-tabs-top > .ant-tabs-nav::before,
1515
1515
  .pro-tabs .ant-tabs-bottom > .ant-tabs-nav::before,
@@ -2470,7 +2470,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2470
2470
  width: 100%;
2471
2471
  }
2472
2472
  .pro-form .expand-button {
2473
- line-height: calc(var(--zaui-space-card, 32px) * var(--zaui-size, 1));
2473
+ line-height: 32px;
2474
2474
  cursor: pointer;
2475
2475
  }
2476
2476
  .pro-form .expand-button .rotate-to-top {
@@ -2632,7 +2632,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2632
2632
  }
2633
2633
  .pro-form div.pro-form-custom-footer {
2634
2634
  width: unset !important;
2635
- height: calc(var(--zaui-space-card, 32px) * var(--zaui-size, 1));
2635
+ height: 32px;
2636
2636
  margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
2637
2637
  }
2638
2638
  .pro-form div.pro-form-custom-footer.pro-form-custom-footer-hidden {
@@ -4,6 +4,8 @@ import _message from "antd/es/message";
4
4
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
5
5
  import _typeof from "@babel/runtime/helpers/esm/typeof";
6
6
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
7
+ /* eslint-disable no-empty */
8
+ /* eslint-disable prefer-promise-reject-errors */
7
9
  import { isFunction, get } from 'lodash';
8
10
  import locale from '../locale';
9
11
  var stringify = function stringify(data) {
@@ -71,7 +71,6 @@ var Render = function Render(props) {
71
71
  disabled: componentProps.disabled,
72
72
  rules: rules,
73
73
  required: required,
74
- componentProps: componentProps,
75
74
  fieldProps: fieldProps,
76
75
  component: component,
77
76
  originComponent: originComponent,
@@ -82,7 +81,6 @@ var Render = function Render(props) {
82
81
  _disabled = _useShouldUpdate.disabled,
83
82
  _rules = _useShouldUpdate.rules,
84
83
  _required = _useShouldUpdate.required,
85
- _componentProps = _useShouldUpdate.componentProps,
86
84
  _fieldProps = _useShouldUpdate.fieldProps,
87
85
  AutoComponent = _useShouldUpdate.component;
88
86
  otherFormItemProps.shouldUpdate = shouldUpdate;
@@ -100,7 +98,14 @@ var Render = function Render(props) {
100
98
  }).join('-');
101
99
  }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
102
100
  // 判断当前字段是否变更
103
- var _useChanged = useChanged(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith),
101
+ var _useChanged = useChanged({
102
+ name: formItemProps.name,
103
+ names: otherProps.names,
104
+ namesStr: namesStr,
105
+ originalValues: originalValues,
106
+ form: form,
107
+ equalWith: equalWith
108
+ }),
104
109
  _useChanged2 = _slicedToArray(_useChanged, 2),
105
110
  changed = _useChanged2[0],
106
111
  originalValue = _useChanged2[1];
@@ -120,10 +120,10 @@ var RenderFields = function RenderFields(props) {
120
120
  }
121
121
  }
122
122
  var label = formItemChildProps.label,
123
- comDisabled = formItemChildProps.disabled,
124
123
  placeholder = formItemChildProps.placeholder,
125
124
  dataSource = formItemChildProps.dataSource;
126
125
  var formLabel = _formItemProps.label;
126
+ var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
127
127
  var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
128
128
  // 当前组件是不是一个选择组件
129
129
  var _isSelect = isSelect({
@@ -132,17 +132,15 @@ var RenderFields = function RenderFields(props) {
132
132
  });
133
133
  var _placeholder = placeholder || "".concat(_isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(label || formLabel || '');
134
134
  // 表单组件Props 兼容2.0版本
135
- var _fieldProps = _objectSpread(_objectSpread({
136
- disabled: disabled
137
- }, formItemChildProps), fieldProps);
135
+ var _fieldProps = _objectSpread(_objectSpread({}, formItemChildProps), fieldProps);
138
136
  if (isBoolean(formDisabled)) {
139
137
  _fieldProps.disabled = formDisabled;
140
138
  }
141
- var componentProps = _objectSpread({
139
+ var componentProps = _objectSpread(_objectSpread({}, _fieldProps), {}, {
142
140
  disabled: _disabled,
143
141
  placeholder: _placeholder,
144
142
  disabledStrictly: true
145
- }, _fieldProps);
143
+ });
146
144
  // switch与SwitchCheckbox单独添加valuePropName
147
145
  if (['Switch', 'SwitchCheckbox'].includes(_type)) {
148
146
  _formItemProps.valuePropName = 'checked';
@@ -160,7 +158,7 @@ var RenderFields = function RenderFields(props) {
160
158
  var otherProps = {
161
159
  label: _formItemProps.label,
162
160
  name: _formItemProps.name,
163
- disabled: formDisabled,
161
+ disabled: _disabled,
164
162
  isView: _isView,
165
163
  viewEmpty: viewEmpty,
166
164
  valueType: valueType,
@@ -89,7 +89,7 @@
89
89
 
90
90
  // 展开折叠按钮
91
91
  .expand-button {
92
- line-height: @zaui-space-card;
92
+ line-height: 32px;
93
93
  cursor: pointer;
94
94
 
95
95
  .rotate-to-top {
@@ -298,7 +298,7 @@
298
298
 
299
299
  div.pro-form-custom-footer {
300
300
  width: unset !important;
301
- height: @zaui-space-card;
301
+ height:32px;
302
302
  margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
303
303
 
304
304
  &.pro-form-custom-footer-hidden {
@@ -1 +1,10 @@
1
- export declare const contrastOriginal: (name: any, names: any, originValues: any, currentValue: any, fun: any) => any;
1
+ import { FormInstance } from 'antd';
2
+ interface Params {
3
+ originalValues: any;
4
+ originalValue: any;
5
+ value: any;
6
+ form: FormInstance;
7
+ equalWith?: (originalValue: any, currentValue: any) => boolean;
8
+ }
9
+ export declare const contrastOriginal: (params: Params) => boolean;
10
+ export {};
@@ -1,28 +1,25 @@
1
- import { get, isEqual, isFunction } from 'lodash';
1
+ import { isEqual, isFunction } from 'lodash';
2
2
  var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
3
- export var contrastOriginal = function contrastOriginal(name, names, originValues, currentValue, fun) {
3
+ export var contrastOriginal = function contrastOriginal(params) {
4
+ var originalValue = params.originalValue,
5
+ originalValues = params.originalValues,
6
+ value = params.value,
7
+ equalWith = params.equalWith;
4
8
  // 支持传入自定义比较事件
5
- if (isFunction(fun)) {
6
- if (names === null || names === void 0 ? void 0 : names.length) {
7
- var originVal = names.map(function (key) {
8
- return get(originValues, key);
9
- });
10
- return !fun(originVal, currentValue);
11
- }
12
- return !fun(get(originValues, name), currentValue);
9
+ if (isFunction(equalWith)) {
10
+ return !equalWith(originalValue, value);
13
11
  }
14
- if (names === null || names === void 0 ? void 0 : names.length) {
15
- return names.some(function (nameItem, index) {
16
- var originalValue = get(originValues, nameItem);
17
- if (!nullValue.includes(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index]) || !nullValue.includes(originalValue)) {
18
- return !isEqual(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index], get(originValues, nameItem));
12
+ if (Array.isArray(originalValue)) {
13
+ return originalValue.some(function (valueItem, index) {
14
+ // 如果两个值有一个不是空值, 则进行深比较
15
+ if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
16
+ return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
19
17
  }
20
18
  return false;
21
19
  });
22
20
  }
23
- var originalValue = get(originValues, name);
24
- if (!nullValue.includes(currentValue) || !nullValue.includes(originalValue)) {
25
- return !isEqual(currentValue, get(originValues, name));
21
+ if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
22
+ return !isEqual(value, originalValue);
26
23
  }
27
24
  return false;
28
25
  };
@@ -1 +1,15 @@
1
- export declare const useChanged: (name: any, names: any, nameStr: any, originalValues: any, form: any, fun: any) => any[];
1
+ import { FormInstance } from 'antd';
2
+ import { NamePath } from 'antd/lib/form/interface';
3
+ interface Params {
4
+ name?: NamePath;
5
+ names?: NamePath[];
6
+ namesStr?: NamePath;
7
+ originalName?: NamePath;
8
+ originalNames?: NamePath[];
9
+ originalNameStr?: NamePath;
10
+ originalValues: any;
11
+ form: FormInstance;
12
+ equalWith?: (originalValue: any, currentValue: any) => boolean;
13
+ }
14
+ export declare const useChanged: (params: Params) => any[];
15
+ export {};
@@ -2,14 +2,32 @@ import "antd/es/form/style";
2
2
  import _Form from "antd/es/form";
3
3
  import { get } from 'lodash';
4
4
  import { contrastOriginal } from './contrastOriginal';
5
- export var useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
6
- var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
7
- return get(originalValues, name);
8
- }) : get(originalValues, name);
5
+ export var useChanged = function useChanged(params) {
6
+ var name = params.name,
7
+ names = params.names,
8
+ namesStr = params.namesStr,
9
+ _params$originalName = params.originalName,
10
+ originalName = _params$originalName === void 0 ? name : _params$originalName,
11
+ _params$originalNames = params.originalNames,
12
+ originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
13
+ originalValues = params.originalValues,
14
+ form = params.form,
15
+ equalWith = params.equalWith;
16
+ var _form = form;
17
+ var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
18
+ return get(originalValues, originalName);
19
+ }) : get(originalValues, originalName);
9
20
  var notWatch = !originalValues || originalValue === undefined;
10
- if (notWatch) form = [];
11
- var value = _Form.useWatch(nameStr || name, form);
21
+ // @ts-ignore
22
+ if (notWatch) _form = [];
23
+ var value = _Form.useWatch(namesStr || name, _form);
12
24
  if (notWatch) return [false];
13
- var changed = contrastOriginal(name, names, originalValues, value, fun);
25
+ var changed = contrastOriginal({
26
+ value: value,
27
+ originalValue: originalValue,
28
+ originalValues: originalValues,
29
+ form: form,
30
+ equalWith: equalWith
31
+ });
14
32
  return [changed, originalValue];
15
33
  };
@@ -1,6 +1,6 @@
1
1
  .pro-tabs {
2
2
  .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
3
- padding: 0;
3
+ padding: 0 !important;
4
4
  }
5
5
 
6
6
  .ant-tabs-top>.ant-tabs-nav::before,
@@ -315,12 +315,6 @@
315
315
  }
316
316
  }
317
317
 
318
- // 中意全局样式覆盖
319
- // .pro-form.pro-form-view .ant-form-item * {
320
- // line-height: 1!important;
321
- // height: auto!important;
322
- // min-height: auto!important;
323
- // }
324
318
  // 重置ant-form view模式样式ant-tree样式
325
319
  .pro-form.pro-form-view .ant-form-item .pro-tree * {
326
320
  line-height: 1 !important;
@@ -26,6 +26,8 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
26
26
  var _utils = require("../../../ProForm/utils");
27
27
  var _locale = _interopRequireDefault(require("../../../locale"));
28
28
  var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules"];
29
+ /* eslint-disable prefer-destructuring */
30
+ /* eslint-disable prefer-const */
29
31
  var RenderField = function RenderField(_ref) {
30
32
  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
31
33
  var value = _ref.text,
@@ -14,7 +14,7 @@ var _moment = _interopRequireDefault(require("moment"));
14
14
  var _ProConfigProvider = require("../../../../ProConfigProvider");
15
15
  var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
16
16
  var _Container = _interopRequireDefault(require("../../Container"));
17
- var _excluded = ["format", "otherProps", "separator"];
17
+ var _excluded = ["format", "otherProps", "separator"]; // @ts-check
18
18
  var AntRangePicker = _antd.DatePicker.RangePicker;
19
19
  var RangePicker = function RangePicker(props) {
20
20
  var _props$format = props.format,
@@ -13,7 +13,6 @@ var _antd = require("antd");
13
13
  var _classnames = _interopRequireDefault(require("classnames"));
14
14
  /* eslint-disable @typescript-eslint/no-shadow */
15
15
  /* eslint-disable no-param-reassign */
16
-
17
16
  var positiveInteger = {
18
17
  formatter: function formatter(value) {
19
18
  return value.replace(/[^0-9]/g, '');
@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
11
11
  var _antd = require("antd");
12
12
  var _moment = _interopRequireDefault(require("moment"));
13
13
  var _react = require("react");
14
- var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
14
+ var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
15
15
  var RangePicker = _antd.DatePicker.RangePicker;
16
16
  var defaultFormatDate = 'YYYY-MM-DD';
17
17
  var defaultPopupContainer = function defaultPopupContainer(triggerNode) {
@@ -28,6 +28,7 @@ var _useChanged3 = require("../../utils/useChanged");
28
28
  var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
29
29
  var _useRules = _interopRequireDefault(require("../../utils/useRules"));
30
30
  var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
31
+ /* eslint-disable prefer-destructuring */
31
32
  // 这个组件只管渲染, 参数的整理在外部处理
32
33
  var Render = function Render(props) {
33
34
  var _classNames, _otherProps$names2;
@@ -68,7 +69,6 @@ var Render = function Render(props) {
68
69
  disabled: componentProps.disabled,
69
70
  rules: rules,
70
71
  required: required,
71
- componentProps: componentProps,
72
72
  fieldProps: fieldProps,
73
73
  component: component,
74
74
  originComponent: originComponent,
@@ -79,7 +79,6 @@ var Render = function Render(props) {
79
79
  _disabled = _useShouldUpdate.disabled,
80
80
  _rules = _useShouldUpdate.rules,
81
81
  _required = _useShouldUpdate.required,
82
- _componentProps = _useShouldUpdate.componentProps,
83
82
  _fieldProps = _useShouldUpdate.fieldProps,
84
83
  AutoComponent = _useShouldUpdate.component;
85
84
  otherFormItemProps.shouldUpdate = shouldUpdate;
@@ -97,7 +96,14 @@ var Render = function Render(props) {
97
96
  }).join('-');
98
97
  }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
99
98
  // 判断当前字段是否变更
100
- var _useChanged = (0, _useChanged3.useChanged)(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith),
99
+ var _useChanged = (0, _useChanged3.useChanged)({
100
+ name: formItemProps.name,
101
+ names: otherProps.names,
102
+ namesStr: namesStr,
103
+ originalValues: originalValues,
104
+ form: form,
105
+ equalWith: equalWith
106
+ }),
101
107
  _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
102
108
  changed = _useChanged2[0],
103
109
  originalValue = _useChanged2[1];
@@ -128,10 +128,10 @@ var RenderFields = function RenderFields(props) {
128
128
  }
129
129
  }
130
130
  var label = formItemChildProps.label,
131
- comDisabled = formItemChildProps.disabled,
132
131
  placeholder = formItemChildProps.placeholder,
133
132
  dataSource = formItemChildProps.dataSource;
134
133
  var formLabel = _formItemProps.label;
134
+ var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
135
135
  var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
136
136
  // 当前组件是不是一个选择组件
137
137
  var _isSelect = (0, _utils.isSelect)({
@@ -140,17 +140,15 @@ var RenderFields = function RenderFields(props) {
140
140
  });
141
141
  var _placeholder = placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(label || formLabel || '');
142
142
  // 表单组件Props 兼容2.0版本
143
- var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
144
- disabled: disabled
145
- }, formItemChildProps), fieldProps);
143
+ var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
146
144
  if ((0, _lodash.isBoolean)(formDisabled)) {
147
145
  _fieldProps.disabled = formDisabled;
148
146
  }
149
- var componentProps = (0, _objectSpread2.default)({
147
+ var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _fieldProps), {}, {
150
148
  disabled: _disabled,
151
149
  placeholder: _placeholder,
152
150
  disabledStrictly: true
153
- }, _fieldProps);
151
+ });
154
152
  // switch与SwitchCheckbox单独添加valuePropName
155
153
  if (['Switch', 'SwitchCheckbox'].includes(_type)) {
156
154
  _formItemProps.valuePropName = 'checked';
@@ -168,7 +166,7 @@ var RenderFields = function RenderFields(props) {
168
166
  var otherProps = {
169
167
  label: _formItemProps.label,
170
168
  name: _formItemProps.name,
171
- disabled: formDisabled,
169
+ disabled: _disabled,
172
170
  isView: _isView,
173
171
  viewEmpty: viewEmpty,
174
172
  valueType: valueType,
@@ -89,7 +89,7 @@
89
89
 
90
90
  // 展开折叠按钮
91
91
  .expand-button {
92
- line-height: @zaui-space-card;
92
+ line-height: 32px;
93
93
  cursor: pointer;
94
94
 
95
95
  .rotate-to-top {
@@ -298,7 +298,7 @@
298
298
 
299
299
  div.pro-form-custom-footer {
300
300
  width: unset !important;
301
- height: @zaui-space-card;
301
+ height:32px;
302
302
  margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
303
303
 
304
304
  &.pro-form-custom-footer-hidden {
@@ -1 +1,10 @@
1
- export declare const contrastOriginal: (name: any, names: any, originValues: any, currentValue: any, fun: any) => any;
1
+ import { FormInstance } from 'antd';
2
+ interface Params {
3
+ originalValues: any;
4
+ originalValue: any;
5
+ value: any;
6
+ form: FormInstance;
7
+ equalWith?: (originalValue: any, currentValue: any) => boolean;
8
+ }
9
+ export declare const contrastOriginal: (params: Params) => boolean;
10
+ export {};
@@ -6,29 +6,26 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.contrastOriginal = void 0;
7
7
  var _lodash = require("lodash");
8
8
  var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
9
- var contrastOriginal = exports.contrastOriginal = function contrastOriginal(name, names, originValues, currentValue, fun) {
9
+ var contrastOriginal = exports.contrastOriginal = function contrastOriginal(params) {
10
+ var originalValue = params.originalValue,
11
+ originalValues = params.originalValues,
12
+ value = params.value,
13
+ equalWith = params.equalWith;
10
14
  // 支持传入自定义比较事件
11
- if ((0, _lodash.isFunction)(fun)) {
12
- if (names === null || names === void 0 ? void 0 : names.length) {
13
- var originVal = names.map(function (key) {
14
- return (0, _lodash.get)(originValues, key);
15
- });
16
- return !fun(originVal, currentValue);
17
- }
18
- return !fun((0, _lodash.get)(originValues, name), currentValue);
15
+ if ((0, _lodash.isFunction)(equalWith)) {
16
+ return !equalWith(originalValue, value);
19
17
  }
20
- if (names === null || names === void 0 ? void 0 : names.length) {
21
- return names.some(function (nameItem, index) {
22
- var originalValue = (0, _lodash.get)(originValues, nameItem);
23
- if (!nullValue.includes(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index]) || !nullValue.includes(originalValue)) {
24
- return !(0, _lodash.isEqual)(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index], (0, _lodash.get)(originValues, nameItem));
18
+ if (Array.isArray(originalValue)) {
19
+ return originalValue.some(function (valueItem, index) {
20
+ // 如果两个值有一个不是空值, 则进行深比较
21
+ if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
22
+ return !(0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
25
23
  }
26
24
  return false;
27
25
  });
28
26
  }
29
- var originalValue = (0, _lodash.get)(originValues, name);
30
- if (!nullValue.includes(currentValue) || !nullValue.includes(originalValue)) {
31
- return !(0, _lodash.isEqual)(currentValue, (0, _lodash.get)(originValues, name));
27
+ if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
28
+ return !(0, _lodash.isEqual)(value, originalValue);
32
29
  }
33
30
  return false;
34
31
  };
@@ -1 +1,15 @@
1
- export declare const useChanged: (name: any, names: any, nameStr: any, originalValues: any, form: any, fun: any) => any[];
1
+ import { FormInstance } from 'antd';
2
+ import { NamePath } from 'antd/lib/form/interface';
3
+ interface Params {
4
+ name?: NamePath;
5
+ names?: NamePath[];
6
+ namesStr?: NamePath;
7
+ originalName?: NamePath;
8
+ originalNames?: NamePath[];
9
+ originalNameStr?: NamePath;
10
+ originalValues: any;
11
+ form: FormInstance;
12
+ equalWith?: (originalValue: any, currentValue: any) => boolean;
13
+ }
14
+ export declare const useChanged: (params: Params) => any[];
15
+ export {};
@@ -7,14 +7,32 @@ exports.useChanged = void 0;
7
7
  var _antd = require("antd");
8
8
  var _lodash = require("lodash");
9
9
  var _contrastOriginal = require("./contrastOriginal");
10
- var useChanged = exports.useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
11
- var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
12
- return (0, _lodash.get)(originalValues, name);
13
- }) : (0, _lodash.get)(originalValues, name);
10
+ var useChanged = exports.useChanged = function useChanged(params) {
11
+ var name = params.name,
12
+ names = params.names,
13
+ namesStr = params.namesStr,
14
+ _params$originalName = params.originalName,
15
+ originalName = _params$originalName === void 0 ? name : _params$originalName,
16
+ _params$originalNames = params.originalNames,
17
+ originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
18
+ originalValues = params.originalValues,
19
+ form = params.form,
20
+ equalWith = params.equalWith;
21
+ var _form = form;
22
+ var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
23
+ return (0, _lodash.get)(originalValues, originalName);
24
+ }) : (0, _lodash.get)(originalValues, originalName);
14
25
  var notWatch = !originalValues || originalValue === undefined;
15
- if (notWatch) form = [];
16
- var value = _antd.Form.useWatch(nameStr || name, form);
26
+ // @ts-ignore
27
+ if (notWatch) _form = [];
28
+ var value = _antd.Form.useWatch(namesStr || name, _form);
17
29
  if (notWatch) return [false];
18
- var changed = (0, _contrastOriginal.contrastOriginal)(name, names, originalValues, value, fun);
30
+ var changed = (0, _contrastOriginal.contrastOriginal)({
31
+ value: value,
32
+ originalValue: originalValue,
33
+ originalValues: originalValues,
34
+ form: form,
35
+ equalWith: equalWith
36
+ });
19
37
  return [changed, originalValue];
20
38
  };
@@ -15,6 +15,14 @@ var _classnames = _interopRequireDefault(require("classnames"));
15
15
  var _index = require("../../index");
16
16
  var _utils = require("../../utils");
17
17
  var _excluded = ["onDrag", "width", "minwidth"];
18
+ /*
19
+ * @Author: chongyang wanchongyang@zhongan.io
20
+ * @Date: 2023-02-23 17:47:46
21
+ * @LastEditors: chongyang wanchongyang@zhongan.io
22
+ * @LastEditTime: 2023-03-07 20:18:22
23
+ * @FilePath: /za-material-warehouse/src/ProTable/TableResizable.tsx
24
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
25
+ */
18
26
  var ResizableTitle = function ResizableTitle(props) {
19
27
  var _restProps$className;
20
28
  var onDrag = props.onDrag,
@@ -17,6 +17,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
17
17
  var _lodash = require("lodash");
18
18
  var _components = require("./components");
19
19
  var _excluded = ["style", "className", "dataSource", "onChange", "transformResponse", "useRequest", "tabSearch", "mode"];
20
+ /* eslint-disable @typescript-eslint/consistent-type-assertions */
20
21
  var ProTabs = function ProTabs(props, ref) {
21
22
  var style = props.style,
22
23
  className = props.className,
@@ -1,6 +1,6 @@
1
1
  .pro-tabs {
2
2
  .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
3
- padding: 0;
3
+ padding: 0 !important;
4
4
  }
5
5
 
6
6
  .ant-tabs-top>.ant-tabs-nav::before,
@@ -17,6 +17,7 @@ var _classnames2 = _interopRequireDefault(require("classnames"));
17
17
  var _index = require("./utils/index");
18
18
  var _component = require("./component");
19
19
  var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "tableBorder", "tableStripe", "theme"];
20
+ /* eslint-disable prefer-const */
20
21
  var defaultCacheTime = 1; // 配置保存时间为一天
21
22
  var defaultThemeConfig = {
22
23
  zauiBrand: '#006AFF',
@@ -18,6 +18,13 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
18
18
  var _utils = require("../utils");
19
19
  var _locale = _interopRequireDefault(require("../../locale"));
20
20
  var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode"];
21
+ /*
22
+ *@Date: 2023-07-25 13:49:35
23
+ *@LastEditTime: 2023-07-25 13:49:35
24
+ *@Author: liudongliang
25
+ *@Description: 树每行节点渲染组件,复选时阻止点击事件冒泡,只有点击树节点文本会向上触发onSelect事件
26
+ */
27
+ /* eslint-disable no-plusplus */
21
28
  var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
22
29
  var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
23
30
  function List(props) {
@@ -16,7 +16,6 @@ var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
16
16
  *@Author: liudongliang
17
17
  *@Description: ProTree组件,集成了tree和treeSelect
18
18
  */
19
-
20
19
  var ProTreeHandle = function ProTreeHandle(props) {
21
20
  var _props$mode = props.mode,
22
21
  mode = _props$mode === void 0 ? 'tree' : _props$mode;
@@ -315,12 +315,6 @@
315
315
  }
316
316
  }
317
317
 
318
- // 中意全局样式覆盖
319
- // .pro-form.pro-form-view .ant-form-item * {
320
- // line-height: 1!important;
321
- // height: auto!important;
322
- // min-height: auto!important;
323
- // }
324
318
  // 重置ant-form view模式样式ant-tree样式
325
319
  .pro-form.pro-form-view .ant-form-item .pro-tree * {
326
320
  line-height: 1 !important;
@@ -16,6 +16,7 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
16
16
  var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
17
17
  var _utils = require("../utils");
18
18
  var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "handleFilterClose", "optionRender"];
19
+ /* eslint-disable no-plusplus */
19
20
  var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
20
21
  var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
21
22
  function List(props, ref) {
@@ -21,6 +21,13 @@ var _ImageRender = _interopRequireDefault(require("./components/ImageRender"));
21
21
  var _uitls = require("./uitls");
22
22
  var _locale = _interopRequireDefault(require("../locale"));
23
23
  var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames"];
24
+ /*
25
+ * @Author: wangshengqiang
26
+ * @Date: 2023-02-03 14:18:59
27
+ * @LastEditTime: 2023-11-07 18:49:49
28
+ * @LastEditors: wangshengqiang
29
+ * @Description: 上传控件
30
+ */
24
31
  var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
25
32
  var _locale$ProUpload;
26
33
  var _useState = (0, _react.useState)([]),
@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
11
11
  var _antd = require("antd");
12
12
  var _moment = _interopRequireDefault(require("moment"));
13
13
  var _react = require("react");
14
- var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
14
+ var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
15
15
  var RangePicker = _antd.DatePicker.RangePicker;
16
16
  var defaultFormatDate = 'YYYY-MM-DD';
17
17
  var defaultPopupContainer = function defaultPopupContainer(triggerNode) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.2.1-beta.2",
3
+ "version": "3.2.1-beta.4",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",