@zat-design/sisyphus-react 3.14.4-beta.1 → 3.14.4-beta.2

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 (5) hide show
  1. package/es/ProForm/components/base/DatePicker/index.js +23 -8
  2. package/es/ProForm/components/combination/ProCascader/index.js +4 -4
  3. package/lib/ProForm/components/base/DatePicker/index.js +23 -8
  4. package/lib/ProForm/components/combination/ProCascader/index.js +4 -4
  5. package/package.json +1 -1
package/es/ProForm/components/base/DatePicker/index.js CHANGED
@@ -11,10 +11,23 @@ import { useProConfig } from "../../../../ProConfigProvider";
11
11
  import ProForm from "../../../../ProForm";
12
12
  import Container from "../../Container";
13
13
  import { jsx as _jsx } from "react/jsx-runtime";
14
+ var getDefaultFormat = picker => {
15
+ switch (picker) {
16
+ case 'week':
17
+ return 'YYYY-wo';
18
+ case 'month':
19
+ return 'YYYY-MM';
20
+ case 'quarter':
21
+ return 'YYYY-[Q]Q';
22
+ case 'year':
23
+ return 'YYYY';
24
+ default:
25
+ return 'YYYY-MM-DD';
26
+ }
27
+ };
14
28
  var DatePicker = props => {
15
29
  var className = props.className,
16
- _props$format = props.format,
17
- format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
30
+ format = props.format,
18
31
  rest = _objectWithoutProperties(props, _excluded);
19
32
  var _ref = ProForm.useFieldProps() || {},
20
33
  isViewCon = _ref.isView,
@@ -23,7 +36,9 @@ var DatePicker = props => {
23
36
  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
24
37
 
25
38
  var initialConfig = useProConfig('DatePicker') || {};
26
- var nextFormat = format;
39
+ var defaultFormat = getDefaultFormat(rest.picker);
40
+ var viewFormat = format !== null && format !== void 0 ? format : defaultFormat;
41
+ var nextFormat = format !== null && format !== void 0 ? format : defaultFormat;
27
42
  var nextClassName = classNames({
28
43
  'full-form-item': true,
29
44
  [className]: !!className
@@ -33,12 +48,12 @@ var DatePicker = props => {
33
48
  var viewChildren = null;
34
49
  if (!value) {
35
50
  viewChildren = null;
36
- } else if (typeof format === 'string' && isObject(value)) {
37
- viewChildren = value.format(format);
38
- } else if (isFunction(format)) {
39
- viewChildren = format(value);
51
+ } else if (typeof viewFormat === 'string' && isObject(value)) {
52
+ viewChildren = value.format(viewFormat);
53
+ } else if (isFunction(viewFormat)) {
54
+ viewChildren = viewFormat(value);
40
55
  } else if (isString(value)) {
41
- viewChildren = moment(value).format(format);
56
+ viewChildren = moment(value).format(viewFormat);
42
57
  }
43
58
  return /*#__PURE__*/_jsx(Container, {
44
59
  viewEmpty: viewEmpty,
package/es/ProForm/components/combination/ProCascader/index.js CHANGED
@@ -93,7 +93,7 @@ var ProCascader = props => {
93
93
  viewEmpty = _ref3.viewEmpty;
94
94
  var addressCode = code || enumCode;
95
95
  var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
96
- var realLevel = Math.max(2, level);
96
+ var realLevel = level || 2;
97
97
  var detail = value === null || value === void 0 ? void 0 : value[realLevel];
98
98
  var enumData = useEnum(addressCode);
99
99
  var _useProConfig = useProConfig('ProEnum'),
@@ -107,7 +107,7 @@ var ProCascader = props => {
107
107
  }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
108
108
  var realDataSource = useMemo(() => {
109
109
  var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
110
- var result = transformDataName(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
110
+ var result = transformDataName(isAddressMode && realLevel < 3 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
111
111
  return result;
112
112
  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
113
113
  var lastDisabled = useMemo(() => {
@@ -145,7 +145,7 @@ var ProCascader = props => {
145
145
  value: fieldNames.value,
146
146
  children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
147
147
  });
148
- var serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
148
+ var serviceData = isAddressMode && realLevel < 3 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
149
149
  setServiceData(serviceData);
150
150
  };
151
151
 
@@ -180,7 +180,7 @@ var ProCascader = props => {
180
180
  value: fieldNames.value,
181
181
  children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
182
182
  });
183
- var _serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
183
+ var _serviceData = isAddressMode && realLevel < 3 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
184
184
  setServiceData(_serviceData);
185
185
  } else {
186
186
  defaultOnSuccessFun(data);
package/lib/ProForm/components/base/DatePicker/index.js CHANGED
@@ -18,10 +18,23 @@ var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
18
18
  var _Container = _interopRequireDefault(require("../../Container"));
19
19
  var _jsxRuntime = require("react/jsx-runtime");
20
20
  var _excluded = ["className", "format"];
21
+ var getDefaultFormat = picker => {
22
+ switch (picker) {
23
+ case 'week':
24
+ return 'YYYY-wo';
25
+ case 'month':
26
+ return 'YYYY-MM';
27
+ case 'quarter':
28
+ return 'YYYY-[Q]Q';
29
+ case 'year':
30
+ return 'YYYY';
31
+ default:
32
+ return 'YYYY-MM-DD';
33
+ }
34
+ };
21
35
  var DatePicker = props => {
22
36
  var className = props.className,
23
- _props$format = props.format,
24
- format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
37
+ format = props.format,
25
38
  rest = (0, _objectWithoutProperties2.default)(props, _excluded);
26
39
  var _ref = _ProForm.default.useFieldProps() || {},
27
40
  isViewCon = _ref.isView,
@@ -30,7 +43,9 @@ var DatePicker = props => {
30
43
  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
31
44
 
32
45
  var initialConfig = (0, _ProConfigProvider.useProConfig)('DatePicker') || {};
33
- var nextFormat = format;
46
+ var defaultFormat = getDefaultFormat(rest.picker);
47
+ var viewFormat = format !== null && format !== void 0 ? format : defaultFormat;
48
+ var nextFormat = format !== null && format !== void 0 ? format : defaultFormat;
34
49
  var nextClassName = (0, _classnames.default)({
35
50
  'full-form-item': true,
36
51
  [className]: !!className
@@ -40,12 +55,12 @@ var DatePicker = props => {
40
55
  var viewChildren = null;
41
56
  if (!value) {
42
57
  viewChildren = null;
43
- } else if (typeof format === 'string' && (0, _lodash.isObject)(value)) {
44
- viewChildren = value.format(format);
45
- } else if ((0, _lodash.isFunction)(format)) {
46
- viewChildren = format(value);
58
+ } else if (typeof viewFormat === 'string' && (0, _lodash.isObject)(value)) {
59
+ viewChildren = value.format(viewFormat);
60
+ } else if ((0, _lodash.isFunction)(viewFormat)) {
61
+ viewChildren = viewFormat(value);
47
62
  } else if ((0, _lodash.isString)(value)) {
48
- viewChildren = (0, _moment.default)(value).format(format);
63
+ viewChildren = (0, _moment.default)(value).format(viewFormat);
49
64
  }
50
65
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
51
66
  viewEmpty: viewEmpty,
package/lib/ProForm/components/combination/ProCascader/index.js CHANGED
@@ -99,7 +99,7 @@ var ProCascader = props => {
99
99
  viewEmpty = _ref3.viewEmpty;
100
100
  var addressCode = code || enumCode;
101
101
  var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
102
- var realLevel = Math.max(2, level);
102
+ var realLevel = level || 2;
103
103
  var detail = value === null || value === void 0 ? void 0 : value[realLevel];
104
104
  var enumData = (0, _useEnum.default)(addressCode);
105
105
  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
@@ -113,7 +113,7 @@ var ProCascader = props => {
113
113
  }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
114
114
  var realDataSource = (0, _react.useMemo)(() => {
115
115
  var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
116
- var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
116
+ var result = (0, _index.transformDataName)(isAddressMode && realLevel < 3 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
117
117
  return result;
118
118
  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
119
119
  var lastDisabled = (0, _react.useMemo)(() => {
@@ -151,7 +151,7 @@ var ProCascader = props => {
151
151
  value: fieldNames.value,
152
152
  children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
153
153
  });
154
- var serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
154
+ var serviceData = isAddressMode && realLevel < 3 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
155
155
  setServiceData(serviceData);
156
156
  };
157
157
 
@@ -186,7 +186,7 @@ var ProCascader = props => {
186
186
  value: fieldNames.value,
187
187
  children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
188
188
  });
189
- var _serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
189
+ var _serviceData = isAddressMode && realLevel < 3 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
190
190
  setServiceData(_serviceData);
191
191
  } else {
192
192
  defaultOnSuccessFun(data);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.14.4-beta.1",
3
+ "version": "3.14.4-beta.2",
4
4
  "license": "MIT",
5
5
  "engines": {
6
6
  "node": ">=18.19.0"