@kdcloudjs/kdesign 1.8.19 → 1.8.20

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.
@@ -130,27 +130,31 @@ function Panel(props) {
130
130
  };
131
131
  var renderMonthHeader = function renderMonthHeader() {
132
132
  var year = getYear(viewDate);
133
- var headerCls = classnames("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"), "".concat(prefixCls, "-header-text-inner-hover"), _defineProperty({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerYear));
133
+ var headerCls = classnames("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"), "".concat(prefixCls, "-header-text-inner-hover"));
134
+ var yearOnly = renderYearHeader();
134
135
  return {
135
- children: React.createElement("span", {
136
+ children: isInnerYear ? yearOnly.children : React.createElement("span", {
136
137
  onClick: onHeaderYearClick
137
138
  }, year + locale.year),
138
- className: headerCls
139
+ className: isInnerYear ? yearOnly.className : headerCls
139
140
  };
140
141
  };
141
142
  var renderDateHeader = function renderDateHeader() {
142
143
  var year = getYear(viewDate);
143
144
  var month = getMonth(viewDate);
144
145
  var headerCls = classnames("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
146
+ var yearOnly = renderYearHeader();
147
+ var yearText = isInnerYear ? yearOnly.children : React.createElement("span", {
148
+ className: classnames("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover")),
149
+ onClick: onHeaderYearClick
150
+ }, year + locale.year);
151
+ var monthText = isInnerMonth || isInnerYear ? null : React.createElement("span", {
152
+ className: classnames("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), _defineProperty({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
153
+ onClick: onHeaderMonthClick
154
+ }, locale.monthTitle[month]);
145
155
  return {
146
- children: React.createElement(React.Fragment, null, React.createElement("span", {
147
- className: classnames("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), _defineProperty({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerYear)),
148
- onClick: onHeaderYearClick
149
- }, year + locale.year), React.createElement("span", {
150
- className: classnames("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), _defineProperty({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
151
- onClick: onHeaderMonthClick
152
- }, locale.monthTitle[month])),
153
- className: headerCls
156
+ children: (locale === null || locale === void 0 ? void 0 : locale.monthBeforeYear) ? [monthText, yearText] : [yearText, monthText],
157
+ className: isInnerYear ? yearOnly.className : headerCls
154
158
  };
155
159
  };
156
160
  var onSuperPrev = function onSuperPrev() {
@@ -229,10 +233,10 @@ function Panel(props) {
229
233
  {
230
234
  headerObj = renderDateHeader();
231
235
  headerProps = {
232
- onPrev: isPositionLeft && !isInnerPicker || isInnerMonth || isPositionUnset ? onPrev : undefined,
233
- onNext: isPositionRight && !isInnerPicker || isInnerMonth || isPositionUnset ? onNext : undefined,
234
- onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperPrev : undefined,
235
- onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperNext : undefined
236
+ onPrev: !isInnerPicker && (isPositionLeft || isPositionUnset) ? onPrev : undefined,
237
+ onNext: !isInnerPicker && (isPositionRight || isPositionUnset) ? onNext : undefined,
238
+ onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperPrev : undefined,
239
+ onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperNext : undefined
236
240
  };
237
241
  panel = renderDatePanel();
238
242
  break;
@@ -242,10 +246,10 @@ function Panel(props) {
242
246
  panel = renderDatePanel();
243
247
  headerObj = renderDateHeader();
244
248
  headerProps = {
245
- onPrev: isPositionLeft && !isInnerPicker || isInnerMonth || isPositionUnset ? onPrev : undefined,
246
- onNext: isPositionRight && !isInnerPicker || isInnerMonth || isPositionUnset ? onNext : undefined,
247
- onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperPrev : undefined,
248
- onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperNext : undefined
249
+ onPrev: !isInnerPicker && (isPositionLeft || isPositionUnset) ? onPrev : undefined,
250
+ onNext: !isInnerPicker && (isPositionRight || isPositionUnset) ? onNext : undefined,
251
+ onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperPrev : undefined,
252
+ onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperNext : undefined
249
253
  };
250
254
  break;
251
255
  }
@@ -23,6 +23,7 @@ export interface Locale {
23
23
  'DatePicker.rangeWeekPlaceholder': [string, string];
24
24
  'DatePicker.rangeQuarterPlaceholder': [string, string];
25
25
  'DatePicker.rangeTimePlaceholder': [string, string];
26
+ 'DatePicker.monthBeforeYear': boolean;
26
27
  }
27
28
  export interface InnerLocale {
28
29
  locale: string;
@@ -45,6 +46,7 @@ export interface InnerLocale {
45
46
  rangeWeekPlaceholder: [string, string];
46
47
  rangeQuarterPlaceholder: [string, string];
47
48
  rangeTimePlaceholder: [string, string];
49
+ monthBeforeYear: boolean;
48
50
  }
49
51
  export declare type InnerLocaleKey = keyof InnerLocale;
50
52
  export declare type PanelMode = 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year' | 'decade';
@@ -17,6 +17,7 @@ var locale = {
17
17
  'DatePicker.rangeMonthPlaceholder': ['开始月份', '结束月份'],
18
18
  'DatePicker.rangeWeekPlaceholder': ['开始周', '结束周'],
19
19
  'DatePicker.rangeQuarterPlaceholder': ['开始季度', '结束季度'],
20
- 'DatePicker.rangeTimePlaceholder': ['开始时间', '结束时间']
20
+ 'DatePicker.rangeTimePlaceholder': ['开始时间', '结束时间'],
21
+ 'DatePicker.monthBeforeYear': false
21
22
  };
22
23
  export default locale;
@@ -146,6 +146,7 @@ declare class LocaleCache {
146
146
  'DatePicker.rangeWeekPlaceholder': [string, string];
147
147
  'DatePicker.rangeQuarterPlaceholder': [string, string];
148
148
  'DatePicker.rangeTimePlaceholder': [string, string];
149
+ 'DatePicker.monthBeforeYear': boolean;
149
150
  locale: string;
150
151
  } | undefined;
151
152
  /**
@@ -118,6 +118,7 @@ declare const locale: {
118
118
  'DatePicker.rangeWeekPlaceholder': [string, string];
119
119
  'DatePicker.rangeQuarterPlaceholder': [string, string];
120
120
  'DatePicker.rangeTimePlaceholder': [string, string];
121
+ 'DatePicker.monthBeforeYear': boolean;
121
122
  locale: string;
122
123
  };
123
124
  export default locale;
@@ -187,6 +187,7 @@ export var Popper = forwardRef(function (props, ref) {
187
187
  var popperRef = ref || popperRefInner;
188
188
  var popperInstance = useRef(null);
189
189
  var referenceRefInner = useRef(null);
190
+ var onVisibleChangeRef = useRef(onVisibleChange);
190
191
  var referenceRef = (referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.ref) || referenceRefInner;
191
192
  var container = getPopupContainer(getRealDom(referenceRef, referenceElement) || document.body) || document.body;
192
193
  var _useMergedState = useMergedState(false, {
@@ -213,6 +214,7 @@ export var Popper = forwardRef(function (props, ref) {
213
214
  };
214
215
  var changeVisible = function changeVisible(nextOpen) {
215
216
  var triggerType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'unknown';
217
+ var _a;
216
218
  if (visibleInner !== nextOpen) {
217
219
  if (nextOpen && _includesInstanceProperty(triggerTypeArray).call(triggerTypeArray, triggerType)) {
218
220
  onTrigger === null || onTrigger === void 0 ? void 0 : onTrigger(triggerType);
@@ -220,7 +222,7 @@ export var Popper = forwardRef(function (props, ref) {
220
222
  if (typeof visible === 'undefined') {
221
223
  setVisibleInner(nextOpen);
222
224
  }
223
- onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(nextOpen, triggerType);
225
+ (_a = onVisibleChangeRef.current) === null || _a === void 0 ? void 0 : _a.call(onVisibleChangeRef, nextOpen, triggerType);
224
226
  }
225
227
  if (!nextOpen && _Object$keys(subPopupRefs.current || {}).length) {
226
228
  _Object$values(subPopupRefs.current).forEach(function (d) {
@@ -326,6 +328,9 @@ export var Popper = forwardRef(function (props, ref) {
326
328
  triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode[type]('mouseleave', onMouseLeave);
327
329
  }
328
330
  };
331
+ useEffect(function () {
332
+ onVisibleChangeRef.current = onVisibleChange;
333
+ }, [onVisibleChange]);
329
334
  useEffect(function () {
330
335
  setPlacementInner(getRealPlacement(placement));
331
336
  }, [placement]);
@@ -11,7 +11,7 @@ exports.default = void 0;
11
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
12
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
13
13
  var _react = _interopRequireWildcard(require("react"));
14
- var _classnames4 = _interopRequireDefault(require("classnames"));
14
+ var _classnames2 = _interopRequireDefault(require("classnames"));
15
15
  var _month = _interopRequireDefault(require("./panel/month/month"));
16
16
  var _year = _interopRequireDefault(require("./panel/year/year"));
17
17
  var _quarter = _interopRequireDefault(require("./panel/quarter/quarter"));
@@ -128,7 +128,7 @@ function Panel(props) {
128
128
  var _getYearsPeriod = (0, _dateFns.getYearsPeriod)(viewDate, yearItemNumber),
129
129
  startPeriod = _getYearsPeriod.startPeriod,
130
130
  endPeriod = _getYearsPeriod.endPeriod;
131
- var headerCls = (0, _classnames4.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-year"));
131
+ var headerCls = (0, _classnames2.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-year"));
132
132
  return {
133
133
  children: _react.default.createElement(_react.default.Fragment, null, startPeriod, " - ", endPeriod),
134
134
  className: headerCls
@@ -142,27 +142,31 @@ function Panel(props) {
142
142
  };
143
143
  var renderMonthHeader = function renderMonthHeader() {
144
144
  var year = (0, _dateFns.getYear)(viewDate);
145
- var headerCls = (0, _classnames4.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerYear));
145
+ var headerCls = (0, _classnames2.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"), "".concat(prefixCls, "-header-text-inner-hover"));
146
+ var yearOnly = renderYearHeader();
146
147
  return {
147
- children: _react.default.createElement("span", {
148
+ children: isInnerYear ? yearOnly.children : _react.default.createElement("span", {
148
149
  onClick: onHeaderYearClick
149
150
  }, year + locale.year),
150
- className: headerCls
151
+ className: isInnerYear ? yearOnly.className : headerCls
151
152
  };
152
153
  };
153
154
  var renderDateHeader = function renderDateHeader() {
154
155
  var year = (0, _dateFns.getYear)(viewDate);
155
156
  var month = (0, _dateFns.getMonth)(viewDate);
156
- var headerCls = (0, _classnames4.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
157
+ var headerCls = (0, _classnames2.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
158
+ var yearOnly = renderYearHeader();
159
+ var yearText = isInnerYear ? yearOnly.children : _react.default.createElement("span", {
160
+ className: (0, _classnames2.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover")),
161
+ onClick: onHeaderYearClick
162
+ }, year + locale.year);
163
+ var monthText = isInnerMonth || isInnerYear ? null : _react.default.createElement("span", {
164
+ className: (0, _classnames2.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
165
+ onClick: onHeaderMonthClick
166
+ }, locale.monthTitle[month]);
157
167
  return {
158
- children: _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", {
159
- className: (0, _classnames4.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerYear)),
160
- onClick: onHeaderYearClick
161
- }, year + locale.year), _react.default.createElement("span", {
162
- className: (0, _classnames4.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
163
- onClick: onHeaderMonthClick
164
- }, locale.monthTitle[month])),
165
- className: headerCls
168
+ children: (locale === null || locale === void 0 ? void 0 : locale.monthBeforeYear) ? [monthText, yearText] : [yearText, monthText],
169
+ className: isInnerYear ? yearOnly.className : headerCls
166
170
  };
167
171
  };
168
172
  var onSuperPrev = function onSuperPrev() {
@@ -241,10 +245,10 @@ function Panel(props) {
241
245
  {
242
246
  headerObj = renderDateHeader();
243
247
  headerProps = {
244
- onPrev: isPositionLeft && !isInnerPicker || isInnerMonth || isPositionUnset ? onPrev : undefined,
245
- onNext: isPositionRight && !isInnerPicker || isInnerMonth || isPositionUnset ? onNext : undefined,
246
- onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperPrev : undefined,
247
- onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperNext : undefined
248
+ onPrev: !isInnerPicker && (isPositionLeft || isPositionUnset) ? onPrev : undefined,
249
+ onNext: !isInnerPicker && (isPositionRight || isPositionUnset) ? onNext : undefined,
250
+ onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperPrev : undefined,
251
+ onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperNext : undefined
248
252
  };
249
253
  panel = renderDatePanel();
250
254
  break;
@@ -254,10 +258,10 @@ function Panel(props) {
254
258
  panel = renderDatePanel();
255
259
  headerObj = renderDateHeader();
256
260
  headerProps = {
257
- onPrev: isPositionLeft && !isInnerPicker || isInnerMonth || isPositionUnset ? onPrev : undefined,
258
- onNext: isPositionRight && !isInnerPicker || isInnerMonth || isPositionUnset ? onNext : undefined,
259
- onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperPrev : undefined,
260
- onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperNext : undefined
261
+ onPrev: !isInnerPicker && (isPositionLeft || isPositionUnset) ? onPrev : undefined,
262
+ onNext: !isInnerPicker && (isPositionRight || isPositionUnset) ? onNext : undefined,
263
+ onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperPrev : undefined,
264
+ onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperNext : undefined
261
265
  };
262
266
  break;
263
267
  }
@@ -272,7 +276,7 @@ function Panel(props) {
272
276
  }
273
277
  }
274
278
  var showHeader = !(picker === 'date' && showTime || picker === 'time') || innerPicker !== undefined;
275
- var containerCls = (0, _classnames4.default)("".concat(prefixCls, "-warpper"));
279
+ var containerCls = (0, _classnames2.default)("".concat(prefixCls, "-warpper"));
276
280
  return _react.default.createElement("div", {
277
281
  className: containerCls
278
282
  }, showHeader ? getHeader() : null, panel);
@@ -23,6 +23,7 @@ export interface Locale {
23
23
  'DatePicker.rangeWeekPlaceholder': [string, string];
24
24
  'DatePicker.rangeQuarterPlaceholder': [string, string];
25
25
  'DatePicker.rangeTimePlaceholder': [string, string];
26
+ 'DatePicker.monthBeforeYear': boolean;
26
27
  }
27
28
  export interface InnerLocale {
28
29
  locale: string;
@@ -45,6 +46,7 @@ export interface InnerLocale {
45
46
  rangeWeekPlaceholder: [string, string];
46
47
  rangeQuarterPlaceholder: [string, string];
47
48
  rangeTimePlaceholder: [string, string];
49
+ monthBeforeYear: boolean;
48
50
  }
49
51
  export declare type InnerLocaleKey = keyof InnerLocale;
50
52
  export declare type PanelMode = 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year' | 'decade';
@@ -23,7 +23,8 @@ var locale = {
23
23
  'DatePicker.rangeMonthPlaceholder': ['开始月份', '结束月份'],
24
24
  'DatePicker.rangeWeekPlaceholder': ['开始周', '结束周'],
25
25
  'DatePicker.rangeQuarterPlaceholder': ['开始季度', '结束季度'],
26
- 'DatePicker.rangeTimePlaceholder': ['开始时间', '结束时间']
26
+ 'DatePicker.rangeTimePlaceholder': ['开始时间', '结束时间'],
27
+ 'DatePicker.monthBeforeYear': false
27
28
  };
28
29
  var _default = locale;
29
30
  exports.default = _default;
@@ -146,6 +146,7 @@ declare class LocaleCache {
146
146
  'DatePicker.rangeWeekPlaceholder': [string, string];
147
147
  'DatePicker.rangeQuarterPlaceholder': [string, string];
148
148
  'DatePicker.rangeTimePlaceholder': [string, string];
149
+ 'DatePicker.monthBeforeYear': boolean;
149
150
  locale: string;
150
151
  } | undefined;
151
152
  /**
@@ -118,6 +118,7 @@ declare const locale: {
118
118
  'DatePicker.rangeWeekPlaceholder': [string, string];
119
119
  'DatePicker.rangeQuarterPlaceholder': [string, string];
120
120
  'DatePicker.rangeTimePlaceholder': [string, string];
121
+ 'DatePicker.monthBeforeYear': boolean;
121
122
  locale: string;
122
123
  };
123
124
  export default locale;
@@ -202,6 +202,7 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
202
202
  var popperRef = ref || popperRefInner;
203
203
  var popperInstance = (0, _react.useRef)(null);
204
204
  var referenceRefInner = (0, _react.useRef)(null);
205
+ var onVisibleChangeRef = (0, _react.useRef)(onVisibleChange);
205
206
  var referenceRef = (referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.ref) || referenceRefInner;
206
207
  var container = getPopupContainer(getRealDom(referenceRef, referenceElement) || document.body) || document.body;
207
208
  var _useMergedState = (0, _hooks.useMergedState)(false, {
@@ -228,6 +229,7 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
228
229
  };
229
230
  var changeVisible = function changeVisible(nextOpen) {
230
231
  var triggerType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'unknown';
232
+ var _a;
231
233
  if (visibleInner !== nextOpen) {
232
234
  if (nextOpen && (0, _includes.default)(triggerTypeArray).call(triggerTypeArray, triggerType)) {
233
235
  onTrigger === null || onTrigger === void 0 ? void 0 : onTrigger(triggerType);
@@ -235,7 +237,7 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
235
237
  if (typeof visible === 'undefined') {
236
238
  setVisibleInner(nextOpen);
237
239
  }
238
- onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(nextOpen, triggerType);
240
+ (_a = onVisibleChangeRef.current) === null || _a === void 0 ? void 0 : _a.call(onVisibleChangeRef, nextOpen, triggerType);
239
241
  }
240
242
  if (!nextOpen && (0, _keys.default)(subPopupRefs.current || {}).length) {
241
243
  (0, _values.default)(subPopupRefs.current).forEach(function (d) {
@@ -341,6 +343,9 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
341
343
  triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode[type]('mouseleave', onMouseLeave);
342
344
  }
343
345
  };
346
+ (0, _react.useEffect)(function () {
347
+ onVisibleChangeRef.current = onVisibleChange;
348
+ }, [onVisibleChange]);
344
349
  (0, _react.useEffect)(function () {
345
350
  setPlacementInner(getRealPlacement(placement));
346
351
  }, [placement]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/kdesign",
3
- "version": "1.8.19",
3
+ "version": "1.8.20",
4
4
  "description": "KDesign 金蝶前端react 组件库",
5
5
  "title": "kdesign",
6
6
  "keywords": [
@@ -260,7 +260,8 @@
260
260
  },
261
261
  "resolutions": {
262
262
  "@types/babel__traverse": "7.17.1",
263
- "@types/node": "17.0.41"
263
+ "@types/node": "17.0.41",
264
+ "cheerio": "1.0.0-rc.12"
264
265
  },
265
266
  "license": "Apache-2.0"
266
267
  }