@zgfe/business-lib 1.1.59-tags.0 → 1.1.59

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 (42) hide show
  1. package/es/addToPanel/components/styleList.js +1 -1
  2. package/es/addToScene/index.js +1 -1
  3. package/es/assets/styles/chunks.less +5 -10
  4. package/es/assets/styles/resetAntd.less +8 -1
  5. package/es/assets/styles/variable.less +0 -3
  6. package/es/attrCondition/styles/index.less +1 -0
  7. package/es/attrConditions/styles/index.less +5 -3
  8. package/es/attributeSelector/index.js +1 -1
  9. package/es/attributeSelector/styles/index.less +0 -4
  10. package/es/chart/index.js +1 -1
  11. package/es/chart/types.d.ts +1 -0
  12. package/es/chart/util/chartOptionConfig.js +1 -1
  13. package/es/chart/util/formatData.d.ts +1 -1
  14. package/es/chart/util/formatData.js +3 -3
  15. package/es/datePicker/datePicker.js +2 -2
  16. package/es/eventSelector/demo/index.js +6 -1
  17. package/es/eventSelector/index.js +1 -1
  18. package/es/eventSelector/styles/index.less +1 -5
  19. package/es/index.d.ts +1 -2
  20. package/es/index.js +1 -2
  21. package/es/select/demo/index.js +2 -1
  22. package/es/select/option.js +1 -1
  23. package/es/targetConditionGroup/styles/index.less +0 -3
  24. package/es/targetSelector/styles/index.less +0 -3
  25. package/es/userGroup/index.js +2 -10
  26. package/es/userGroup/styles/index.less +1 -3
  27. package/es/userTagsSelector/cascaderOverlay.js +2 -25
  28. package/es/userTagsSelector/demo/index.js +1 -1
  29. package/es/userTagsSelector/index.js +2 -4
  30. package/es/utils/ajax.js +0 -1
  31. package/package.json +2 -2
  32. package/es/assets/demo/picker.d.ts +0 -2
  33. package/es/assets/demo/picker.js +0 -22
  34. package/es/quickDatePicker/demo/index.d.ts +0 -3
  35. package/es/quickDatePicker/demo/index.js +0 -35
  36. package/es/quickDatePicker/index.d.ts +0 -6
  37. package/es/quickDatePicker/index.js +0 -178
  38. package/es/quickDatePicker/styles/index.less +0 -124
  39. package/es/quickDatePicker/types.d.ts +0 -24
  40. package/es/quickDatePicker/types.js +0 -1
  41. package/es/quickDatePicker/utils.d.ts +0 -10
  42. package/es/quickDatePicker/utils.js +0 -42
