@zgfe/business-lib 1.0.24-tags4.0 → 1.0.25-adanalysis.0

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 (56) hide show
  1. package/es/addToPanel/index.js +3 -1
  2. package/es/assets/styles/chunks.less +2 -2
  3. package/es/assets/styles/resetAntd.less +8 -6
  4. package/es/assets/styles/variable.less +2 -1
  5. package/es/datePicker/datePicker.js +1 -3
  6. package/es/datePicker/demo/index.js +5 -3
  7. package/es/datePicker/index.js +36 -3
  8. package/es/datePicker/styles/index.less +3 -2
  9. package/es/datePicker/types.d.ts +2 -0
  10. package/es/datePicker/utils.js +1 -1
  11. package/es/eventSelector/listPanel.js +39 -22
  12. package/es/icon/iconFont.d.ts +1 -0
  13. package/es/icon/iconFont.js +1 -0
  14. package/es/index.d.ts +3 -2
  15. package/es/index.js +3 -2
  16. package/es/{analysisLayout → layout/analysisLayout}/demo/index.d.ts +0 -0
  17. package/es/{analysisLayout → layout/analysisLayout}/demo/index.js +0 -0
  18. package/es/{analysisLayout → layout/analysisLayout}/demo/index.less +0 -0
  19. package/es/{analysisLayout → layout/analysisLayout}/index.d.ts +0 -0
  20. package/es/{analysisLayout → layout/analysisLayout}/index.js +1 -1
  21. package/es/{analysisLayout → layout/analysisLayout}/index.less +12 -12
  22. package/es/layout/detail/demo/index.d.ts +2 -0
  23. package/es/layout/detail/demo/index.js +12 -0
  24. package/es/layout/detail/index.d.ts +9 -0
  25. package/es/layout/detail/index.js +24 -0
  26. package/es/layout/detail/index.less +28 -0
  27. package/es/select/handle.js +4 -2
  28. package/es/select/index.js +1 -1
  29. package/es/select/styles/handle.less +8 -14
  30. package/es/select/styles/index.less +1 -1
  31. package/es/targetConditionGroup/index.js +24 -6
  32. package/es/targetSelector/styles/index.less +1 -0
  33. package/es/userCondition/conditions/tagsCondition.js +12 -17
  34. package/es/userCondition/conditions/textDesc.js +3 -3
  35. package/es/userCondition/demo/index.js +228 -6
  36. package/es/userCondition/styles/conditionTypeList.less +4 -5
  37. package/es/userCondition/types.d.ts +2 -20
  38. package/es/userCondition/util.d.ts +1 -20
  39. package/es/userCondition/util.js +5 -38
  40. package/es/userTagsSelector/cascaderOverlay.js +42 -132
  41. package/es/userTagsSelector/demo/index.js +6 -13
  42. package/es/userTagsSelector/groups/groupOption.js +1 -1
  43. package/es/userTagsSelector/groups/index.js +11 -19
  44. package/es/userTagsSelector/groups/styles/option.less +1 -6
  45. package/es/userTagsSelector/index.js +3 -17
  46. package/es/userTagsSelector/multipleCheckPanel/index.js +14 -4
  47. package/es/userTagsSelector/styles/cascaderOverlay.less +4 -9
  48. package/es/userTagsSelector/types.d.ts +10 -1
  49. package/package.json +2 -2
  50. package/es/commonStyle/icon.less +0 -194
  51. package/es/commonStyle/index.less +0 -3
  52. package/es/commonStyle/select.less +0 -92
  53. package/es/commonStyle/theme.less +0 -523
  54. package/es/commonStyle/variable.less +0 -127
  55. package/es/userCondition/demo/mockData.d.ts +0 -33
  56. package/es/userCondition/demo/mockData.js +0 -208
@@ -166,7 +166,9 @@ var BizAddToPanel = function BizAddToPanel(props) {
166
166
 
167
167
  if (router && routes) router.push({
168
168
  name: routes.panel,
169
- params: ((_result$panel = result.panel) === null || _result$panel === void 0 ? void 0 : _result$panel.id) || form.panel.id
169
+ params: {
170
+ panelId: ((_result$panel = result.panel) === null || _result$panel === void 0 ? void 0 : _result$panel.id) || form.panel.id
171
+ }
170
172
  });
171
173
  }
