@zgfe/business-lib 1.2.71-hxd.13 → 1.2.71-hxd.15
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.
- package/es/datePickerV2/index.js +2 -2
- package/es/select/handle.js +2 -2
- package/package.json +2 -2
package/es/datePickerV2/index.js
CHANGED
|
@@ -146,7 +146,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
|
|
|
146
146
|
return type.count == 0 ? '今天' : '最近' + type.value;
|
|
147
147
|
} else {
|
|
148
148
|
if (!includeToday) {
|
|
149
|
-
if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
|
|
149
|
+
if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour || (currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.minute) {
|
|
150
150
|
setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
|
|
151
151
|
setRelative([1, 1]);
|
|
152
152
|
return '昨天';
|
|
@@ -154,7 +154,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
|
|
|
154
154
|
return '最近' + relative[0] + Reflect.get(DateOptionMap, currentType === null || currentType === void 0 ? void 0 : currentType.value);
|
|
155
155
|
}
|
|
156
156
|
if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.minute) {
|
|
157
|
-
return moment().format('YYYY-MM-DD HH');
|
|
157
|
+
return moment().subtract(1, 'days').format('YYYY-MM-DD HH');
|
|
158
158
|
}
|
|
159
159
|
return '最近' + relative[0] + Reflect.get(DateOptionMap, currentType === null || currentType === void 0 ? void 0 : currentType.value);
|
|
160
160
|
}
|
package/es/select/handle.js
CHANGED
|
@@ -147,7 +147,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
147
147
|
return /*#__PURE__*/React.createElement("div", {
|
|
148
148
|
ref: handleRef,
|
|
149
149
|
className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', "\n ").concat(mergedStatus ? "".concat(classPrefix, "-status-").concat(mergedStatus) : '', "\n ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
|
|
150
|
-
title: "".concat(props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || '').concat(extraLabel)
|
|
150
|
+
title: "".concat(props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || '').concat(extraLabel || '')
|
|
151
151
|
}, /*#__PURE__*/React.createElement("span", {
|
|
152
152
|
className: "".concat(classPrefix, "-content")
|
|
153
153
|
}, /*#__PURE__*/React.createElement("span", {
|
|
@@ -156,7 +156,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
156
156
|
className: "".concat(classPrefix, "-icon")
|
|
157
157
|
}, props.value.icon), props.children || props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || /*#__PURE__*/React.createElement("span", {
|
|
158
158
|
className: "".concat(classPrefix, "-holder")
|
|
159
|
-
}, placeholder || '请选择'), extraLabel)), /*#__PURE__*/React.createElement("div", {
|
|
159
|
+
}, placeholder || '请选择'), extraLabel || '')), /*#__PURE__*/React.createElement("div", {
|
|
160
160
|
className: "".concat(classPrefix, "-content-icon-list"),
|
|
161
161
|
style: onSelectDelete ? {
|
|
162
162
|
width: 50
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.2.71-hxd.
|
|
3
|
+
"version": "1.2.71-hxd.15",
|
|
4
4
|
"module": "es/index.js",
|
|
5
5
|
"typings": "es/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"react": "^16.12.0 || ^17.0.0",
|
|
56
56
|
"yorkie": "^2.0.0"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "713098dfef8af752d40c65ebdb3eeab9413cfa7b",
|
|
59
59
|
"gitHooks": {
|
|
60
60
|
"pre-commit": "lint-staged"
|
|
61
61
|
}
|