@zgfe/business-lib 1.0.0-beta.1 → 1.0.0-beta.2

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 (90) hide show
  1. package/es/analysisLayout/demo/index.js +1 -1
  2. package/es/analysisLayout/index.js +1 -4
  3. package/es/analysisLayout/index.less +2 -1
  4. package/es/assets/iconfont/iconfont.css +123 -0
  5. package/es/assets/iconfont/iconfont.js +46 -0
  6. package/es/assets/iconfont/iconfont.json +198 -0
  7. package/es/assets/iconfont/iconfont.ttf +0 -0
  8. package/es/assets/iconfont/iconfont.woff +0 -0
  9. package/es/assets/iconfont/iconfont.woff2 +0 -0
  10. package/es/attributeSelector/demo/multi.js +1 -1
  11. package/es/attributeSelector/demo/multiForm.js +1 -1
  12. package/es/attributeSelector/demo/single.js +1 -1
  13. package/es/attributeSelector/demo/singleForm.js +1 -1
  14. package/es/attributeSelector/group.js +1 -1
  15. package/es/attributeSelector/index.js +2 -1
  16. package/es/attributeSelector/index.less +2 -2
  17. package/es/chart/chartConfig.d.ts +20 -5
  18. package/es/chart/chartConfig.js +169 -117
  19. package/es/chart/demo/bar.js +8 -12
  20. package/es/chart/demo/data/data.d.ts +8 -0
  21. package/es/chart/demo/data/data.js +28 -0
  22. package/es/chart/demo/index.js +6 -5
  23. package/es/chart/demo/pie.js +5 -22
  24. package/es/chart/index.d.ts +28 -12
  25. package/es/chart/index.js +94 -17
  26. package/es/chart/util/format.d.ts +4 -0
  27. package/es/chart/util/format.js +61 -0
  28. package/es/commonStyle/icon.less +32 -5
  29. package/es/commonStyle/index.less +3 -171
  30. package/es/commonStyle/select.less +3 -12
  31. package/es/commonStyle/theme.less +80 -39
  32. package/es/commonStyle/variable.less +5 -2
  33. package/es/components/iconFont.d.ts +5 -0
  34. package/es/components/iconFont.js +30 -0
  35. package/es/datePicker/demo/form.js +1 -1
  36. package/es/datePicker/demo/index.js +1 -1
  37. package/es/datePicker/index.js +8 -15
  38. package/es/datePicker/index.less +4 -28
  39. package/es/dialog/components/list.js +1 -1
  40. package/es/dialog/components/selectToInput.js +12 -1
  41. package/es/dialog/components/style/list.less +1 -1
  42. package/es/dialog/components/style/tab.less +2 -2
  43. package/es/dialog/components/tab.js +1 -1
  44. package/es/dialog/demo/index.js +1 -1
  45. package/es/dialog/demo/index2.js +20 -2
  46. package/es/dialog/demo/index3.js +1 -1
  47. package/es/dialog/style/index.less +7 -1
  48. package/es/eventSelector/demo/form.js +1 -1
  49. package/es/eventSelector/demo/index.js +1 -1
  50. package/es/eventSelector/demo/nodata.js +1 -1
  51. package/es/eventSelector/index.d.ts +1 -1
  52. package/es/eventSelector/index.js +3 -13
  53. package/es/eventSelector/{cascade.less → index.less} +2 -1
  54. package/es/globalAttributes/demo/index.js +1 -1
  55. package/es/globalAttributes/index.js +2 -1
  56. package/es/index.d.ts +1 -1
  57. package/es/index.js +1 -4
  58. package/es/multipleSelector/demo/index.js +1 -1
  59. package/es/multipleSelector/index.js +2 -8
  60. package/es/multipleSelector/index.less +23 -25
  61. package/es/select/demo/index.js +32 -4
  62. package/es/select/index.d.ts +2 -1
  63. package/es/select/index.js +30 -8
  64. package/es/select/index.less +1 -0
  65. package/es/table/demo/index.js +1 -1
  66. package/es/table/demo/index2.js +1 -1
  67. package/es/table/index.js +1 -1
  68. package/es/table/index.less +78 -41
  69. package/es/targetConditionGroup/components/conditionItem.js +3 -3
  70. package/es/targetConditionGroup/components/style/group.less +1 -1
  71. package/es/targetConditionGroup/components/style/index.less +1 -1
  72. package/es/targetConditionGroup/demo/form.js +1 -1
  73. package/es/targetConditionGroup/demo/index.js +1 -1
  74. package/es/targetConditionGroup/index.js +2 -1
  75. package/es/targetConditionGroup/index.less +1 -2
  76. package/es/targetSelector/components/BizCascadeBox.d.ts +1 -1
  77. package/es/targetSelector/components/BizCascadeBox.js +1 -1
  78. package/es/targetSelector/demo/form.js +1 -1
  79. package/es/targetSelector/demo/index.js +1 -1
  80. package/es/targetSelector/demo/nodata.js +1 -1
  81. package/es/targetSelector/index.js +1 -2
  82. package/es/targetSelector/index.less +1 -26
  83. package/es/userGroup/demo/cluster.js +1 -1
  84. package/es/userGroup/demo/index.js +1 -1
  85. package/es/userGroup/index.js +1 -2
  86. package/es/userGroup/index.less +1 -1
  87. package/es/userGroup/userCluster.js +2 -1
  88. package/package.json +1 -1
  89. package/es/chart/demo/data.d.ts +0 -11
  90. package/es/chart/demo/data.js +0 -37
