@zgfe/business-lib 1.2.57-plat.0 → 1.2.58-ljy.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.
@@ -5,6 +5,55 @@
5
5
  "css_prefix_text": "",
6
6
  "description": "诸葛业务平台",
7
7
  "glyphs": [
8
+ {
9
+ "icon_id": "41736285",
10
+ "name": "更多",
11
+ "font_class": "gengduo",
12
+ "unicode": "e7d3",
13
+ "unicode_decimal": 59347
14
+ },
15
+ {
16
+ "icon_id": "41736270",
17
+ "name": "文件夹",
18
+ "font_class": "wenjianjia",
19
+ "unicode": "e7d4",
20
+ "unicode_decimal": 59348
21
+ },
22
+ {
23
+ "icon_id": "41736271",
24
+ "name": "拖拽",
25
+ "font_class": "tuozhuai",
26
+ "unicode": "e6b6",
27
+ "unicode_decimal": 59062
28
+ },
29
+ {
30
+ "icon_id": "41671151",
31
+ "name": "圈选",
32
+ "font_class": "quanxuan",
33
+ "unicode": "e7d0",
34
+ "unicode_decimal": 59344
35
+ },
36
+ {
37
+ "icon_id": "41671150",
38
+ "name": "上方添加",
39
+ "font_class": "shangfangtianjia",
40
+ "unicode": "e7d1",
41
+ "unicode_decimal": 59345
42
+ },
43
+ {
44
+ "icon_id": "41671149",
45
+ "name": "下方添加",
46
+ "font_class": "xiafangtianjia",
47
+ "unicode": "e7d2",
48
+ "unicode_decimal": 59346
49
+ },
50
+ {
51
+ "icon_id": "41671165",
52
+ "name": "版本",
53
+ "font_class": "chanpindiedai1",
54
+ "unicode": "e7cf",
55
+ "unicode_decimal": 59343
56
+ },
8
57
  {
9
58
  "icon_id": "41442688",
10
59
  "name": "quanping 1",
@@ -908,13 +957,6 @@
908
957
  "unicode": "e74a",
909
958
  "unicode_decimal": 59210
910
959
  },
911
- {
912
- "icon_id": "34602683",
913
- "name": "菜单-更多",
914
- "font_class": "caidan-gengduo",
915
- "unicode": "e748",
916
- "unicode_decimal": 59208
917
- },
918
960
  {
919
961
  "icon_id": "34580051",
920
962
  "name": "菜单-设置",
@@ -1216,13 +1258,6 @@
1216
1258
  "unicode": "e6b5",
1217
1259
  "unicode_decimal": 59061
1218
1260
  },
1219
- {
1220
- "icon_id": "31393505",
1221
- "name": "拖拽",
1222
- "font_class": "tuozhuai",
1223
- "unicode": "e6b6",
1224
- "unicode_decimal": 59062
1225
- },
1226
1261
  {
1227
1262
  "icon_id": "31393091",
1228
1263
  "name": "更多操作",
@@ -1384,13 +1419,6 @@
1384
1419
  "unicode": "e795",
1385
1420
  "unicode_decimal": 59285
1386
1421
  },
1387
- {
1388
- "icon_id": "28132747",
1389
- "name": "更多操作",
1390
- "font_class": "gengduocaozuo",
1391
- "unicode": "e751",
1392
- "unicode_decimal": 59217
1393
- },
1394
1422
  {
1395
1423
  "icon_id": "28451770",
1396
1424
  "name": "导出",
Binary file
Binary file
Binary file
@@ -26,6 +26,5 @@ declare const Apis: {
26
26
  queryPanels: string;
27
27
  queryMetaDatasetList: string;
28
28
  queryDatasetTableNames: string;
29
- queryPlatformList: string;
30
29
  };
31
30
  export default Apis;
@@ -25,7 +25,6 @@ var Apis = {
25
25
  querySubjectList: '/zg/web/v2/analysisSubject/queryAllSubject',
26
26
  queryPanels: '/zg/web/v2/apppanel/panels',
27
27
  queryMetaDatasetList: '/zg/web/v2/meta/dataset/list',
28
- queryDatasetTableNames: '/zg/web/cdp/dataset/manager/datasetList',
29
- queryPlatformList: '/zg/web/v2/data/dynamicPlatformByAppid'
28
+ queryDatasetTableNames: '/zg/web/cdp/dataset/manager/datasetList'
30
29
  };
31
30
  export default Apis;
@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
4
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
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
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
- import { BizDatePickerOld } from '@zgfe/business-lib';
7
+ import { BizDatePickerV2 } from '@zgfe/business-lib';
8
8
  import React, { useState } from 'react';
9
9
  import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
10
10
  import { Divider, Space, Switch } from 'antd';
@@ -55,7 +55,7 @@ export default (function () {
55
55
  }, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D: ", /*#__PURE__*/React.createElement(Switch, {
56
56
  defaultChecked: includeToday,
57
57
  onChange: setIncludeToday
58
- })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerOld, {
58
+ })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerV2, {
59
59
  includeToday: includeToday,
60
60
  value: time,
61
61
  defaultValue: time,
@@ -34,10 +34,6 @@ export default (function (props) {
34
34
  }, props)), /*#__PURE__*/React.createElement("div", {
35
35
  className: "".concat(classPrefix, "-popoverContent-btns")
36
36
  }, /*#__PURE__*/React.createElement(Button, {
37
- onClick: function onClick() {
38
- return setOpen(false);
39
- }
40
- }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
41
37
  type: "primary",
42
38
  onClick: function onClick() {
43
39
  if (ref.current) {
@@ -60,6 +60,10 @@
60
60
  border-radius: 0px @border-radius-small @border-radius-small 0px;
61
61
  }
62
62
 
63
+ &:not(:last-child) {
64
+ border-right: none;
65
+ }
66
+
63
67
  &:hover {
64
68
  .__default-hover();
65
69
  border-color: @border-color-base;
@@ -162,23 +166,29 @@
162
166
  & div:last-of-type {
163
167
  position: relative !important;
164
168
  }
165
-
169
+ .biz-date-picker-old-wrap-drop {
170
+ top: 0 !important;
171
+ margin-top: 12px;
172
+ padding: 0;
173
+ }
166
174
  .ant-picker-panel-container {
167
175
  background: #fff;
168
- border: 1px solid var(--io-n-02, #fafafb);
176
+ border: 1px solid var(--io-n-02, #f2f3f4);
169
177
  border-radius: 10px;
170
178
  box-shadow: none;
171
179
  }
172
180
 
173
181
  .ant-picker-panel-container .ant-picker-panel-focused {
174
- border-color: var(--io-n-02, #fafafb);
182
+ border-color: var(--io-n-02, #f2f3f4);
175
183
  }
176
184
  }
177
185
 
178
186
  &-popoverContent-btns {
187
+ position: absolute;
188
+ top: 0;
189
+ right: 0;
179
190
  display: flex;
180
191
  gap: 16px;
181
192
  justify-content: flex-end;
182
- padding-top: 16px;
183
193
  }
184
194
  }
@@ -1,15 +1,13 @@
1
1
  import { UserTagsSelectorTypes } from '../userTagsSelector/types';
2
2
  import { UserGroupTypes } from '../userGroup/types';
3
- import { AppInfoProps } from '../context';
4
- declare function useBizStore({ currentApp }: {
5
- currentApp: AppInfoProps;
6
- }): {
3
+ declare function useBizStore(appId: any): {
7
4
  eventGroupList?: import("../attributeSelector/types").EventGroup[] | undefined;
8
5
  userPropList?: import("../attributeSelector/types").UserProp[] | undefined;
9
6
  envPropList?: import("../attributeSelector/types").EnvProp[] | undefined;
10
7
  eventNameMap?: Record<string, import("../attributeSelector/types").AnalysisEvent> | undefined;
11
8
  eventIdMap?: Record<number, import("../attributeSelector/types").AnalysisEvent> | undefined;
12
9
  useBizStoreLoading: boolean;
10
+ setUseBizStoreLoading: import("react").Dispatch<import("react").SetStateAction<boolean>>;
13
11
  groupLoading: boolean;
14
12
  userGroupList: UserGroupTypes.Group[];
15
13
  tagList: UserTagsSelectorTypes.Tag[];
@@ -14,8 +14,7 @@ import { useEffect, useState, useCallback } from 'react';
14
14
  import { ajax } from '../utils';
15
15
  import Apis from '../constants/apis';
16
16
  import convertAttributeData from '../attributeSelector/util';
17
- function useBizStore(_ref) {
18
- var currentApp = _ref.currentApp;
17
+ function useBizStore(appId) {
19
18
  var _useState = useState([]),
20
19
  _useState2 = _slicedToArray(_useState, 2),
21
20
  userGroupList = _useState2[0],
@@ -63,7 +62,7 @@ function useBizStore(_ref) {
63
62
  _useState24 = _slicedToArray(_useState23, 2),
64
63
  store = _useState24[0],
65
64
  setStore = _useState24[1];
66
- var _useState25 = useState(false),
65
+ var _useState25 = useState(true),
67
66
  _useState26 = _slicedToArray(_useState25, 2),
68
67
  useBizStoreLoading = _useState26[0],
69
68
  setUseBizStoreLoading = _useState26[1];
@@ -72,7 +71,7 @@ function useBizStore(_ref) {
72
71
  ajax(Apis.queryUserGroup, {
73
72
  method: 'post',
74
73
  data: {
75
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
74
+ appId: appId,
76
75
  platform: 0,
77
76
  includeDefault: true,
78
77
  includeToday: true
@@ -83,13 +82,13 @@ function useBizStore(_ref) {
83
82
  }).finally(function () {
84
83
  setGroupLoading(false);
85
84
  });
86
- }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
85
+ }, [appId]);
87
86
  var queryTags = useCallback(function () {
88
87
  setTagLoading(true);
89
88
  ajax(Apis.queryAllTags, {
90
89
  method: 'post',
91
90
  data: {
92
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
91
+ appId: appId,
93
92
  platform: 0
94
93
  }
95
94
  }).then(function (res) {
@@ -98,13 +97,13 @@ function useBizStore(_ref) {
98
97
  }).finally(function () {
99
98
  setTagLoading(false);
100
99
  });
101
- }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
100
+ }, [appId]);
102
101
  var loadEvents = useCallback(function () {
103
102
  setLoadEvent(true);
104
103
  ajax('/zg/web/v2/data/queryEventMetasOfGroup', {
105
104
  method: 'post',
106
105
  data: {
107
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
106
+ appId: appId,
108
107
  platform: 0,
109
108
  isAll: true
110
109
  }
@@ -112,33 +111,33 @@ function useBizStore(_ref) {
112
111
  setEventGroups(res.data);
113
112
  setLoadEvent(false);
114
113
  });
115
- }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
114
+ }, [appId]);
116
115
  var loadUserProps = useCallback(function () {
117
116
  setLoadUsers(true);
118
117
  ajax('/zg/web/v2/appusergroup/getUserPropMeta', {
119
118
  method: 'post',
120
119
  data: {
121
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
120
+ appId: appId,
122
121
  platform: 0
123
122
  }
124
123
  }).then(function (res) {
125
124
  setUserProps(res.data);
126
125
  setLoadUsers(false);
127
126
  });
128
- }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
127
+ }, [appId]);
129
128
  var loadEnvList = useCallback(function () {
130
129
  setLoadEnv(true);
131
130
  ajax('/zg/web/v2/appusergroup/getEventEnvData', {
132
131
  method: 'post',
133
132
  data: {
134
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
133
+ appId: appId,
135
134
  platform: 0
136
135
  }
137
136
  }).then(function (res) {
138
137
  setEnvList(res.data.eventEnv);
139
138
  setLoadEnv(false);
140
139
  });
141
- }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
140
+ }, [appId]);
142
141
  useEffect(function () {
143
142
  if (loadEnv || loadEvent || loadUsers) return;
144
143
  setStore(convertAttributeData({
@@ -152,13 +151,12 @@ function useBizStore(_ref) {
152
151
  setUseBizStoreLoading(false);
153
152
  }, [loadEvent, loadEnv, loadUsers, groupLoading, tagLoading]);
154
153
  useEffect(function () {
155
- if (!currentApp || !currentApp.appId) return;
154
+ if (!appId) return;
156
155
  setTimer(function (pre) {
157
156
  if (pre) {
158
157
  clearTimeout(pre);
159
158
  }
160
159
  return setTimeout(function () {
161
- setUseBizStoreLoading(true);
162
160
  queryGroups();
163
161
  queryTags();
164
162
  loadUserProps();
@@ -166,9 +164,10 @@ function useBizStore(_ref) {
166
164
  loadEnvList();
167
165
  }, 300);
168
166
  });
169
- }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
167
+ }, [appId]);
170
168
  return _objectSpread({
171
169
  useBizStoreLoading: useBizStoreLoading,
170
+ setUseBizStoreLoading: setUseBizStoreLoading,
172
171
  groupLoading: groupLoading,
173
172
  userGroupList: userGroupList,
174
173
  tagList: tagList,
@@ -4,25 +4,16 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
4
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
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
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
- import React, { useState, useEffect, useContext } from 'react';
7
+ import React, { useState, useEffect } from 'react';
8
8
  import { BizSelect } from '@zgfe/business-lib';
9
+ import { platformOption } from './util';
9
10
  import './styles/index.less';
10
- import request from '../utils/ajax';
11
- import Apis from '../constants/apis';
12
- import BizGlobalDataContext from '../context';
13
- import { platformOptionUtil } from './util';
14
11
  var BizPlatformSelector = function BizPlatformSelector(props) {
15
12
  var classPrefix = 'biz-platform-selector';
16
13
  var _useState = useState(),
17
14
  _useState2 = _slicedToArray(_useState, 2),
18
15
  currentValue = _useState2[0],
19
16
  setCurrentValue = _useState2[1];
20
- var _useContext = useContext(BizGlobalDataContext),
21
- currentApp = _useContext.currentApp;
22
- var _useState3 = useState([]),
23
- _useState4 = _slicedToArray(_useState3, 2),
24
- platformOption = _useState4[0],
25
- setPlatformOption = _useState4[1];
26
17
  useEffect(function () {
27
18
  if (props.value) {
28
19
  var selectValue = platformOption.find(function (item) {
@@ -31,32 +22,6 @@ var BizPlatformSelector = function BizPlatformSelector(props) {
31
22
  setCurrentValue(selectValue || platformOption[0]);
32
23
  }
33
24
  }, [props.value]);
34
- useEffect(function () {
35
- queryPlatformList();
36
- }, []);
37
- function queryPlatformList() {
38
- request(Apis.queryPlatformList, {
39
- method: 'get',
40
- params: {
41
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
42
- }
43
- }).then(function (res) {
44
- var _res$data;
45
- if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
46
- var list = res.data.map(function (item) {
47
- return item.sdkPlatform;
48
- });
49
- var options = platformOptionUtil.map(function (item) {
50
- if (list.includes(item.key) || item.key === 0) {
51
- return item;
52
- }
53
- }).filter(function (item) {
54
- return item;
55
- });
56
- setPlatformOption(options || []);
57
- }
58
- });
59
- }
60
25
  return /*#__PURE__*/React.createElement("div", {
61
26
  className: classPrefix
62
27
  }, /*#__PURE__*/React.createElement(BizSelect, {
@@ -8,10 +8,6 @@
8
8
  .biz-select-handle-content .biz-select-handle-icon .bsicon {
9
9
  color: #9aa1a9;
10
10
  }
11
- .biz-select-handle-content-label {
12
- display: flex;
13
- align-items: center;
14
- }
15
11
  }
16
12
  }
17
13
  .biz-platform-selector-select-overlay .biz-select-list-panel .biz-select-option {
@@ -1,2 +1,2 @@
1
1
  import { platItemProp } from './types';
2
- export declare const platformOptionUtil: platItemProp[];
2
+ export declare const platformOption: platItemProp[];
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import { IconFont } from '@zgfe/business-lib';
3
- export var platformOptionUtil = [{
3
+ export var platformOption = [{
4
4
  key: 0,
5
5
  value: '全部平台'
6
6
  }, {
@@ -38,13 +38,6 @@ export var platformOptionUtil = [{
38
38
  type: "fuwuqi",
39
39
  size: 16
40
40
  })
41
- }, {
42
- key: 6,
43
- value: '鸿蒙',
44
- icon: /*#__PURE__*/React.createElement(IconFont, {
45
- type: "hongmeng",
46
- size: 16
47
- })
48
41
  }, {
49
42
  key: -1,
50
43
  value: '其他'
@@ -393,7 +393,7 @@ var Text = function Text(props) {
393
393
  _value$between = value.between,
394
394
  between = _value$between === void 0 ? [] : _value$between;
395
395
  var numOperatorMap = _objectSpread(_objectSpread({}, operatorMap), {}, {
396
- equal: value.webType === 'number' ? '等于' : '是'
396
+ equal: '等于'
397
397
  });
398
398
  var valuesDom = '';
399
399
  var calculateTxt = '';
@@ -36,8 +36,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
36
36
  labelFields = props.labelFields,
37
37
  keyFields = props.keyFields,
38
38
  valueFields = props.valueFields,
39
- childFields = props.childFields,
40
- isOpenLayer = props.isOpenLayer;
39
+ childFields = props.childFields;
41
40
  var timer = useRef(null);
42
41
  var _useState = useState(''),
43
42
  _useState2 = _slicedToArray(_useState, 2),
@@ -163,8 +162,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
163
162
  labelGroup: currentSelect,
164
163
  pageNo: pageNo,
165
164
  pageSize: 20,
166
- labelName: highlightText,
167
- isOpenLayer: isOpenLayer
165
+ labelName: highlightText
168
166
  }
169
167
  }).then(function (res) {
170
168
  if ((res === null || res === void 0 ? void 0 : res.data) && res.data.results) {
@@ -211,7 +209,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
211
209
  }
212
210
  function onClickTag(data) {
213
211
  setCurrentTag(data);
214
- if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.firstAndLastUpdate || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.fundingSource || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.eventPreference || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.sqlCreateTable || !isOpenLayer) {
212
+ if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.firstAndLastUpdate || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.fundingSource || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.eventPreference || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.sqlCreateTable) {
215
213
  var newValue = [{
216
214
  id: groupMap[currentSelect].id,
217
215
  labelGroup: currentSelect
@@ -232,11 +230,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
232
230
  });
233
231
  if (_index === -1) {
234
232
  if (currentValue.length >= 20) return;
235
- if (isOpenLayer) {
236
- props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
237
- } else {
238
- props.onChange([newValue]);
239
- }
233
+ props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
240
234
  } else {
241
235
  currentValue.splice(_index, 1);
242
236
  props.onChange(_toConsumableArray(currentValue));
@@ -275,7 +269,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
275
269
  getTagsByGroup(Math.floor(groupMap[currentSelect].children.length / 20) + 1);
276
270
  },
277
271
  onClick: onClickTag
278
- }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), isOpenLayer && currentTag && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.firstAndLastUpdate && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.fundingSource && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.eventPreference && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.sqlCreateTable && /*#__PURE__*/React.createElement("div", {
272
+ }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), currentTag && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.firstAndLastUpdate && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.fundingSource && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.eventPreference && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.sqlCreateTable && /*#__PURE__*/React.createElement("div", {
279
273
  className: "".concat(classPrefix, "-overlay-selections")
280
274
  }, /*#__PURE__*/React.createElement(MultipleCheckPanel, {
281
275
  valueField: valueFields[2],
@@ -305,7 +299,6 @@ CascaderOverlay.defaultProps = {
305
299
  childFields: ['children', 'layers'],
306
300
  keyFields: ['labelGroup', 'id', 'layerLabelId'],
307
301
  labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
308
- valueFields: ['labelGroup', 'id', 'layerLabelId'],
309
- isOpenLayer: true
302
+ valueFields: ['labelGroup', 'id', 'layerLabelId']
310
303
  };
311
304
  export default CascaderOverlay;
@@ -49,7 +49,6 @@ export default (function () {
49
49
  keyFields: ['labelGroup', 'id', 'layerLabelId'],
50
50
  labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
51
51
  valueFields: ['labelGroup', 'id', 'layerLabelId'],
52
- isOpenLayer: false,
53
52
  onChange: onChange
54
53
  })));
55
54
  });
@@ -26,8 +26,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
26
26
  labelFields = props.labelFields,
27
27
  childFields = props.childFields,
28
28
  keyFields = props.keyFields,
29
- valueFields = props.valueFields,
30
- isOpenLayer = props.isOpenLayer;
29
+ valueFields = props.valueFields;
31
30
  var _useState = useState([]),
32
31
  _useState2 = _slicedToArray(_useState, 2),
33
32
  currentValue = _useState2[0],
@@ -43,7 +42,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
43
42
  var pre_text = pre[labelFields[labelFields.length - 2]];
44
43
  var last_text = last[labelFields[labelFields.length - 1]];
45
44
  var res = _objectSpread(_objectSpread({}, last), {}, {
46
- handleText: (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 3 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 6 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === LabelCreateType.sqlCreateTable || !isOpenLayer ? pre_text : "".concat(pre_text, "\uFF1A").concat(last_text)
45
+ handleText: (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 3 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 6 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === LabelCreateType.sqlCreateTable ? pre_text : "".concat(pre_text, "\uFF1A").concat(last_text)
47
46
  });
48
47
  return res;
49
48
  });
@@ -76,7 +75,6 @@ var UserTagsSelect = function UserTagsSelect(props) {
76
75
  keyFields: keyFields,
77
76
  labelFields: labelFields,
78
77
  data: data,
79
- isOpenLayer: isOpenLayer,
80
78
  onChange: onChange
81
79
  });
82
80
  }
@@ -107,7 +105,6 @@ var UserTagsSelect = function UserTagsSelect(props) {
107
105
  }))));
108
106
  };
109
107
  UserTagsSelect.defaultProps = {
110
- destroyPopupOnHide: false,
111
- isOpenLayer: true
108
+ destroyPopupOnHide: false
112
109
  };
113
110
  export default UserTagsSelect;
@@ -30,7 +30,6 @@ export declare namespace UserTagsSelectorTypes {
30
30
  defaultCurrent?: string[];
31
31
  onChange: Function;
32
32
  destroyPopupOnHide?: boolean;
33
- isOpenLayer?: boolean;
34
33
  }
35
34
  interface CascaderOverlayProps {
36
35
  className?: string;
@@ -41,7 +40,6 @@ export declare namespace UserTagsSelectorTypes {
41
40
  valueFields?: string[];
42
41
  currentValue: Value;
43
42
  onChange: (val: Value) => void;
44
- isOpenLayer?: boolean;
45
43
  }
46
44
  interface Groups {
47
45
  data: any[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.2.57-plat.0",
3
+ "version": "1.2.58-ljy.0",
4
4
  "module": "es/index.js",
5
5
  "typings": "es/index.d.ts",
6
6
  "files": [
@@ -55,7 +55,7 @@
55
55
  "react": "^16.12.0 || ^17.0.0",
56
56
  "yorkie": "^2.0.0"
57
57
  },
58
- "gitHead": "499bba3b280dd0153976fd2e2ac3fd303d9ea028",
58
+ "gitHead": "9e631587e01af190d42323d48d2158f04149afca",
59
59
  "gitHooks": {
60
60
  "pre-commit": "lint-staged"
61
61
  }