@@ -57,7 +57,7 @@ var StyleList = function StyleList(props) {
57
57
  key: item.value,
58
58
  placement: "top",
59
59
  disabled: item.disabled || !item.children,
60
- overlay: function overlay() {
60
+ dropdownRender: function dropdownRender() {
61
61
  return ChildList(item);
62
62
  }
63
63
  }, /*#__PURE__*/React.createElement("div", {
@@ -74,7 +74,7 @@ var BizAddToScene = function BizAddToScene(props) {
74
74
  notification.success({
75
75
  message: '添加成功'
76
76
  });
77
- if (props.onOk) props.onOk(res);
77
+ if (props.onOk) props.onOk(res.data);
78
78
  }
79
79
  }).catch(function () {
80
80
  setLoading(false);
@@ -25,15 +25,10 @@
25
25
 
26
26
  // 下拉组件操作栏样式
27
27
  .__select-handle {
28
- // padding: @padding-xss;
29
- // border: 1px solid @border-color-base;
30
- background: @custom-background;
31
- border: 1px solid @custom-background;
28
+ padding: @padding-xss;
29
+ border: 1px solid @border-color-base;
32
30
  border-radius: @border-radius-small;
33
31
  cursor: pointer;
34
- &:hover {
35
- border: 1px solid @primary-color;
36
- }
37
32
  }
38
33
 
39
34
  // 下拉组件展开panel样式
@@ -123,7 +118,7 @@
123
118
  .__default-overflow();
124
119
 
125
120
  &:hover:not(.disable) {
126
- // background-color: @background-color-base;
121
+ background-color: @background-color-base;
127
122
  border-color: @primary-color;
128
123
  box-shadow: none;
129
124
  }
@@ -137,14 +132,14 @@
137
132
 
138
133
  // 下拉框常用样式
139
134
  .__select-normal-secondary {
140
- // background-color: @white;
135
+ background-color: @white;
141
136
  border: 1px solid @border-color-base;
142
137
  border-radius: @border-radius-small;
143
138
 
144
139
  &:not(.disable) {
145
140
  &:hover,
146
141
  &.active {
147
- // .__default-hover();
142
+ .__default-hover();
148
143
  border-color: @border-color-base;
149
144
  box-shadow: none;
150
145
  }
@@ -162,7 +162,14 @@
162
162
 
163
163
  &:hover:not(.ant-picker-disabled),
164
164
  &.ant-picker-focused {
165
- border-color: @primary-color!important;
165
+ .__default-hover() !important;
166
+ border-color: @border-color-base!important;
167
+ box-shadow: none !important;
168
+
169
+ span,
170
+ input {
171
+ color: @primary-color!important;
172
+ }
166
173
  }
167
174
 
168
175
  .ant-picker-active-bar {
@@ -12,6 +12,3 @@
12
12
  @box-shadow-small: 0px 1px 2px @shadow-color-light;
13
13
  @primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
14
14
  @box-shadow-form: 0 0 0 4px @primary-color-hover;
15
- @custom-background: #fafafb;
16
- @custom-focus: #f0f7ff;
17
- @primary-color: '#165dff';
@@ -13,6 +13,7 @@
13
13
  .biz-attr-select-handle {
14
14
  width: 184px;
15
15
  padding: 0;
16
+ border: none;
16
17
  }
17
18
  .ant-space-item:nth-of-type(3) {
18
19
  min-width: 184px;
@@ -2,9 +2,9 @@
2
2
 
3
3
  /* 筛选条件 */
4
4
  .biz-condition-item {
5
- // &.border {
6
- // .__select-handle();
7
- // }
5
+ &.border {
6
+ .__select-handle();
7
+ }
8
8
  &-panel {
9
9
  display: flex;
10
10
  width: 100%;
@@ -19,6 +19,8 @@
19
19
  .biz-attr-select-handle {
20
20
  margin-bottom: 2px;
21
21
  padding: 0;
22
+ border: none;
23
+ border-radius: 0;
22
24
  }
23
25
 
24
26
  .ant-input {
@@ -83,7 +83,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
83
83
  setVisible(flag);
84
84
  };
85
85
  return /*#__PURE__*/React.createElement("div", {
86
- className: "".concat(classPrefix, " ").concat(visible ? 'focus' : '')
86
+ className: classPrefix
87
87
  }, /*#__PURE__*/React.createElement("div", {
88
88
  className: "".concat(classPrefix, "-handle")
89
89
  }, /*#__PURE__*/React.createElement(Dropdown, {
@@ -1,10 +1,6 @@
1
1
  @import '../../assets/styles/inner.less';
2
2
 
3
3
  .biz-attr-select {
4
- border-radius: 4px;
5
- &.focus {
6
- box-shadow: 0 0 0 4px @custom-focus;
7
- }
8
4
  &-handle {
9
5
  display: flex;
10
6
  flex-direction: row;
package/es/chart/index.js CHANGED
@@ -55,7 +55,7 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
55
55
  var eOption = {};
56
56
  if (!data) return eOption;
57
57
  if (type === 'pie') {
58
- var rData = formatPieData(data, showAll, showList);
58
+ var rData = formatPieData(data, showAll, showList, props.showOther);
59
59
  eOption = getPieOption(rData, legendPosition, legendOrient, props.showLabel, props.radius, props.center, tooltipFormatter);
60
60
  } else if (type === 'line' || type === 'bar') {
61
61
  var _rData = formatChartData(data, showAll, showList, reverseXAxis, colors);
@@ -43,6 +43,7 @@ export declare namespace ChartTypes {
43
43
  legendOrient?: 'horizontal' | 'vertical';
44
44
  showList?: Array<any>;
45
45
  showAll?: boolean;
46
+ showOther?: boolean;
46
47
  reverseXAxis?: boolean;
47
48
  seriesName?: string;
48
49
  }
@@ -247,7 +247,7 @@ export var getPieOption = function getPieOption() {
247
247
  var name = params.name,
248
248
  value = params.value,
249
249
  color = params.color;
250
- return "<div class=\"biz-chart-tooltip-item\">\n <div class=\"biz-chart-tooltip-content\">\n <span class=\"biz-tooltip-marker\" style=\"background:".concat(color, "\"></span>\n <div class=\"biz-tooltip-name\">").concat(name, "</div>\n </div> \n <span class=\"biz-chart-tooltip-value\">").concat(value, "</span>\n </div>");
250
+ return "<div class=\"biz-chart-tooltip-item\">\n <div class=\"biz-chart-tooltip-content\">\n <span class=\"biz-tooltip-marker\" style=\"background:".concat(color, "\"></span>\n <div class=\"biz-tooltip-name\">").concat(name, "</div>\n </div> \n <span class=\"biz-chart-tooltip-value\">").concat(value, "(").concat(params.percent, "%)</span>\n </div>");
251
251
  };
252
252
  }
253
253
  return _objectSpread(_objectSpread({}, baseConfig), {}, {
@@ -1,5 +1,5 @@
1
1
  import { ChartTypes } from '../types';
2
- export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>) => {
2
+ export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>, showOther?: boolean) => {
3
3
  name: string;
4
4
  value: number;
5
5
  itemStyle: {
@@ -1,6 +1,6 @@
1
1
  import util from '../../utils/util';
2
2
  import { chartColors } from './color';
3
- export var formatPieData = function formatPieData(data, showAll, showList) {
3
+ export var formatPieData = function formatPieData(data, showAll, showList, showOther) {
4
4
  var showMap = getShowMap(showList);
5
5
  var list = [];
6
6
  var other = {
@@ -20,12 +20,12 @@ export var formatPieData = function formatPieData(data, showAll, showList) {
20
20
  } else {
21
21
  if (showList && showMap[series.name] || !showList && list.length < 10) {
22
22
  list.push(series);
23
- } else {
23
+ } else if (showOther) {
24
24
  other.value += item.values[0];
25
25
  }
26
26
  }
27
27
  });
28
- if (!showAll && other.value > 0) list.push(other);
28
+ if (showOther && !showAll && other.value > 0) list.push(other);
29
29
  return list;
30
30
  };
31
31
  export var formatChartData = function formatChartData(data, showAll, showList, reverseXAxis, color) {
@@ -77,7 +77,7 @@ var BizDate = function BizDate(props) {
77
77
  value: moment(dateRange.begin, 'YYYY-MM-DD'),
78
78
  allowClear: false,
79
79
  inputReadOnly: true,
80
- dropdownClassName: "".concat(classPrefix, "-drop"),
80
+ popupClassName: "".concat(classPrefix, "-drop"),
81
81
  locale: locale,
82
82
  showToday: false,
83
83
  disabledDate: disabledDate,
@@ -90,7 +90,7 @@ var BizDate = function BizDate(props) {
90
90
  }) : /*#__PURE__*/React.createElement(RangePicker, {
91
91
  value: [moment(dateRange.begin, 'YYYY-MM-DD'), moment(dateRange.end, 'YYYY-MM-DD')],
92
92
  allowClear: false,
93
- dropdownClassName: "".concat(classPrefix, "-drop"),
93
+ popupClassName: "".concat(classPrefix, "-drop"),
94
94
  inputReadOnly: true,
95
95
  locale: locale,
96
96
  disabledDate: disabledDate,
@@ -25,7 +25,12 @@ var EventDemo = function EventDemo() {
25
25
  var onChange = function onChange(data) {
26
26
  setValue(data);
27
27
  };
28
- return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
28
+ return /*#__PURE__*/React.createElement("div", {
29
+ style: {
30
+ height: '500px',
31
+ overflow: 'auto'
32
+ }
33
+ }, /*#__PURE__*/React.createElement("div", {
29
34
  style: {
30
35
  height: '700px'
31
36
  }
@@ -100,7 +100,7 @@ var BizEventSelector = function BizEventSelector(props) {
100
100
  setVisible(flag);
101
101
  };
102
102
  return /*#__PURE__*/React.createElement("div", {
103
- className: [classPrefix, border ? 'border' : '', visible ? 'focus' : ''].join(' ')
103
+ className: [classPrefix, border ? 'border' : ''].join(' ')
104
104
  }, /*#__PURE__*/React.createElement(Dropdown, {
105
105
  dropdownRender: function dropdownRender() {
106
106
  return /*#__PURE__*/React.createElement(EventListPanel, {
@@ -1,16 +1,12 @@
1
1
  @import '../../assets/styles/inner.less';
2
2
 
3
3
  .biz-event-select {
4
- position: relative;
5
- border-radius: 4px;
6
- &.focus {
7
- box-shadow: 0 0 0 4px @custom-focus;
8
- }
9
4
  &.border {
10
5
  .biz-event-select-handle {
11
6
  .__select-handle();
12
7
  }
13
8
  }
9
+ position: relative;
14
10
  &-list-panel {
15
11
  display: flex;
16
12
  flex-direction: row;
package/es/index.d.ts CHANGED
@@ -8,7 +8,6 @@ import BizTargetCondition from './targetConditionGroup';
8
8
  import BizConditionItem from './attrConditions';
9
9
  import BizConditionGroup from './attrConditions/group';
10
10
  import BizDatePicker from './datePicker';
11
- import BizQuickDatePicker from './quickDatePicker';
12
11
  import BizSelect from './select';
13
12
  import BizDialog from './dialog';
14
13
  import BizChart from './chart';
@@ -35,7 +34,7 @@ import BizAttrCondition from './attrCondition';
35
34
  import BizAttrConditionGroup from './attrCondition/group';
36
35
  import BizTargetFromPanel from './layout/optionTitle';
37
36
  import { BizTargetFromPanelContext } from './layout/optionTitle/types';
38
- export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
37
+ export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
39
38
  export type { UserGroupTypes } from './userGroup/types';
40
39
  export type { BizSelectTypes } from './select/types';
41
40
  export type { AttributeSelect } from './attributeSelector/types';
package/es/index.js CHANGED
@@ -7,7 +7,6 @@ import BizTargetCondition from './targetConditionGroup';
7
7
  import BizConditionItem from './attrConditions';
8
8
  import BizConditionGroup from './attrConditions/group';
9
9
  import BizDatePicker from './datePicker';
10
- import BizQuickDatePicker from './quickDatePicker';
11
10
  import BizSelect from './select';
12
11
  import BizDialog from './dialog';
13
12
  import BizChart from './chart';
@@ -34,4 +33,4 @@ import BizAttrCondition from './attrCondition';
34
33
  import BizAttrConditionGroup from './attrCondition/group';
35
34
  import BizTargetFromPanel from './layout/optionTitle';
36
35
  import { BizTargetFromPanelContext } from './layout/optionTitle/types';
37
- export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
36
+ export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
@@ -9,7 +9,8 @@ import { BizSelect } from '@zgfe/business-lib';
9
9
  import { Button } from 'antd';
10
10
  var stringOperate = [{
11
11
  name: '是',
12
- value: 'equal'
12
+ value: 'equal',
13
+ tip: 'ttttttttttt'
13
14
  }, {
14
15
  name: '包含',
15
16
  value: 'contains'
@@ -83,7 +83,7 @@ var SelectOption = function SelectOption(props) {
83
83
  }
84
84
  return /*#__PURE__*/React.createElement(Tooltip, {
85
85
  placement: "right",
86
- title: isOverflow ? option[props.labelField] : null,
86
+ title: option && option['tip'] ? option['tip'] : isOverflow ? option[props.labelField] : null,
87
87
  zIndex: 100000
88
88
  }, /*#__PURE__*/React.createElement("div", {
89
89
  className: "".concat(classPrefix, "-option ").concat(multiple ? classPrefix + '-option-multiple' : '', " ").concat(checked ? 'active' : '', " ").concat(disabled ? 'disabled' : ''),
@@ -22,7 +22,4 @@
22
22
  &-submenu {
23
23
  width: 120px;
24
24
  }
25
- .biz-event-select.focus {
26
- box-shadow: none;
27
- }
28
25
  }
@@ -9,9 +9,6 @@
9
9
  flex: 1;
10
10
  width: 0;
11
11
  }
12
- .biz-event-select.focus {
13
- box-shadow: none;
14
- }
15
12
 
16
13
  .biz-event-select-handle {
17
14
  flex: none;
@@ -40,15 +40,8 @@ var BizUserGroup = function BizUserGroup(props) {
40
40
  setCurrent(value);
41
41
  if (props.onChange) props.onChange(value);
42
42
  };
43
- var _useState5 = useState(false),
44
- _useState6 = _slicedToArray(_useState5, 2),
45
- focus = _useState6[0],
46
- setFocus = _useState6[1];
47
- var onVisibleChange = function onVisibleChange(visible) {
48
- setFocus(visible);
49
- };
50
43
  return /*#__PURE__*/React.createElement("div", {
51
- className: "".concat(classPrefix, " ").concat(focus ? 'focus' : '')
44
+ className: classPrefix
52
45
  }, /*#__PURE__*/React.createElement(Skeleton, {
53
46
  loading: loading,
54
47
  active: true,
@@ -64,8 +57,7 @@ var BizUserGroup = function BizUserGroup(props) {
64
57
  border: false,
65
58
  disableItemList: props.disableItemList,
66
59
  onChange: onChange,
67
- minDropdownWidth: 284,
68
- onVisibleChange: onVisibleChange
60
+ minDropdownWidth: 284
69
61
  }), /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
70
62
  name: "delete",
71
63
  icon: "qingchu",
@@ -4,9 +4,7 @@
4
4
  position: relative;
5
5
  display: flex;
6
6
  .__select-handle();
7
- &.focus {
8
- box-shadow: 0 0 0 4px @custom-focus;
9
- }
7
+
10
8
  .biz-select-handle {
11
9
  flex: 1;
12
10
  width: 100%;
@@ -185,8 +185,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
185
185
  labelGroup: currentSelect
186
186
  }, {
187
187
  id: currentTag === null || currentTag === void 0 ? void 0 : currentTag.id,
188
- labelName: currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelName,
189
- labelCreateType: currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType
188
+ labelName: currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelName
190
189
  }, _objectSpread({}, data)];
191
190
  props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
192
191
  }
@@ -206,28 +205,6 @@ var CascaderOverlay = function CascaderOverlay(props) {
206
205
  }
207
206
  function onClickTag(data) {
208
207
  setCurrentTag(data);
209
- if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === 3) {
210
- var newValue = [{
211
- id: groupMap[currentSelect].id,
212
- labelGroup: currentSelect
213
- }, {
214
- id: data === null || data === void 0 ? void 0 : data.id,
215
- labelName: data === null || data === void 0 ? void 0 : data.labelName,
216
- labelCreateType: data === null || data === void 0 ? void 0 : data.labelCreateType
217
- }];
218
- var _index = -1;
219
- currentValue.map(function (item, index) {
220
- if (JSON.stringify(item) === JSON.stringify(newValue)) {
221
- _index = index;
222
- }
223
- });
224
- if (_index === -1) {
225
- props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
226
- } else {
227
- currentValue.splice(_index, 1);
228
- props.onChange(_toConsumableArray(currentValue));
229
- }
230
- }
231
208
  }
232
209
  function render() {
233
210
  if (!groupList.length) return /*#__PURE__*/React.createElement("div", {
@@ -261,7 +238,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
261
238
  return getTagsByGroup(Math.floor(groupMap[currentSelect].children.length / 10) + 1);
262
239
  },
263
240
  onClick: onClickTag
264
- }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), currentTag && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== 3 && /*#__PURE__*/React.createElement("div", {
241
+ }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), /*#__PURE__*/React.createElement("div", {
265
242
  className: "".concat(classPrefix, "-overlay-selections")
266
243
  }, /*#__PURE__*/React.createElement(MultipleCheckPanel, {
267
244
  valueField: valueFields[2],
@@ -10,7 +10,7 @@ import { DemoWrapper } from '@zgfe/business-lib';
10
10
  import { ajax } from '../../utils';
11
11
  import apis from '../../constants/apis';
12
12
  export default (function () {
13
- var appId = 204;
13
+ var appId = 9;
14
14
  var _useState = useState([]),
15
15
  _useState2 = _slicedToArray(_useState, 2),
16
16
  groupList = _useState2[0],
@@ -36,12 +36,10 @@ var UserTagsSelect = function UserTagsSelect(props) {
36
36
  setVisible = _useState4[1];
37
37
  var handleValue = useMemo(function () {
38
38
  return currentValue.map(function (item) {
39
- var pre = item[item.length - 2];
40
39
  var last = item[item.length - 1];
41
- var pre_text = pre[labelFields[labelFields.length - 2]];
42
- var last_text = last[labelFields[labelFields.length - 1]];
40
+ var pre = item[item.length - 2];
43
41
  var res = _objectSpread(_objectSpread({}, last), {}, {
44
- handleText: (last === null || last === void 0 ? void 0 : last.labelCreateType) === 3 ? last[labelFields[1]] : "".concat(pre_text, "\uFF1A").concat(last_text)
42
+ handleText: "".concat(pre[labelFields[labelFields.length - 2]], "\uFF1A").concat(last[labelFields[labelFields.length - 1]])
45
43
  });
46
44
  return res;
47
45
  });
package/es/utils/ajax.js CHANGED
@@ -80,7 +80,6 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
80
80
  message.error('账户未登录或登录已失效');
81
81
  flag = true;
82
82
  } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
83
- msg = '账户没有权限';
84
83
  message.error('账户没有权限');
85
84
  flag = true;
86
85
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.59-tags.0",
3
+ "version": "1.1.59",
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": "c76a704011ec41300de4d7e542a201c69affe3c6"
63
+ "gitHead": "317980104350b75d5879b2d22fa93fbead031304"
64
64
  }
@@ -1,2 +0,0 @@
1
- declare const _default: () => JSX.Element;
2
- export default _default;
@@ -1,22 +0,0 @@
1
- import { Card, DatePicker, Space } from 'antd';
2
- import React from 'react';
3
- import AssetsDemo from '.';
4
- var RangePicker = DatePicker.RangePicker;
5
- export default (function () {
6
- return /*#__PURE__*/React.createElement(AssetsDemo, null, /*#__PURE__*/React.createElement(Card, {
7
- title: "Input"
8
- }, /*#__PURE__*/React.createElement(Space, {
9
- direction: "vertical",
10
- size: 12
11
- }, /*#__PURE__*/React.createElement(RangePicker, null), /*#__PURE__*/React.createElement(RangePicker, {
12
- showTime: true
13
- }), /*#__PURE__*/React.createElement(RangePicker, {
14
- picker: "week"
15
- }), /*#__PURE__*/React.createElement(RangePicker, {
16
- picker: "month"
17
- }), /*#__PURE__*/React.createElement(RangePicker, {
18
- picker: "quarter"
19
- }), /*#__PURE__*/React.createElement(RangePicker, {
20
- picker: "year"
21
- }))));
22
- });
@@ -1,3 +0,0 @@
1
- import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
2
- declare const _default: () => JSX.Element;
3
- export default _default;
@@ -1,35 +0,0 @@
1
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
3
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
4
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
5
- function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
6
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
- import { BizQuickDatePicker } from '@zgfe/business-lib';
8
- import React, { useState } from 'react';
9
- import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
10
- export default (function () {
11
- var _useState = useState({
12
- unit: 'month',
13
- begin: '2023-06-23',
14
- end: '2023-06-30',
15
- relative: 3
16
- }),
17
- _useState2 = _slicedToArray(_useState, 2),
18
- time = _useState2[0],
19
- setTime = _useState2[1];
20
- var onChange = function onChange(data) {
21
- setTime(data);
22
- };
23
- return /*#__PURE__*/React.createElement("div", {
24
- style: {
25
- display: 'flex'
26
- }
27
- }, /*#__PURE__*/React.createElement("div", {
28
- style: {
29
- lineHeight: '32px'
30
- }
31
- }, "\u9009\u62E9\u65F6\u95F4\uFF1A"), /*#__PURE__*/React.createElement(BizQuickDatePicker, {
32
- defaultValue: time,
33
- onChange: onChange
34
- }));
35
- });
@@ -1,6 +0,0 @@
1
- import React from 'react';
2
- import './styles/index.less';
3
- import { QuickDatePickerTypes } from './types';
4
- export declare const classPrefix = "biz-quick-date-picker-wrap";
5
- declare const BizQuickDatePicker: React.FC<QuickDatePickerTypes.Props>;
6
- export default BizQuickDatePicker;
@@ -1,178 +0,0 @@
1
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
3
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
4
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
5
- function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
6
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
- import React, { useEffect, useState } from 'react';
8
- import './styles/index.less';
9
- import moment from 'moment';
10
- import { quickModuleOneOptions, quickModuleTwoOptions } from './utils';
11
- import IconFont from '../icon/iconFont';
12
- import { DatePicker } from 'antd';
13
- var RangePicker = DatePicker.RangePicker;
14
- export var classPrefix = 'biz-quick-date-picker-wrap';
15
- var changeCount = 0;
16
- var BizQuickDatePicker = function BizQuickDatePicker(props) {
17
- var defaultValue = props.defaultValue;
18
- var _useState = useState(false),
19
- _useState2 = _slicedToArray(_useState, 2),
20
- show = _useState2[0],
21
- setShow = _useState2[1];
22
- var _useState3 = useState(-1),
23
- _useState4 = _slicedToArray(_useState3, 2),
24
- relative = _useState4[0],
25
- setRelative = _useState4[1];
26
- var _useState5 = useState('day'),
27
- _useState6 = _slicedToArray(_useState5, 2),
28
- unit = _useState6[0],
29
- setUnit = _useState6[1];
30
- var _useState7 = useState([moment().subtract(6, 'day'), moment()]),
31
- _useState8 = _slicedToArray(_useState7, 2),
32
- value = _useState8[0],
33
- setValue = _useState8[1];
34
- var _useState9 = useState('过去7天'),
35
- _useState10 = _slicedToArray(_useState9, 2),
36
- showText = _useState10[0],
37
- setShowText = _useState10[1];
38
- useEffect(function () {
39
- var _value = defaultValue || props.value;
40
- if (_value && _value.begin !== '') {
41
- setValue([moment(_value.begin), moment(_value.end)]);
42
- _value.relative && setRelative(_value.relative);
43
- _value.unit && setUnit(_value.unit);
44
- if (_value && _value.relative && _value.unit === 'day') {
45
- quickModuleTwoOptions.map(function (item) {
46
- if (item.value === _value.relative) {
47
- setShowText(item.label);
48
- }
49
- });
50
- } else {
51
- quickModuleOneOptions.map(function (item) {
52
- if (item.value === _value.relative) {
53
- setShowText(item.label);
54
- }
55
- });
56
- }
57
- }
58
- }, [defaultValue, props.value]);
59
- var onChange = function onChange(date, dateString) {
60
- changeCount++;
61
- setShowText('自定义');
62
- if (date === null) {
63
- setValue(undefined);
64
- setShow(false);
65
- var changeValue = {
66
- unit: 'day',
67
- begin: '',
68
- end: '',
69
- relative: -1
70
- };
71
- props.onChange && props.onChange(changeValue);
72
- } else {
73
- setValue(date);
74
- setRelative(-1);
75
- if (changeCount >= 2 || value === undefined) {
76
- setShow(false);
77
- var _changeValue = {
78
- unit: 'day',
79
- begin: dateString[0],
80
- end: dateString[1],
81
- relative: -1
82
- };
83
- props.onChange && props.onChange(_changeValue);
84
- }
85
- }
86
- };
87
- useEffect(function () {
88
- if (!show) changeCount = 0;
89
- }, [show]);
90
- var onBlur = function onBlur() {
91
- setShow(false);
92
- };
93
- var onClick = function onClick() {
94
- setShow(true);
95
- };
96
- var disabledDate = function disabledDate(current) {
97
- return current && current > moment().endOf('month');
98
- };
99
- var quickModuleHandle = function quickModuleHandle(item) {
100
- var _value;
101
- if (item.type === 'week' || item.type === 'month') {
102
- switch (Number(item.value)) {
103
- case 1:
104
- _value = [moment().weekday(1), moment().weekday(7)];
105
- break;
106
- case 2:
107
- _value = [moment().weekday(1).subtract(1, 'week'), moment().weekday(7).subtract(1, 'week')];
108
- break;
109
- case 3:
110
- _value = [moment().startOf('month'), moment().endOf('month')];
111
- break;
112
- case 4:
113
- _value = [moment().startOf('month').subtract(1, 'month'), moment().endOf('month').subtract(1, 'month')];
114
- break;
115
- }
116
- } else {
117
- _value = [moment().subtract(Number(item.value) - 1, 'day'), moment()];
118
- }
119
- setRelative(item.value);
120
- setUnit(item.type);
121
- setShowText(item.label);
122
- setValue(_value);
123
- setShow(false);
124
- if (_value) {
125
- var changeValue = {
126
- unit: item.type,
127
- begin: _value[0].format('YYYY-MM-DD'),
128
- end: _value[1].format('YYYY-MM-DD'),
129
- relative: item.value
130
- };
131
- props.onChange && props.onChange(changeValue);
132
- }
133
- };
134
- var renderExtraFooter = function renderExtraFooter() {
135
- return /*#__PURE__*/React.createElement("div", {
136
- className: "".concat(classPrefix, "-content-options")
137
- }, /*#__PURE__*/React.createElement("ol", null, quickModuleOneOptions.map(function (item) {
138
- return /*#__PURE__*/React.createElement("li", {
139
- className: "".concat(item.type === unit && item.value === relative ? 'active' : ''),
140
- key: item.label,
141
- onClick: function onClick() {
142
- return quickModuleHandle(item);
143
- }
144
- }, item.label);
145
- })), /*#__PURE__*/React.createElement("ol", null, quickModuleTwoOptions.map(function (item) {
146
- return /*#__PURE__*/React.createElement("li", {
147
- className: "".concat(item.type === unit && item.value === relative ? 'active' : ''),
148
- key: item.label,
149
- onClick: function onClick() {
150
- return quickModuleHandle(item);
151
- }
152
- }, item.label);
153
- })), /*#__PURE__*/React.createElement("div", {
154
- className: "".concat(relative === -1 ? 'active' : '')
155
- }, "\u81EA\u5B9A\u4E49\u65F6\u95F4", /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
156
- type: "fanhuiicon"
157
- }))));
158
- };
159
- return /*#__PURE__*/React.createElement("div", {
160
- className: "".concat(classPrefix, " clearfix ").concat(show ? 'focus' : ''),
161
- tabIndex: 1
162
- }, /*#__PURE__*/React.createElement("div", {
163
- onClick: function onClick() {
164
- setShow(true);
165
- }
166
- }, showText), /*#__PURE__*/React.createElement(RangePicker, {
167
- popupClassName: "".concat(classPrefix, "-content"),
168
- separator: '至',
169
- value: value,
170
- onBlur: onBlur,
171
- open: show,
172
- onClick: onClick,
173
- disabledDate: disabledDate,
174
- onChange: onChange,
175
- renderExtraFooter: renderExtraFooter
176
- }));
177
- };
178
- export default BizQuickDatePicker;
@@ -1,124 +0,0 @@
1
- @import '../../assets/styles/inner.less';
2
-
3
- .biz-quick-date-picker-wrap {
4
- display: inline-block;
5
- height: 34px;
6
- padding: 4px 8px;
7
- background: #fafafb;
8
- border: 1px solid #fafafb;
9
- border-radius: 4px;
10
- .ant-picker-focused {
11
- box-shadow: none !important;
12
- }
13
- > :nth-child(1) {
14
- float: left;
15
- height: 24px;
16
- margin-right: 8px;
17
- padding: 2px 8px;
18
- color: #165dff;
19
- vertical-align: middle;
20
- background: #e8efff;
21
- }
22
- .ant-picker {
23
- padding: 0;
24
- vertical-align: middle;
25
- border: none;
26
- border-radius: 0 !important;
27
- .ant-picker-clear {
28
- right: 0;
29
- }
30
- }
31
- .ant-picker:hover {
32
- .ant-picker-input > input,
33
- .ant-picker-range-separator {
34
- color: #021429 !important;
35
- }
36
- }
37
- &-content {
38
- float: left;
39
- .ant-picker-panel-container {
40
- display: flex;
41
- flex-direction: row-reverse;
42
- .ant-picker-footer {
43
- width: auto;
44
- min-width: auto;
45
- border-bottom: 1px solid #e8efff;
46
- box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
47
- }
48
- }
49
- &-options {
50
- width: 170px;
51
- padding-bottom: 25px;
52
- color: #67727f;
53
- ol,
54
- li {
55
- margin: 0;
56
- padding: 0;
57
- list-style: none;
58
- list-style-type: none;
59
- }
60
- > :nth-child(1),
61
- > :nth-child(2) {
62
- display: flex;
63
- flex-wrap: wrap;
64
- justify-content: space-between;
65
- margin-top: 8px;
66
- padding-bottom: 4px;
67
- border-bottom: 1px solid #ecedf0;
68
- li {
69
- width: 81px;
70
- height: 24px;
71
- margin-bottom: 8px;
72
- line-height: 24px;
73
- text-align: center;
74
- background: #fafafb;
75
- border-radius: 24px;
76
- cursor: pointer;
77
- }
78
- }
79
- > :nth-child(2) {
80
- margin-top: 14px;
81
- li {
82
- border-radius: 0;
83
- }
84
- }
85
- > :nth-child(3) {
86
- display: flex;
87
- justify-content: space-between;
88
- width: 100%;
89
- height: 32px;
90
- margin-top: 12px;
91
- padding: 0 12px;
92
- line-height: 32px;
93
- background: #fafafb;
94
- > :first-child {
95
- transform: rotate(180deg);
96
- }
97
- }
98
- .active,
99
- li.active {
100
- color: #165dff;
101
- background: #e8efff;
102
- }
103
- }
104
- }
105
- }
106
-
107
- .biz-quick-date-picker-wrap:hover {
108
- border: 1px solid #165dff;
109
- }
110
- .biz-quick-date-picker-wrap.focus {
111
- box-shadow: 0 0 0 4px #f0f7ff;
112
- }
113
-
114
- .clearfix:after {
115
- display: block;
116
- clear: both;
117
- height: 0;
118
- content: '';
119
- }
120
-
121
- .clearfix {
122
- /* 触发 hasLayout */
123
- zoom: 1;
124
- }
@@ -1,24 +0,0 @@
1
- export declare namespace QuickDatePickerTypes {
2
- interface Options {
3
- label: string;
4
- value: number;
5
- type: 'week' | 'month' | 'day';
6
- }
7
- interface Range {
8
- begin: string;
9
- end: string;
10
- }
11
- interface Value extends Range {
12
- unit: 'day' | 'week' | 'month';
13
- relative?: number;
14
- }
15
- interface Props {
16
- defaultValue?: Value;
17
- value?: Value;
18
- onChange?: (data: Value) => void;
19
- }
20
- interface ListOption {
21
- count: number;
22
- value: string;
23
- }
24
- }
@@ -1 +0,0 @@
1
- export {};
@@ -1,10 +0,0 @@
1
- export declare const quickModuleOneOptions: {
2
- label: string;
3
- value: number;
4
- type: 'week' | 'month';
5
- }[];
6
- export declare const quickModuleTwoOptions: {
7
- label: string;
8
- value: number;
9
- type: 'day';
10
- }[];
@@ -1,42 +0,0 @@
1
- export var quickModuleOneOptions = [{
2
- label: '本周',
3
- value: 1,
4
- type: 'week'
5
- }, {
6
- label: '上周',
7
- value: 2,
8
- type: 'week'
9
- }, {
10
- label: '本月',
11
- value: 3,
12
- type: 'month'
13
- }, {
14
- label: '上月',
15
- value: 4,
16
- type: 'month'
17
- }];
18
- export var quickModuleTwoOptions = [{
19
- label: '过去5天',
20
- value: 5,
21
- type: 'day'
22
- }, {
23
- label: '过去7天',
24
- value: 7,
25
- type: 'day'
26
- }, {
27
- label: '过去14天',
28
- value: 14,
29
- type: 'day'
30
- }, {
31
- label: '过去30天',
32
- value: 30,
33
- type: 'day'
34
- }, {
35
- label: '过去60天',
36
- value: 60,
37
- type: 'day'
38
- }, {
39
- label: '过去180天',
40
- value: 180,
41
- type: 'day'
42
- }];