172
174
  }, form.panel.name || ((_result$panel2 = result.panel) === null || _result$panel2 === void 0 ? void 0 : _result$panel2.name)), "\u6210\u529F")
@@ -7,7 +7,7 @@
7
7
  // 通用hover样式,适用于下拉选项等
8
8
  .__default-hover {
9
9
  color: @primary-color;
10
- background: color(~`colorPalette('@{primary-color}', 0.1) `);
10
+ background: @primary-color-hover;
11
11
  border-color: @primary-color;
12
12
  cursor: pointer;
13
13
 
@@ -20,7 +20,7 @@
20
20
  .__default-focused {
21
21
  background-color: #fff;
22
22
  border-color: @primary-color;
23
- box-shadow: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `);
23
+ box-shadow: 0 0 0 4px @primary-color-hover;
24
24
  }
25
25
 
26
26
  // 下拉组件操作栏样式
@@ -40,7 +40,7 @@
40
40
  &:focus,
41
41
  &-focused {
42
42
  background-color: #fff !important;
43
- box-shadow: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `) !important;
43
+ box-shadow: 0 0 0 4px @primary-color-hover !important;
44
44
  }
45
45
  &.ant-input-status-error {
46
46
  border-color: @error-color !important;
@@ -238,7 +238,7 @@
238
238
 
239
239
  /*日期范围内背景色*/
240
240
  .ant-picker-cell-in-range::before {
241
- background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
241
+ background: @primary-color-hover !important;
242
242
  }
243
243
 
244
244
  /*日期范围内的hover效果-背景不变*/
@@ -253,7 +253,7 @@
253
253
  .ant-picker-panel
254
254
  > :not(.ant-picker-date-panel)
255
255
  .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end::before {
256
- background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
256
+ background: @primary-color-hover !important;
257
257
  }
258
258
 
259
259
  /*日期范围内的hover效果*/
@@ -303,13 +303,15 @@
303
303
  .ant-modal-body {
304
304
  max-height: 400px;
305
305
  max-height: 400px !important;
306
- padding-top: @padding-xs !important;
307
- // padding-bottom: 0 !important;
308
306
  overflow: auto !important;
309
307
  &:not(:last-child) {
310
308
  padding-bottom: 0 !important;
311
309
  }
312
310
  }
311
+ //只有当有header的时候才修改body的间距
312
+ .ant-modal-header + .ant-modal-body {
313
+ padding-top: @padding-xs !important;
314
+ }
313
315
  }
314
316
 
315
317
  // 分页
@@ -395,7 +397,7 @@
395
397
 
396
398
  .ant-table-tbody > tr.ant-table-row:hover > td,
397
399
  .ant-table-tbody > tr > td.ant-table-cell-row-hover {
398
- background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
400
+ background: @primary-color-hover !important;
399
401
  }
