@zgfe/business-lib 1.1.41-attribution.5 → 1.1.41-attribution.7
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.
- package/es/addToPanel/demo/edit.d.ts +1 -2
- package/es/addToPanel/demo/index.d.ts +1 -2
- package/es/addToScene/demo/index.d.ts +1 -2
- package/es/addToScene/index.js +3 -13
- package/es/addToScene/types.d.ts +1 -1
- package/es/assets/demo/input.d.ts +1 -2
- package/es/attrCondition/demo/group.d.ts +1 -2
- package/es/attrCondition/demo/index.d.ts +1 -2
- package/es/attrConditions/demo/group.d.ts +1 -2
- package/es/attrConditions/demo/index.d.ts +1 -2
- package/es/attributeSelector/demo/disable.d.ts +1 -2
- package/es/attributeSelector/demo/index.d.ts +1 -2
- package/es/attributeSelector/demo/index.js +4 -2
- package/es/chart/demo/bar.d.ts +1 -2
- package/es/chart/demo/index.d.ts +1 -2
- package/es/chart/demo/map.d.ts +1 -2
- package/es/chart/demo/pie.d.ts +1 -2
- package/es/colorIcon/demo/index.d.ts +1 -2
- package/es/constants/apis.js +1 -1
- package/es/cycleTime/demo/disable.d.ts +1 -2
- package/es/cycleTime/demo/index.d.ts +1 -2
- package/es/cycleTime/demo/multi.d.ts +1 -2
- package/es/datePicker/demo/customType.d.ts +1 -2
- package/es/datePicker/demo/day.d.ts +1 -2
- package/es/datePicker/demo/day.js +12 -1
- package/es/datePicker/demo/index.d.ts +1 -2
- package/es/datePicker/index.js +16 -6
- package/es/demoWrapper/content.js +9 -9
- package/es/demoWrapper/demo/index.d.ts +1 -2
- package/es/demoWrapper/head.js +4 -4
- package/es/dialog/demo/index.d.ts +1 -2
- package/es/dnd/demo/data.d.ts +1 -2
- package/es/dnd/demo/handle.d.ts +1 -2
- package/es/dnd/demo/index.d.ts +1 -2
- package/es/eventSelector/demo/index.d.ts +1 -2
- package/es/eventSelector/listPanel.js +0 -3
- package/es/icon/demo/index.d.ts +1 -2
- package/es/icon/demo/list.d.ts +1 -2
- package/es/layout/analysisLayout/demo/index.d.ts +1 -2
- package/es/layout/detail/demo/index.d.ts +1 -2
- package/es/layout/optionTitle/components/btnMenu/demo.d.ts +1 -2
- package/es/layout/optionTitle/components/title/demo.d.ts +1 -2
- package/es/layout/optionTitle/demo/index.d.ts +1 -2
- package/es/layout/optionTitle/demo/layout.d.ts +1 -2
- package/es/layout/optionTitle/demo/panelCreate.d.ts +1 -2
- package/es/loginForm/demo/index.d.ts +1 -2
- package/es/searchInput/demo/index.d.ts +1 -2
- package/es/select/demo/children.d.ts +1 -2
- package/es/select/demo/customLabel.d.ts +1 -2
- package/es/select/demo/group.d.ts +1 -2
- package/es/select/demo/index.d.ts +1 -2
- package/es/select/demo/loading.d.ts +1 -2
- package/es/select/demo/multiple.d.ts +1 -2
- package/es/socket/demo/demo.d.ts +1 -2
- package/es/table/demo/index.d.ts +1 -2
- package/es/table/demo/index2.d.ts +1 -2
- package/es/table/demo/index3.d.ts +1 -2
- package/es/targetConditionGroup/demo/group.d.ts +1 -2
- package/es/targetConditionGroup/demo/index.d.ts +1 -2
- package/es/targetSelector/demo/index.d.ts +1 -2
- package/es/userCondition/demo/business.d.ts +1 -2
- package/es/userCondition/demo/index.d.ts +1 -2
- package/es/userGroup/demo/group.d.ts +1 -2
- package/es/userGroup/demo/index.d.ts +1 -2
- package/es/userTagsSelector/demo/index.d.ts +1 -2
- package/es/utils/ajax.js +1 -1
- package/package.json +2 -2
package/es/addToScene/index.js
CHANGED
|
@@ -56,10 +56,10 @@ var BizAddToScene = function BizAddToScene(props) {
|
|
|
56
56
|
appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
|
|
57
57
|
platform: 0,
|
|
58
58
|
groupId: form.group.groupId,
|
|
59
|
-
json:
|
|
59
|
+
json: {
|
|
60
60
|
chosen_data: [],
|
|
61
61
|
data: params
|
|
62
|
-
}
|
|
62
|
+
},
|
|
63
63
|
name: form.name
|
|
64
64
|
};
|
|
65
65
|
if (form.group.groupId === 0) {
|
|
@@ -70,21 +70,11 @@ var BizAddToScene = function BizAddToScene(props) {
|
|
|
70
70
|
data: data
|
|
71
71
|
}).then(function (res) {
|
|
72
72
|
setLoading(false);
|
|
73
|
-
|
|
74
|
-
if (result.code === 10001) {
|
|
73
|
+
if (res.data) {
|
|
75
74
|
notification.success({
|
|
76
75
|
message: '添加成功'
|
|
77
76
|
});
|
|
78
77
|
if (props.onOk) props.onOk(res);
|
|
79
|
-
} else if (result.code === -10010) {
|
|
80
|
-
notification.error({
|
|
81
|
-
message: '添加失败',
|
|
82
|
-
description: data.groupId === 0 ? '场景分类已存在' : '场景名称已存在'
|
|
83
|
-
});
|
|
84
|
-
} else {
|
|
85
|
-
notification.error({
|
|
86
|
-
message: '添加失败'
|
|
87
|
-
});
|
|
88
78
|
}
|
|
89
79
|
}).catch(function () {
|
|
90
80
|
setLoading(false);
|
package/es/addToScene/types.d.ts
CHANGED
|
@@ -13,8 +13,10 @@ import userData from './userData.js';
|
|
|
13
13
|
import convertAttributeData from '../util';
|
|
14
14
|
export default (function () {
|
|
15
15
|
var _useState = useState({
|
|
16
|
-
id:
|
|
17
|
-
|
|
16
|
+
id: 0,
|
|
17
|
+
category: 'fixed',
|
|
18
|
+
name: 'is_anonymous',
|
|
19
|
+
propCategory: 'userProp'
|
|
18
20
|
}),
|
|
19
21
|
_useState2 = _slicedToArray(_useState, 2),
|
|
20
22
|
attribute = _useState2[0],
|
package/es/chart/demo/bar.d.ts
CHANGED
package/es/chart/demo/index.d.ts
CHANGED
package/es/chart/demo/map.d.ts
CHANGED
package/es/chart/demo/pie.d.ts
CHANGED
package/es/constants/apis.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
var Apis = {
|
|
2
2
|
querySceneGroup: '/zg/web/v2/scene/queryScenesOfGroup',
|
|
3
|
-
addScene: '/scene/addScene
|
|
3
|
+
addScene: '/zg/web/v2/scene/addScene',
|
|
4
4
|
esQuery: '/data/queryEsData.jsp',
|
|
5
5
|
addPanel: '/apppanel/addPanelElement.jsp',
|
|
6
6
|
updatePanelTarget: '/apppanel/updateElemet.jsp',
|
|
@@ -18,6 +18,12 @@ export default (function () {
|
|
|
18
18
|
_useState2 = _slicedToArray(_useState, 2),
|
|
19
19
|
time = _useState2[0],
|
|
20
20
|
setTime = _useState2[1];
|
|
21
|
+
var aaa = {
|
|
22
|
+
unit: 'day',
|
|
23
|
+
relative: [30, 1],
|
|
24
|
+
begin: '2023-05-10',
|
|
25
|
+
end: '2023-06-08'
|
|
26
|
+
};
|
|
21
27
|
var _useState3 = useState(false),
|
|
22
28
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
23
29
|
includeToday = _useState4[0],
|
|
@@ -27,13 +33,18 @@ export default (function () {
|
|
|
27
33
|
return data;
|
|
28
34
|
});
|
|
29
35
|
};
|
|
30
|
-
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div",
|
|
36
|
+
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
|
|
37
|
+
onClick: function onClick() {
|
|
38
|
+
return setTime(aaa);
|
|
39
|
+
}
|
|
40
|
+
}, "\u624B\u52A8\u8BBE\u7F6E\u65F6\u95F4"), /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D: ", /*#__PURE__*/React.createElement(Switch, {
|
|
31
41
|
defaultChecked: includeToday,
|
|
32
42
|
onChange: setIncludeToday
|
|
33
43
|
})), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePicker, {
|
|
34
44
|
mode: "simple",
|
|
35
45
|
onChange: handleChange,
|
|
36
46
|
includeToday: includeToday,
|
|
47
|
+
value: time,
|
|
37
48
|
defaultValue: time
|
|
38
49
|
}), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time)));
|
|
39
50
|
});
|
package/es/datePicker/index.js
CHANGED
|
@@ -35,8 +35,14 @@ var BizDatePicker = function BizDatePicker(props) {
|
|
|
35
35
|
_useState8 = _slicedToArray(_useState7, 2),
|
|
36
36
|
ready = _useState8[0],
|
|
37
37
|
setReady = _useState8[1];
|
|
38
|
+
var _useState9 = useState(),
|
|
39
|
+
_useState10 = _slicedToArray(_useState9, 2),
|
|
40
|
+
nowValue = _useState10[0],
|
|
41
|
+
setNowValue = _useState10[1];
|
|
38
42
|
useEffect(function () {
|
|
39
|
-
|
|
43
|
+
if (props.value && JSON.stringify(props.value) === JSON.stringify(nowValue)) return;
|
|
44
|
+
var data = props.value || props.defaultValue;
|
|
45
|
+
setNowValue(data);
|
|
40
46
|
if (data) {
|
|
41
47
|
setCurrentType(function () {
|
|
42
48
|
var list = dateList.filter(function (item) {
|
|
@@ -60,12 +66,16 @@ var BizDatePicker = function BizDatePicker(props) {
|
|
|
60
66
|
});
|
|
61
67
|
}
|
|
62
68
|
setReady(false);
|
|
63
|
-
}, []);
|
|
69
|
+
}, [props.value]);
|
|
64
70
|
useEffect(function () {
|
|
65
|
-
if (props.onChange && dateRange)
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
71
|
+
if (props.onChange && dateRange) {
|
|
72
|
+
var _nowTime = _objectSpread({
|
|
73
|
+
unit: currentType.value,
|
|
74
|
+
relative: currentTime ? [currentTime === null || currentTime === void 0 ? void 0 : currentTime.count, props.includeToday && currentType.value === 'day' ? 0 : 1] : undefined
|
|
75
|
+
}, dateRange);
|
|
76
|
+
setNowValue(_nowTime);
|
|
77
|
+
props.onChange(_nowTime);
|
|
78
|
+
}
|
|
69
79
|
}, [currentType, currentTime, dateRange]);
|
|
70
80
|
var onChangeDateType = function onChangeDateType(data) {
|
|
71
81
|
setCurrentType(data);
|
|
@@ -125,25 +125,25 @@ var DemoContent = function DemoContent(_ref3) {
|
|
|
125
125
|
}
|
|
126
126
|
function loadUserProps() {
|
|
127
127
|
setLoadUsers(true);
|
|
128
|
-
ajax('/
|
|
128
|
+
ajax('/zg/web/v2/appusergroup/getUserPropMeta', {
|
|
129
129
|
method: 'post',
|
|
130
|
-
|
|
131
|
-
|
|
130
|
+
data: {
|
|
131
|
+
appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
|
|
132
132
|
platform: 0
|
|
133
133
|
}
|
|
134
134
|
}).then(function (res) {
|
|
135
|
-
setUserProps(res.
|
|
135
|
+
setUserProps(res.data);
|
|
136
136
|
setLoadUsers(false);
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
139
|
function loadEvents() {
|
|
140
140
|
setLoadEvent(true);
|
|
141
|
-
ajax('/
|
|
141
|
+
ajax('/zg/web/v2/data/queryEventMetasOfGroup', {
|
|
142
142
|
method: 'post',
|
|
143
|
-
|
|
144
|
-
|
|
143
|
+
data: {
|
|
144
|
+
appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
|
|
145
145
|
platform: 0,
|
|
146
|
-
|
|
146
|
+
isAll: true
|
|
147
147
|
}
|
|
148
148
|
}).then(function (res) {
|
|
149
149
|
setEventGroups(res.data);
|
|
@@ -155,7 +155,7 @@ var DemoContent = function DemoContent(_ref3) {
|
|
|
155
155
|
ajax('/zg/web/v2/appusergroup/getEventEnvData', {
|
|
156
156
|
method: 'post',
|
|
157
157
|
data: {
|
|
158
|
-
|
|
158
|
+
appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
|
|
159
159
|
platform: 0
|
|
160
160
|
}
|
|
161
161
|
}).then(function (res) {
|
package/es/demoWrapper/head.js
CHANGED
|
@@ -27,14 +27,14 @@ var DemoHeader = function DemoHeader(_ref) {
|
|
|
27
27
|
}, [loading, appList]);
|
|
28
28
|
function queryAppList() {
|
|
29
29
|
setLoading(true);
|
|
30
|
-
request('/
|
|
31
|
-
setAppList(res.
|
|
30
|
+
request('/zg/web/v2/data/v2ajaxGetDataByApp').then(function (res) {
|
|
31
|
+
setAppList(res.data.appList);
|
|
32
32
|
if (defaultApp) {
|
|
33
|
-
_onChange(res.
|
|
33
|
+
_onChange(res.data.appList.find(function (item) {
|
|
34
34
|
return item.id === defaultApp;
|
|
35
35
|
}));
|
|
36
36
|
}
|
|
37
|
-
if (!defaultApp && res.
|
|
37
|
+
if (!defaultApp && res.data.appList.length) _onChange(res.data.appList[0]);
|
|
38
38
|
}).finally(function () {
|
|
39
39
|
setLoading(false);
|
|
40
40
|
});
|
package/es/dnd/demo/data.d.ts
CHANGED
package/es/dnd/demo/handle.d.ts
CHANGED
package/es/dnd/demo/index.d.ts
CHANGED
|
@@ -31,9 +31,6 @@ var EventListPanel = function EventListPanel(props) {
|
|
|
31
31
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
32
32
|
groupList = _useState4[0],
|
|
33
33
|
setGroupList = _useState4[1];
|
|
34
|
-
useEffect(function () {
|
|
35
|
-
console.log('groupList', groupList, props.selectList);
|
|
36
|
-
}, [groupList]);
|
|
37
34
|
var _useState5 = useState(),
|
|
38
35
|
_useState6 = _slicedToArray(_useState5, 2),
|
|
39
36
|
currentGroup = _useState6[0],
|
package/es/icon/demo/index.d.ts
CHANGED
package/es/icon/demo/list.d.ts
CHANGED
package/es/socket/demo/demo.d.ts
CHANGED
package/es/table/demo/index.d.ts
CHANGED
package/es/utils/ajax.js
CHANGED
|
@@ -69,7 +69,7 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
|
|
|
69
69
|
if (!flag) {
|
|
70
70
|
message = apiResult.msg || message;
|
|
71
71
|
notification[notifyType || 'error']({
|
|
72
|
-
message: errorTitle || "\u8BF7\u6C42\u9519\
|
|
72
|
+
message: errorTitle || "\u8BF7\u6C42\u9519\u8BEF2",
|
|
73
73
|
description: message
|
|
74
74
|
});
|
|
75
75
|
throw new Error(message);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.1.41-attribution.
|
|
3
|
+
"version": "1.1.41-attribution.7",
|
|
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": "
|
|
63
|
+
"gitHead": "f213f4bf925948491d308265aab6f69e8531d58d"
|
|
64
64
|
}
|