@@ -1,4 +1,5 @@
1
- @import '../commonStyle/theme.less';
1
+ @import '../commonStyle/select.less';
2
+ @import '../commonStyle/icon.less';
2
3
 
3
4
  .dropdown {
4
5
  height: 100%;
@@ -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, { useState } from 'react';
14
- import { BizGlobalAttributes } from 'business-lib';
14
+ import { BizGlobalAttributes } from '@zgfe/business-lib';
15
15
  import eventData from './data/event';
16
16
  import envData from './data/env';
17
17
  import userData from './data/user';
@@ -25,7 +25,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
25
25
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
26
26
 
27
27
  import React, { useEffect, useState } from 'react';
28
- import { BizConditionGroup, IconFont } from '..';
28
+ import { BizConditionGroup } from '..';
29
+ import IconFont from '../components/iconFont';
29
30
 
30
31
  var BizGlobalAttributes = function BizGlobalAttributes(props) {
31
32
  var _props$defaultValue = props.defaultValue,
package/es/index.d.ts CHANGED
@@ -16,8 +16,8 @@ import BizSelect from './select';
16
16
  import BizDialog from './dialog';
17
17
  import BizChart from './chart';
18
18
  import BizTable from './table';
19
+ import IconFont from './components/iconFont';
19
20
  import { util, ajax } from './utils';
20
21
  import { GlobalContextProps } from './utils/type';
21
- declare const IconFont: import("react").FC<import("@ant-design/icons/lib/components/IconFont").IconFontProps<string>>;
22
22
  declare const BizGlobalDataContext: import("react").Context<GlobalContextProps>;
23
23
  export { BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, BizUserCluster, IconFont, BizTargetSelector, BizEventSelector, BizGroupSelect, BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector, BizTargetCondition, BizDatePicker, BizConditionGroup, BizGlobalAttributes, ajax, util, };
package/es/index.js CHANGED
@@ -3,7 +3,6 @@ import BizAnalysisLayout from './AnalysisLayout';
3
3
  import BizUserGroup from './userGroup';
4
4
  import BizUserCluster from './userGroup/userCluster';
5
5
  import BizTargetSelector from './targetSelector';
6
- import { createFromIconfontCN } from '@ant-design/icons';
7
6
  import BizEventSelector from './eventSelector';
8
7
  import BizAttributeSelector from './attributeSelector';
9
8
  import { createContext } from 'react';
@@ -17,9 +16,7 @@ import BizSelect from './select';
17
16
  import BizDialog from './dialog';
18
17
  import BizChart from './chart';
19
18
  import BizTable from './table';
19
+ import IconFont from './components/iconFont';
20
20
  import { util, ajax } from './utils';
21
- var IconFont = createFromIconfontCN({
22
- scriptUrl: '//at.alicdn.com/t/font_422162_0fv3r3nvceb6.js'
23
- });
24
21
  var BizGlobalDataContext = /*#__PURE__*/createContext({});
25
22
  export { BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, BizUserCluster, IconFont, BizTargetSelector, BizEventSelector, BizGroupSelect, BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector, BizTargetCondition, BizDatePicker, BizConditionGroup, BizGlobalAttributes, ajax, util };
@@ -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, { useState } from 'react';
14
- import { BizMultipleSelector } from 'business-lib';
14
+ import { BizMultipleSelector } from '@zgfe/business-lib';
15
15
  var options = ['CHROME48', 'FIREFOX37', 'CHROME21', 'Firefox', 'FIREFOX_MOBILE', 'BOT', 'FIREFOX9', 'MOBILE_SAFARI', 'MOBILE_SAFARI2', 'MOBILE_SAFARI4'];
16
16
  export default (function () {
17
17
  var _useState = useState(['CHROME48']),
@@ -24,7 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
24
24
 
25
25
  import React, { useState } from 'react';
26
26
  import { Select } from 'antd';
27
- import { IconFont } from '..';
27
+ import IconFont from '../components/iconFont';
28
28
  import './index.less';
29
29
  import Tag from 'antd/es/tag';
30
30
  import Tooltip from 'antd/es/tooltip';
@@ -41,13 +41,7 @@ var BizMultipleSelector = function BizMultipleSelector(props) {
41
41
  var _useState = useState(false),
42
42
  _useState2 = _slicedToArray(_useState, 2),
43
43
  focused = _useState2[0],
44
- setFocused = _useState2[1]; // const [defaultData, setDefaultData] = useState<Array<string|number>>()
45
- // useEffect(()=>{
46
- // let intoValue = defaultValue||value;
47
- // if(defaultData===intoValue) return;
48
- // setDefaultData(()=>intoValue)
49
- // },[defaultValue,value])
50
-
44
+ setFocused = _useState2[1];
51
45
 
52
46
  var tagRender = function tagRender(props) {
53
47
  var label = props.label,
@@ -1,4 +1,4 @@
1
- @import '../commonStyle/index.less';
1
+ @import '../commonStyle/theme.less';
2
2
 
3
3
  .biz-multi-container {
4
4
  position: relative;
@@ -28,16 +28,17 @@
28
28
  &:hover {
29
29
  border-color: @themeColor;
30
30
  .box-hover();
31
+ span {
32
+ color: @themeColor;
33
+ }
31
34
 
32
35
  .ant-select-selection-item-remove,
33
36
  .ant-tag-close-icon {
34
37
  display: flex;
35
38
  align-items: center;
36
39
  margin-left: 7px;
40
+ color: @themeColor;
37
41
  font-size: 12px;
38
- .anticon {
39
- color: @themeColor;
40
- }
41
42
  }
42
43
  }
43
44
 
@@ -79,24 +80,24 @@
79
80
  }
80
81
 
81
82
  .biz-multi-select {
82
- &.ant-select-dropdown {
83
- width: @dropdownWidth !important;
84
- min-width: @dropdownWidth !important;
85
- padding: @selectItem2Padding;
86
- background: #ffffff;
87
- border-radius: @specialRadius;
88
- box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
89
- }
83
+ // &.ant-select-dropdown {
84
+ // width: @dropdownWidth !important;
85
+ // min-width: @dropdownWidth !important;
86
+ // padding: @selectItemPadding;
87
+ // background: #ffffff;
88
+ // border-radius: @boxRadius2;
89
+ // box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
90
+ // }
90
91
 
91
92
  .ant-select-item {
92
- display: flex;
93
- flex-direction: row;
94
- align-items: center;
95
- height: 48px;
96
- padding: @dropdownItemPadding;
97
- padding-left: 8px;
98
- font-weight: 400;
99
- border-radius: @specialRadius;
93
+ // display: flex;
94
+ // flex-direction: row;
95
+ // align-items: center;
96
+ // height: 48px;
97
+ // padding: @dropdownItemPadding;
98
+ // padding-left: 8px;
99
+ // font-weight: 400;
100
+ // border-radius: @specialRadius;
100
101
 
101
102
  .biz-icon-notcheck {
102
103
  color: #cacdd4;
@@ -114,17 +115,14 @@
114
115
  }
115
116
 
116
117
  .ant-select-item-option-active:not(.ant-select-item-option-disabled) {
117
- color: @hoverColor;
118
- background-color: @hoverBgColor !important;
119
-
120
118
  .biz-icon-notcheck {
121
119
  color: @themeColor;
122
120
  }
123
121
  }
124
122
 
125
123
  .ant-select-item-option-selected:not(.ant-select-item-option-disabled) {
126
- color: @hoverColor;
127
- background-color: #ffffff;
124
+ color: @hoverColor !important;
125
+ background-color: #ffffff !important;
128
126
 
129
127
  .biz-icon-notcheck {
130
128
  display: none;
@@ -1,5 +1,18 @@
1
- import React from 'react';
2
- import { BizSelect } from 'business-lib';
1
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
+
3
+ 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."); }
4
+
5
+ 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); }
6
+
7
+ 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; }
8
+
9
+ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
10
+
11
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
12
+
13
+ import React, { useState } from 'react';
14
+ import { BizSelect } from '@zgfe/business-lib';
15
+ import { Button } from 'antd';
3
16
  var options = [{
4
17
  label: 'test',
5
18
  value: 'test'
@@ -11,12 +24,27 @@ var options = [{
11
24
  value: 'test3'
12
25
  }];
13
26
  export default (function () {
27
+ var _useState = useState('test2'),
28
+ _useState2 = _slicedToArray(_useState, 2),
29
+ data = _useState2[0],
30
+ setData = _useState2[1];
31
+
14
32
  var handleChange = function handleChange(value) {
15
33
  console.log('select >>', value);
34
+ setData(function () {
35
+ return value;
36
+ });
16
37
  };
17
38
 
18
- return /*#__PURE__*/React.createElement(BizSelect, {
39
+ return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizSelect, {
19
40
  options: options,
41
+ value: data,
20
42
  onChange: handleChange
21
- });
43
+ }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
44
+ onClick: function onClick() {
45
+ setData(function () {
46
+ return null;
47
+ });
48
+ }
49
+ }, "clear"));
22
50
  });
@@ -1,5 +1,6 @@
1
1
  import React from 'react';
2
2
  import { SelectProps } from 'antd/lib/select';
3
+ import './index.less';
3
4
  interface fieldNamesProps {
4
5
  label: string;
5
6
  value: string;
@@ -31,7 +32,7 @@ interface BizSelectProps {
31
32
  * @description 文本框类
32
33
  * @default small
33
34
  */
34
- inputClass?: string;
35
+ dropdownSize?: string;
35
36
  /**
36
37
  * @description 弹窗样式
37
38
  * @default false
@@ -1,4 +1,4 @@
1
- var _excluded = ["value", "defaultValue", "isDialog", "placeholder", "fieldNames", "inputClass", "size", "createOption", "search", "create", "options", "name", "bordered"];
1
+ var _excluded = ["value", "defaultValue", "isDialog", "placeholder", "fieldNames", "dropdownSize", "size", "createOption", "search", "create", "options", "name", "bordered", "className", "onChange"];
2
2
 
3
3
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
4
4
 
@@ -23,9 +23,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
23
23
  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; }
24
24
 
25
25
  import { Input, Select } from 'antd';
26
- import React, { useState } from 'react';
27
- import { IconFont } from '..';
26
+ import React, { useEffect, useState } from 'react';
27
+ import IconFont from '../components/iconFont';
28
28
  import { util } from '../utils';
29
+ import './index.less';
29
30
  var Option = Select.Option;
30
31
 
31
32
  var BizSelect = function BizSelect(props) {
@@ -40,7 +41,7 @@ var BizSelect = function BizSelect(props) {
40
41
  label: 'label',
41
42
  value: 'value'
42
43
  } : _props$fieldNames,
43
- inputClass = props.inputClass,
44
+ dropdownSize = props.dropdownSize,
44
45
  _props$size = props.size,
45
46
  size = _props$size === void 0 ? 'small' : _props$size,
46
47
  createOption = props.createOption,
@@ -53,6 +54,8 @@ var BizSelect = function BizSelect(props) {
53
54
  name = _props$name === void 0 ? '' : _props$name,
54
55
  _props$bordered = props.bordered,
55
56
  bordered = _props$bordered === void 0 ? true : _props$bordered,
57
+ className = props.className,
58
+ _onChange = props.onChange,
56
59
  res = _objectWithoutProperties(props, _excluded);
57
60
 
58
61
  var _useState = useState(''),
@@ -70,14 +73,27 @@ var BizSelect = function BizSelect(props) {
70
73
  currentOption = _useState6[0],
71
74
  setCurrentOption = _useState6[1];
72
75
 
76
+ var _useState7 = useState(),
77
+ _useState8 = _slicedToArray(_useState7, 2),
78
+ selectValue = _useState8[0],
79
+ setSelectValue = _useState8[1];
80
+
81
+ useEffect(function () {
82
+ var data = defaultValue || value;
83
+
84
+ if (data !== selectValue) {
85
+ setSelectValue(function () {
86
+ return data;
87
+ });
88
+ }
89
+ }, [defaultValue, value]);
73
90
  return /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({
74
- className: size,
75
- defaultValue: defaultValue || value,
76
- dropdownClassName: "biz-single-select-dropdown",
91
+ className: "".concat(size, " ").concat(className),
92
+ value: selectValue,
93
+ dropdownClassName: "biz-single-select-dropdown ".concat(dropdownSize ? dropdownSize : ''),
77
94
  placeholder: placeholder || "\u8BF7\u9009\u62E9".concat(name || '')
78
95
  }, res), {}, {
79
96
  bordered: bordered,
80
- defaultOpen: false,
81
97
  suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
82
98
  className: "biz-icon1",
83
99
  type: 'icon-xiangxia'
@@ -120,6 +136,12 @@ var BizSelect = function BizSelect(props) {
120
136
  }), /*#__PURE__*/React.createElement("span", {
121
137
  className: "biz-icon-text"
122
138
  }, "\u6DFB\u52A0".concat(name))), menu);
139
+ },
140
+ onChange: function onChange(value, option) {
141
+ setSelectValue(function () {
142
+ return value;
143
+ });
144
+ _onChange && _onChange(value, option);
123
145
  }
124
146
  }), currentOption.map(function (item) {
125
147
  return /*#__PURE__*/React.createElement(Option, {
@@ -0,0 +1 @@
1
+ @import '../commonStyle/theme.less';
@@ -27,7 +27,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
27
27
  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; }
28
28
 
29
29
  import React, { useEffect, useState } from 'react';
30
- import { BizTable } from 'business-lib';
30
+ import { BizTable } from '@zgfe/business-lib';
31
31
  import util from '../../utils/util';
32
32
  import chartData from './data/data';
33
33
  import { chartColors as color } from './data/color';
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { BizTable } from 'business-lib';
2
+ import { BizTable } from '@zgfe/business-lib';
3
3
  import tableData, { columns } from './data/table';
4
4
  export default (function () {
5
5
  return /*#__PURE__*/React.createElement(BizTable, {
package/es/table/index.js CHANGED
@@ -47,6 +47,7 @@ var BizTable = function BizTable(props) {
47
47
  columns: columns,
48
48
  dataSource: dataSource,
49
49
  pagination: pagination && {
50
+ className: 'biz-pagination',
50
51
  showSizeChanger: true,
51
52
  total: total,
52
53
  showQuickJumper: true,
@@ -56,7 +57,6 @@ var BizTable = function BizTable(props) {
56
57
  }, totalNum), " \u6761") : '';
57
58
  },
58
59
  onChange: function onChange(page, pageSize) {
59
- console.log(page, pageSize);
60
60
  var count = page * pageSize;
61
61
 
62
62
  if (pageSize > 10 && (count <= total || total - (page - 1) * pageSize > 10)) {
@@ -1,4 +1,4 @@
1
- @import '../commonStyle/index.less';
1
+ @import '../commonStyle/theme.less';
2
2
 
3
3
  .ant-table {
4
4
  color: @fontColor3;
@@ -11,6 +11,7 @@
11
11
  line-height: 16px;
12
12
  background: @grayColor;
13
13
  border: none;
14
+
14
15
  &::before {
15
16
  width: 0 !important;
16
17
  }
@@ -29,6 +30,7 @@
29
30
 
30
31
  &.ant-table-cell-fix-left {
31
32
  border-bottom: none;
33
+
32
34
  &.ant-table-cell-fix-left-last {
33
35
  border-right: 1px solid @borderColor;
34
36
  }
@@ -36,6 +38,7 @@
36
38
  }
37
39
  }
38
40
  }
41
+
39
42
  .ant-table-tbody > tr.ant-table-row:hover > td,
40
43
  .ant-table-tbody > tr > td.ant-table-cell-row-hover {
41
44
  background: @hoverBgColor;
@@ -45,58 +48,92 @@
45
48
  color: @themeColor;
46
49
  }
47
50
 
48
- .ant-select-item {
49
- border-radius: 10px;
50
- }
51
-
52
- .ant-select-item-option-active:not(.ant-select-item-option-disabled, .ant-select-item-option-selected) {
53
- color: @themeColor;
54
- background: @hoverBgColor;
55
- }
56
-
57
- .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input)
58
- .ant-select-selector,
59
- .ant-select:not(.ant-select-disabled):hover .ant-select-selector {
60
- color: @themeColor;
61
- background: @hoverBgColor;
62
- border-color: @themeColor;
63
- box-shadow: none;
64
- }
65
-
66
- .ant-pagination-item {
67
- color: @fontColor3;
68
- font-weight: 400;
69
- background: #fafafb;
70
- border: none;
71
- border-radius: 4px;
51
+ .biz-pagination {
52
+ .ant-select-item {
53
+ border-radius: 10px;
54
+ }
72
55
 
73
- &.ant-pagination-item-active {
74
- background: @themeColor;
56
+ .ant-select-arrow {
57
+ height: 12px;
58
+ margin-top: -6px;
59
+ font-size: 12px;
60
+ }
61
+ .ant-select-dropdown {
62
+ width: 100%;
63
+ }
75
64
 
76
- a {
77
- color: #fff;
78
- }
65
+ .ant-select-item-option-active:not(.ant-select-item-option-disabled, .ant-select-item-option-selected) {
66
+ color: @themeColor;
67
+ background: @hoverBgColor;
79
68
  }
80
- &:hover {
69
+
70
+ .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input)
71
+ .ant-select-selector,
72
+ .ant-select:not(.ant-select-disabled):hover .ant-select-selector {
81
73
  color: @themeColor;
74
+ background: @hoverBgColor;
75
+ border-color: @themeColor;
76
+ box-shadow: none;
82
77
  }
83
- }
84
78
 
85
- .ant-pagination-prev,
86
- .ant-pagination-next {
87
- .ant-pagination-item-link {
79
+ .ant-pagination-item {
80
+ color: @fontColor3;
88
81
  font-weight: 400;
89
82
  background: #fafafb;
90
83
  border: none;
91
84
  border-radius: 4px;
85
+
86
+ &.ant-pagination-item-active {
87
+ background: @themeColor;
88
+
89
+ a {
90
+ color: #fff;
91
+ }
92
+ }
93
+
94
+ &:not(.ant-pagination-item-active):hover {
95
+ a {
96
+ color: @themeColor;
97
+ }
98
+ }
92
99
  }
93
- }
94
100
 
95
- .ant-select:not(.ant-select-customize-input) {
96
- .ant-select-selector {
97
- &:hover {
98
- color: @themeColor;
99
- background: @hoverBgColor;
101
+ .ant-pagination-prev,
102
+ .ant-pagination-next {
103
+ .ant-pagination-item-link {
104
+ color: @fontColor3;
105
+ font-weight: 400;
106
+ background: #fafafb;
107
+ border: none;
108
+ border-radius: 4px;
109
+
110
+ &:hover {
111
+ color: @themeColor;
112
+ }
113
+ }
114
+ }
115
+
116
+ .ant-select:not(.ant-select-customize-input) {
117
+ .ant-select-selector {
118
+ &:hover {
119
+ color: @themeColor;
120
+ background: @hoverBgColor;
121
+ }
122
+ }
123
+ }
124
+
125
+ .ant-pagination-options-quick-jumper input {
126
+ padding: 6px 12px;
127
+ color: @fontColor2;
128
+ background-color: #fff;
129
+ background-image: none;
130
+ border: 1px solid @borderColor;
131
+ border-radius: @boxRadius;
132
+
133
+ &:focus {
134
+ background: #fff !important;
135
+ border-color: @themeColor !important;
136
+ box-shadow: 0 0 0 4px #e8efff !important;
100
137
  }
101
138
  }
102
139
  }
@@ -38,7 +38,8 @@ import React, { useContext, useEffect, useState } from 'react';
38
38
  import { Select } from 'antd';
39
39
  import { stringOperate } from '../data/operates';
40
40
  import './style/index.less';
41
- import { BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector, IconFont } from '../..';
41
+ import { BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector } from '../..';
42
+ import IconFont from '../../components/iconFont';
42
43
  import { ajax, util } from '../../utils';
43
44
 
44
45
  var BizConditionItem = function BizConditionItem(props) {
@@ -215,8 +216,7 @@ var BizConditionItem = function BizConditionItem(props) {
215
216
  }, /*#__PURE__*/React.createElement(Select, {
216
217
  options: stringOperate,
217
218
  defaultValue: operator,
218
- className: "biz-condition-operate ".concat(!Object.keys(attr).length ? 'no-active' : ''),
219
- bordered: false,
219
+ className: "biz-condition-operate biz-borderless ".concat(!Object.keys(attr).length ? 'no-active' : ''),
220
220
  dropdownClassName: "small",
221
221
  fieldNames: {
222
222
  label: 'name',
@@ -1,4 +1,4 @@
1
- @import '../../../commonStyle/index.less';
1
+ @import '../../../commonStyle/variable.less';
2
2
 
3
3
  .biz-attr-group-container {
4
4
  display: flex;
@@ -6,7 +6,7 @@
6
6
  .biz-condition-operate {
7
7
  width: 88px !important;
8
8
  margin-right: 8px;
9
- background: #f6f6f6;
9
+ // background: #f6f6f6;
10
10
  }
11
11
  }
12
12
  .no-active {
@@ -18,7 +18,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
18
18
 
19
19
  import { Button, Form } from 'antd';
20
20
  import React, { useState } from 'react';
21
- import { BizTargetCondition } from 'business-lib';
21
+ import { BizTargetCondition } from '@zgfe/business-lib';
22
22
  import eventData from './data/event';
23
23
  import envData from './data/env';
24
24
  import userData from './data/user';
@@ -17,7 +17,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
17
17
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
18
18
 
19
19
  import React, { useState } from 'react';
20
- import { BizTargetCondition } from 'business-lib';
20
+ import { BizTargetCondition } from '@zgfe/business-lib';
21
21
  import eventData from './data/event';
22
22
  import envData from './data/env';
23
23
  import userData from './data/user';
@@ -33,7 +33,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
33
33
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
34
34
 
35
35
  import React, { useEffect, useState } from 'react';
36
- import { BizTargetSelector, BizEventSelector, BizConditionGroup, IconFont } from '..';
36
+ import { BizTargetSelector, BizEventSelector, BizConditionGroup } from '..';
37
+ import IconFont from '../components/iconFont';
37
38
  import { Dropdown, Menu } from 'antd';
38
39
  import { dimensionOperate } from './data/operates';
39
40
  import './index.less';
@@ -1,5 +1,4 @@
1
- @import '../commonStyle/index.less';
2
- @import '../commonStyle/theme.less';
1
+ @import '../commonStyle/select.less';
3
2
 
4
3
  .biz-attr-group-container {
5
4
  display: flex;
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import '../cascade.less';
2
+ import '../index.less';
3
3
  import { Event, Option } from '../../eventSelector/type';
4
4
  interface DropDownProps {
5
5
  /**
@@ -35,7 +35,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
35
35
  */
36
36
  import { Input, List, Skeleton } from 'antd';
37
37
  import React, { useEffect, useState } from 'react';
38
- import '../cascade.less';
38
+ import '../index.less';
39
39
  import { UserOutlined } from '@ant-design/icons';
40
40
  import InfiniteScroll from 'react-infinite-scroll-component';
41
41
  export var BizEventSelector = function BizEventSelector(props) {
@@ -12,7 +12,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
12
12
 
13
13
  import { Button, Form } from 'antd';
14
14
  import React, { useState } from 'react';
15
- import { BizTargetSelector, BizEventSelector } from 'business-lib';
15
+ import { BizTargetSelector, BizEventSelector } from '@zgfe/business-lib';
16
16
  var cascadeOptions = [{
17
17
  value: 1,
18
18
  label: '整体',
@@ -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, { useState } from 'react';
14
- import { BizTargetSelector, BizEventSelector } from 'business-lib';
14
+ import { BizTargetSelector, BizEventSelector } from '@zgfe/business-lib';
15
15
  var cascadeOptions = [{
16
16
  value: 1,
17
17
  label: '整体',
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { BizTargetSelector, BizEventSelector } from 'business-lib';
2
+ import { BizTargetSelector, BizEventSelector } from '@zgfe/business-lib';
3
3
  var optionGroup = [];
4
4
 
5
5
  var EventDemo = function EventDemo() {