@zgfe/business-lib 1.1.55-beta.11 → 1.1.55-beta.13

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.
@@ -18,7 +18,6 @@ export default (function () {
18
18
  time = _useState2[0],
19
19
  setTime = _useState2[1];
20
20
  var onChange = function onChange(data) {
21
- console.log('777', data);
22
21
  setTime(data);
23
22
  };
24
23
  return /*#__PURE__*/React.createElement("div", {
@@ -37,7 +37,7 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
37
37
  setShowText = _useState10[1];
38
38
  useEffect(function () {
39
39
  var _value = defaultValue || props.value;
40
- if (_value) {
40
+ if (_value && _value.begin !== '') {
41
41
  setValue([moment(_value.begin), moment(_value.end)]);
42
42
  _value.relative && setRelative(_value.relative);
43
43
  _value.unit && setUnit(_value.unit);
@@ -45,18 +45,30 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
45
45
  }, [defaultValue, props.value]);
46
46
  var onChange = function onChange(date, dateString) {
47
47
  changeCount++;
48
- setValue(date);
49
48
  setShowText('自定义');
50
- setRelative(-1);
51
- if (changeCount >= 2) {
49
+ if (date === null) {
50
+ setValue(undefined);
52
51
  setShow(false);
53
52
  var changeValue = {
54
53
  unit: 'day',
55
- begin: dateString[0],
56
- end: dateString[1],
54
+ begin: '',
55
+ end: '',
57
56
  relative: -1
58
57
  };
59
58
  props.onChange && props.onChange(changeValue);
59
+ } else {
60
+ setValue(date);
61
+ setRelative(-1);
62
+ if (changeCount >= 2 || value === undefined) {
63
+ setShow(false);
64
+ var _changeValue = {
65
+ unit: 'day',
66
+ begin: dateString[0],
67
+ end: dateString[1],
68
+ relative: -1
69
+ };
70
+ props.onChange && props.onChange(_changeValue);
71
+ }
60
72
  }
61
73
  };
62
74
  useEffect(function () {
@@ -206,14 +206,14 @@ var CascaderOverlay = function CascaderOverlay(props) {
206
206
  }
207
207
  function onClickTag(data) {
208
208
  setCurrentTag(data);
209
- if ((currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) === 3) {
209
+ if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === 3) {
210
210
  var newValue = [{
211
211
  id: groupMap[currentSelect].id,
212
212
  labelGroup: currentSelect
213
213
  }, {
214
214
  id: data === null || data === void 0 ? void 0 : data.id,
215
215
  labelName: data === null || data === void 0 ? void 0 : data.labelName,
216
- labelCreateType: currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType
216
+ labelCreateType: data === null || data === void 0 ? void 0 : data.labelCreateType
217
217
  }];
218
218
  var _index = -1;
219
219
  currentValue.map(function (item, index) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.55-beta.11",
3
+ "version": "1.1.55-beta.13",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -60,5 +60,5 @@
60
60
  "react": "^16.12.0 || ^17.0.0",
61
61
  "yorkie": "^2.0.0"
62
62
  },
63
- "gitHead": "7ceeaeeb789079c94004d52d827d0136989709c7"
63
+ "gitHead": "0a1703a9b206c2556bb5603efb428f6700bd893a"
64
64
  }