400
402
  .ant-table-thead {
401
403
  .ant-table-cell {
@@ -10,4 +10,5 @@
10
10
 
11
11
  @shadow-color-light: rgba(0, 0, 0, 0.1);
12
12
  @box-shadow-small: 0px 1px 2px @shadow-color-light;
13
- @box-shadow-form: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `);
13
+ @primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
14
+ @box-shadow-form: 0 0 0 4px @primary-color-hover;
@@ -35,9 +35,7 @@ var BizDate = function BizDate(props) {
35
35
  setDateRange(props.value ? props.value : initValue);
36
36
  }, []);
37
37
  useEffect(function () {
38
- var _props$dateCount;
39
-
40
- if (!((_props$dateCount = props.dateCount) === null || _props$dateCount === void 0 ? void 0 : _props$dateCount.count)) return;
38
+ if (!props.dateCount) return;
41
39
  var date = getDateRange(props.type, props.dateCount.count, !!includeToday);
42
40
  setDateRange(date);
43
41
  if (props.onChange) props.onChange(date, true);
@@ -16,15 +16,16 @@ import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
16
16
  import { Divider, Switch } from 'antd';
17
17
  export default (function () {
18
18
  var _useState = useState({
19
- unit: 'week',
19
+ unit: 'day',
20
20
  begin: '2022-05-03',
21
- end: '2022-05-30'
21
+ end: '2022-05-30',
22
+ relative: [0, 1]
22
23
  }),
23
24
  _useState2 = _slicedToArray(_useState, 2),
24
25
  time = _useState2[0],
25
26
  setTime = _useState2[1];
26
27
 
27
- var _useState3 = useState(false),
28
+ var _useState3 = useState(true),
28
29
  _useState4 = _slicedToArray(_useState3, 2),
29
30
  includeToday = _useState4[0],
30
31
  setIncludeToday = _useState4[1];
@@ -39,6 +40,7 @@ export default (function () {
39
40
  defaultChecked: includeToday,
40
41
  onChange: setIncludeToday
41
42
  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePicker, {
43
+ includeTodayAndYesterday: true,
42
44
  onChange: handleChange,
43
45
  includeToday: includeToday,
44
46
  defaultValue: time
@@ -4,6 +4,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
4
4
 
5
5
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
6
6
 
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+
9
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
10
+
11
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
12
+
13
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
14
+
7
15
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
16
 
9
17
  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."); }
@@ -48,11 +56,36 @@ var BizDatePicker = function BizDatePicker(props) {
48
56
  useEffect(function () {
49
57
  var data = props.defaultValue || props.value;
50
58
 
59
+ if (props.includeTodayAndYesterday) {
60
+ var dayData = dateList.find(function (item) {
61
+ return item.value == 'day';
62
+ });
63
+ dayData.children = [{
64
+ value: '今天',
65
+ count: 0
66
+ }, {
67
+ value: '昨天',
68
+ count: 1
69
+ }].concat(_toConsumableArray(dayData.children));
70
+ }
71
+
51
72
  if (data) {
52
73
  setCurrentType(function () {
53
- return dateList.filter(function (item) {
74
+ var list = dateList.filter(function (item) {
54
75
  return item.value === data.unit;
55
76
  })[0] || dateList[0];
77
+
78
+ if (data.relative) {
79
+ var valueData = list.children.filter(function (item) {
80
+ return item.count === data.relative[0];
81
+ })[0];
82
+
83
+ if (valueData) {
84
+ setCurrentTime(valueData);
85
+ }
86
+ }
87
+
88
+ return list;
56
89
  });
57
90
  setDateRange(function () {
58
91
  return {
@@ -96,7 +129,7 @@ var BizDatePicker = function BizDatePicker(props) {
96
129
  paragraph: {
97
130
  rows: 1
98
131
  }
99
- }, /*#__PURE__*/React.createElement(BizSelect, {
132
+ }, !props.hideSelector ? /*#__PURE__*/React.createElement(BizSelect, {
100
133
  className: "".concat(classPrefix, "-type"),
101
134
  value: currentType,
102
135
  labelField: "label",
@@ -104,7 +137,7 @@ var BizDatePicker = function BizDatePicker(props) {
104
137
  theme: "secondary",
105
138
  options: dateList,
106
139
  onChange: onChangeDateType
107
- }), /*#__PURE__*/React.createElement("div", {
140
+ }) : '', /*#__PURE__*/React.createElement("div", {
108
141
  className: "".concat(classPrefix, "-list")
109
142
  }, currentType.children.map(function (item, index) {
110
143
  return /*#__PURE__*/React.createElement("div", {
@@ -9,10 +9,11 @@
9
9
 
10
10
  &-list {
11
11
  display: flex;
12
- margin: 0 16px;
12
+ margin: 0 16px 0 0;
13
13
  }
14
14
 
15
15
  .biz-select-handle {
16
+ margin-right: 16px;
16
17
  padding: 0;
17
18
  }
18
19
 
@@ -45,7 +46,7 @@
45
46
 
46
47
  &.active {
47
48
  color: @primary-color;
48
- background: color(~`colorPalette('@{primary-color}', 0.1) `);
49
+ background: @primary-color-hover;
49
50
  border: 1px solid @primary-color;
50
51
  }
51
52
  }
@@ -12,6 +12,8 @@ export declare namespace DatePickerTypes {
12
12
  value?: Value;
13
13
  includeToday?: boolean;
14
14
  onChange?: (data: Value) => void;
15
+ includeTodayAndYesterday?: boolean;
16
+ hideSelector?: boolean;
15
17
  }
16
18
  interface Option {
17
19
  label: string;
@@ -50,7 +50,7 @@ export var dateList = [{
50
50
  }]
51
51
  }];
52
52
  export var getDateRange = function getDateRange(type, count, includeToday) {
53
- var endDate = moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD'),
53
+ var endDate = moment().subtract(includeToday || count == 0 ? 0 : 1, 'days').format('YYYY-MM-DD'),
54
54
  startDate = '';
55
55
 
56
56
  if (type === 'month') {
@@ -55,15 +55,10 @@ var EventListPanel = function EventListPanel(props) {
55
55
  searchEventList = _useState8[0],
56
56
  setSearchEventList = _useState8[1];
57
57
 
58
- var _useState9 = useState([]),
58
+ var _useState9 = useState(),
59
59
  _useState10 = _slicedToArray(_useState9, 2),
60
- showList = _useState10[0],
61
- setShowList = _useState10[1];
62
-
63
- var _useState11 = useState(),
64
- _useState12 = _slicedToArray(_useState11, 2),
65
- currentValue = _useState12[0],
66
- setCurrentValue = _useState12[1];
60
+ currentValue = _useState10[0],
61
+ setCurrentValue = _useState10[1];
67
62
 
68
63
  var overviewData = {
69
64
  id: -100,
@@ -107,18 +102,8 @@ var EventListPanel = function EventListPanel(props) {
107
102
  setSearchEventList(function () {
108
103
  return list;
109
104
  });
110
- setShowList(function () {
111
- return list.slice(0, 10);
112
- });
113
105
  }, [searchValue, currentGroup, showOverview]);
114
106
 
115
- var loadMoreData = function loadMoreData() {
116
- var moreData = searchEventList.slice(showList.length, showList.length + 10);
117
- setShowList(function (list) {
118
- return [].concat(_toConsumableArray(list), _toConsumableArray(moreData));
119
- });
120
- };
121
-
122
107
  function onClickEvent(e) {
123
108
  var resVal = _.cloneDeep(currentValue) || {};
124
109
  resVal.event = e;
@@ -172,7 +157,39 @@ var EventListPanel = function EventListPanel(props) {
172
157
  }), /*#__PURE__*/React.createElement("div", {
173
158
  className: "".concat(classPrefix, "-list"),
174
159
  id: "scrollableDiv"
175
- }, /*#__PURE__*/React.createElement(InfiniteScroll, {
160
+ }, /*#__PURE__*/React.createElement(InfiniteScrollList, {
161
+ searchEventList: searchEventList,
162
+ searchValue: searchValue,
163
+ currentGroup: currentGroup,
164
+ currentValue: currentValue,
165
+ onClick: onClickEvent
166
+ }))));
167
+ };
168
+
169
+ var InfiniteScrollList = function InfiniteScrollList(_ref) {
170
+ var searchEventList = _ref.searchEventList,
171
+ searchValue = _ref.searchValue,
172
+ currentGroup = _ref.currentGroup,
173
+ currentValue = _ref.currentValue,
174
+ onClick = _ref.onClick;
175
+
176
+ var _useState11 = useState([]),
177
+ _useState12 = _slicedToArray(_useState11, 2),
178
+ showList = _useState12[0],
179
+ setShowList = _useState12[1];
180
+
181
+ useEffect(function () {
182
+ setShowList(searchEventList.slice(0, 10));
183
+ }, [searchEventList]);
184
+
185
+ var loadMoreData = function loadMoreData() {
186
+ var moreData = searchEventList.slice(showList.length, showList.length + 10);
187
+ setShowList(function (list) {
188
+ return [].concat(_toConsumableArray(list), _toConsumableArray(moreData));
189
+ });
190
+ };
191
+
192
+ return /*#__PURE__*/React.createElement(InfiniteScroll, {
176
193
  dataLength: showList.length,
177
194
  hasMore: showList.length < searchEventList.length,
178
195
  loader: /*#__PURE__*/React.createElement(Skeleton, {
@@ -184,7 +201,7 @@ var EventListPanel = function EventListPanel(props) {
184
201
  next: loadMoreData,
185
202
  scrollableTarget: "scrollableDiv",
186
203
  key: Math.random()
187
- }, showList === null || showList === void 0 ? void 0 : showList.map(function (e) {
204
+ }, showList.map(function (e) {
188
205
  var _currentValue$event;
189
206
 
190
207
  if (e.eventHidden === ShowStatus.hidden) return null;
@@ -197,9 +214,9 @@ var EventListPanel = function EventListPanel(props) {
197
214
  text: searchValue
198
215
  },
199
216
  data: e,
200
- onClick: onClickEvent
217
+ onClick: onClick
201
218
  });
202
- })))));
219
+ }));
203
220
  };
204
221
 
205
222
  export default EventListPanel;
@@ -1,5 +1,6 @@
1
1
  import React from 'react';
2
2
  import { IconFontProps } from '@ant-design/icons/lib/components/IconFont';
3
+ import '../assets/iconfont/iconfont.css';
3
4
  interface Props extends IconFontProps {
4
5
  family?: string;
5
6
  size?: number;
@@ -11,6 +11,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
11
11
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
12
12
 
13
13
  import React, { useMemo } from 'react';
14
+ import '../assets/iconfont/iconfont.css';
14
15
 
15
16
  var IconFont = function IconFont(props) {
16
17
  var className = props.className,
package/es/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /// <reference path="../typings.d.ts" />
2
- import BizAnalysisLayout from './analysisLayout';
2
+ import BizAnalysisLayout from './layout/analysisLayout';
3
3
  import BizUserGroup from './userGroup';
4
4
  import BizTargetSelector from './targetSelector';
5
5
  import BizEventSelector from './eventSelector/index';
@@ -25,7 +25,8 @@ import BizAddToPanel from './addToPanel';
25
25
  import setGlobalConfig from './config';
26
26
  import BizCycleTime from './cycleTime';
27
27
  import BizDnd from './dnd';
28
- export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
28
+ import BizDetailLayout from './layout/detail';
29
+ export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
29
30
  export type { UserGroupTypes } from './userGroup/types';
30
31
  export type { BizSelectTypes } from './select/types';
31
32
  export type { AttributeSelect } from './attributeSelector/types';
package/es/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import BizAnalysisLayout from './analysisLayout';
1
+ import BizAnalysisLayout from './layout/analysisLayout';
2
2
  import BizUserGroup from './userGroup';
3
3
  import BizTargetSelector from './targetSelector';
4
4
  import BizEventSelector from './eventSelector/index';
@@ -24,4 +24,5 @@ import BizAddToPanel from './addToPanel';
24
24
  import setGlobalConfig from './config';
25
25
  import BizCycleTime from './cycleTime';
26
26
  import BizDnd from './dnd';
27
- export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
27
+ import BizDetailLayout from './layout/detail';
28
+ export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
@@ -11,7 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
11
11
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
12
12
 
13
13
  import React, { useEffect, useState } from 'react';
14
- import IconFont from '../icon/iconFont';
14
+ import IconFont from '../../icon/iconFont';
15
15
  import './index.less';
16
16
  import { Tooltip } from 'antd';
17
17
 
@@ -1,4 +1,4 @@
1
- @import '../commonStyle/icon.less';
1
+ @import '../../assets/styles/inner.less';
2
2
 
3
3
  .biz-layout-container {
4
4
  position: relative;
@@ -33,7 +33,7 @@
33
33
  box-sizing: border-box;
34
34
  width: 100%;
35
35
  height: calc(100% - 30px);
36
- padding: @searchPadding;
36
+ padding: @padding-lg;
37
37
  overflow: auto;
38
38
  .biz-left-content {
39
39
  min-height: 600px;
@@ -50,10 +50,10 @@
50
50
  line-height: 30px;
51
51
  text-align: center;
52
52
  background-color: #fff;
53
- border-top: @boxBorder;
53
+ border-top: 1px solid @border-color-base;
54
54
 
55
55
  .biz-layout-expand {
56
- color: @fontColor;
56
+ color: @text-color;
57
57
  font-size: 16px;
58
58
  cursor: pointer;
59
59
 
@@ -66,7 +66,7 @@
66
66
 
67
67
  .biz-layout-right {
68
68
  box-sizing: border-box;
69
- padding: @contentPadding;
69
+ padding: @padding-lg;
70
70
  overflow: auto;
71
71
  background-color: #fff;
72
72
 
@@ -91,22 +91,22 @@
91
91
  font-size: 24px;
92
92
  text-align: center;
93
93
  background: #ffffff;
94
- border: @boxBorder;
94
+ border: 1px solid @border-color-split;
95
95
  border-top-right-radius: 20px;
96
96
  border-bottom-right-radius: 20px;
97
97
  cursor: pointer;
98
98
 
99
99
  .biz-layout-pickup-icon {
100
- color: @layoutIconColor;
100
+ color: @icon-color;
101
101
  font-size: 24px;
102
102
  }
103
103
 
104
104
  &:hover {
105
- color: @hoverColor;
106
- background-color: @hoverBgColor;
105
+ color: @primary-color;
106
+ background-color: @primary-color-hover;
107
107
 
108
108
  .biz-layout-pickup-icon {
109
- color: @hoverColor;
109
+ color: @primary-color;
110
110
  }
111
111
  }
112
112
  }
@@ -115,10 +115,10 @@
115
115
  position: absolute;
116
116
  bottom: 20px;
117
117
  left: 16px;
118
- color: @layoutIconColor;
118
+ color: @icon-color;
119
119
  font-size: 24px;
120
120
  cursor: pointer;
121
121
  &:hover {
122
- color: @hoverColor;
122
+ color: @primary-color;
123
123
  }
124
124
  }
@@ -0,0 +1,2 @@
1
+ declare const _default: () => JSX.Element;
2
+ export default _default;
@@ -0,0 +1,12 @@
1
+ import React from 'react';
2
+ import { BizDetailLayout } from '@zgfe/business-lib';
3
+ export default (function () {
4
+ return /*#__PURE__*/React.createElement("div", {
5
+ style: {
6
+ background: '#FAFAFB',
7
+ padding: '24px'
8
+ }
9
+ }, /*#__PURE__*/React.createElement(BizDetailLayout, {
10
+ extra: /*#__PURE__*/React.createElement(React.Fragment, null, "\u9875\u9762extra")
11
+ }, "\u9875\u9762\u5185\u5BB9"));
12
+ });
@@ -0,0 +1,9 @@
1
+ import React from 'react';
2
+ import './index.less';
3
+ declare const BizDetailLayout: React.FC<{
4
+ width?: number;
5
+ onBack?: () => void;
6
+ extra?: React.ReactNode;
7
+ children?: React.ReactNode;
8
+ }>;
9
+ export default BizDetailLayout;
@@ -0,0 +1,24 @@
1
+ import React from 'react';
2
+ import { IconFont } from '../..';
3
+ import './index.less';
4
+
5
+ var BizDetailLayout = function BizDetailLayout(props) {
6
+ var width = props.width;
7
+ var classPrefix = 'biz-detail';
8
+ return /*#__PURE__*/React.createElement("div", {
9
+ className: classPrefix,
10
+ style: {
11
+ width: width ? "".concat(width, "px") : undefined
12
+ }
13
+ }, /*#__PURE__*/React.createElement("div", {
14
+ className: "".concat(classPrefix, "-menu")
15
+ }, /*#__PURE__*/React.createElement("a", {
16
+ onClick: props.onBack
17
+ }, /*#__PURE__*/React.createElement(IconFont, {
18
+ type: "fanhuiicon"
19
+ }), "\u8FD4\u56DE"), props.extra), /*#__PURE__*/React.createElement("div", {
20
+ className: "".concat(classPrefix, "-content")
21
+ }, props.children));
22
+ };
23
+
24
+ export default BizDetailLayout;
@@ -0,0 +1,28 @@
1
+ @import '../../assets/styles/inner.less';
2
+ .biz-detail {
3
+ display: flex;
4
+ flex-direction: column;
5
+ width: 1376px;
6
+ height: 100%;
7
+ margin: 0 auto;
8
+ &-menu {
9
+ flex: none;
10
+ padding-top: @padding-md;
11
+ padding-bottom: @padding-md - 2;
12
+ color: @text-color-secondary;
13
+ a {
14
+ margin-right: @margin-md;
15
+ color: @text-color-secondary;
16
+ &:hover {
17
+ color: @primary-color;
18
+ }
19
+ }
20
+ }
21
+ &-content {
22
+ flex: 1;
23
+ padding: @padding-sm @padding-lg @padding-lg @padding-lg;
24
+ overflow-y: auto;
25
+ background-color: @white;
26
+ border-radius: @border-radius-normal;
27
+ }
28
+ }
@@ -105,11 +105,13 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
105
105
 
106
106
  return /*#__PURE__*/React.createElement("div", {
107
107
  ref: handleRef,
108
- className: "".concat(classPrefix, "-input ").concat(classPrefix, "-single-input ").concat(props.theme ? props.theme : '', "\n ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
108
+ className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
109
109
  title: props.label || props.value && props.value[labelField]
110
+ }, /*#__PURE__*/React.createElement("span", {
111
+ className: "".concat(classPrefix, "-content")
110
112
  }, props.label || props.value && props.value[labelField] || /*#__PURE__*/React.createElement("span", {
111
113
  className: "".concat(classPrefix, "-holder")
112
- }, placeholder || '请选择'), /*#__PURE__*/React.createElement(IconFont, {
114
+ }, placeholder || '请选择')), /*#__PURE__*/React.createElement(IconFont, {
113
115
  className: "".concat(classPrefix, "-expand-icon"),
114
116
  type: 'xiangxia'
115
117
  }));
@@ -164,7 +164,7 @@ var BizSelect = function BizSelect(props) {
164
164
  width: overlayWidth || width
165
165
  },
166
166
  trigger: ['click'],
167
- getPopupContainer: props.popupContainer || props.multiple ? function () {
167
+ getPopupContainer: props.popupContainer ? function () {
168
168
  return document.getElementById(selectId);
169
169
  } : undefined,
170
170
  visible: visible,
@@ -4,8 +4,7 @@
4
4
  &-input {
5
5
  position: relative;
6
6
  flex: 1;
7
- padding: 0px 8px;
8
-
7
+ padding: 0px 6px 0 8px;
9
8
  &.disable {
10
9
  .__disable();
11
10
  .bsicon {
@@ -78,24 +77,19 @@
78
77
  font-size: @font-size-base;
79
78
  }
80
79
 
81
- &-single-input {
82
- .__default-overflow();
83
- }
84
-
85
80
  &-holder {
86
81
  color: @input-placeholder-color;
87
82
  }
88
-
83
+ &-content {
84
+ flex: 1;
85
+ .__default-overflow();
86
+ }
89
87
  &-expand-icon {
90
- position: absolute;
91
- top: 50%;
92
- right: 8px;
93
- flex: none;
94
- color: @text-color-secondary;
95
- font-size: @font-size-lg;
96
- transform: translateY(-50%);
88
+ width: 14px;
89
+ margin-left: 5px;
97
90
  }
98
91
  &-input {
92
+ display: flex;
99
93
  #biz-select-handle-tag {
100
94
  display: flex;
101
95
  align-items: center;
@@ -67,7 +67,7 @@
67
67
  &.biz-select-option-multiple {
68
68
  &:hover:not(.disabled) {
69
69
  color: @primary-color;
70
- background-color: color(~`colorPalette('@{primary-color}', 0.1) `);
70
+ background-color: @primary-color-hover;
71
71
  }
72
72
 
73
73
  &.active:not(.disabled) {