@zgfe/business-lib 1.1.82-user.1 → 1.1.82-user.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 (5) hide show
  1. package/es/demoWrapper/innerDemo.d.ts +2 -0
  2. package/es/demoWrapper/innerDemo.js +4 -2
  3. package/es/userGroup/demo/index.js +90 -4
  4. package/es/userGroup/overlay.js +2 -14
  5. package/package.json +2 -2
package/es/demoWrapper/innerDemo.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  import React from 'react';
2
+ import { GlobalContextProps } from '../context';
2
3
  declare const InnerDemo: React.FC<{
4
+ contextProps?: GlobalContextProps;
3
5
  children?: React.ReactNode;
4
6
  }>;
5
7
  export default InnerDemo;
package/es/demoWrapper/innerDemo.js CHANGED
@@ -1,10 +1,12 @@
1
1
  import React from 'react';
2
2
  import DemoWrapper from '.';
3
3
  var InnerDemo = function InnerDemo(_ref) {
4
- var children = _ref.children;
4
+ var children = _ref.children,
5
+ contextProps = _ref.contextProps;
5
6
  return /*#__PURE__*/React.createElement(DemoWrapper, {
6
7
  needMeta: true,
7
- defaultApp: globalConfig.appId
8
+ defaultApp: globalConfig.appId,
9
+ contextProps: contextProps
8
10
  }, /*#__PURE__*/React.createElement("div", {
9
11
  style: {
10
12
  padding: '16px',
package/es/userGroup/demo/index.js CHANGED
@@ -1,17 +1,103 @@
1
- import React from 'react';
1
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
3
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
4
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
5
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
6
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
+ import React, { useState } from 'react';
2
8
  import { BizUserGroup } from '@zgfe/business-lib';
3
9
  import InnerDemo from '../../demoWrapper/innerDemo';
4
10
  import { Space } from 'antd';
11
+ import { BizDialog } from '@zgfe/business-lib';
12
+ var group = {
13
+ appId: 251,
14
+ color: '#8db3e2',
15
+ createTime: {
16
+ date: 18,
17
+ day: 1,
18
+ hours: 11,
19
+ minutes: 14,
20
+ month: 8,
21
+ seconds: 53,
22
+ time: 1695006893000,
23
+ timezoneOffset: -480,
24
+ year: 123
25
+ },
26
+ description: '',
27
+ groupType: 0,
28
+ id: 943,
29
+ isComplete: 1,
30
+ isDelete: 0,
31
+ json: [[{
32
+ eventId: '-3',
33
+ runPeriod: {
34
+ values: ['30', '0'],
35
+ operator: 'relative'
36
+ },
37
+ runTimes: {
38
+ values: ['1'],
39
+ operator: '>='
40
+ },
41
+ attrs: []
42
+ }]],
43
+ name: 'cvd2',
44
+ platform: 0,
45
+ size: 0,
46
+ source: '',
47
+ staticGroupCondition: '',
48
+ tableName: '',
49
+ timeRange: 0,
50
+ updateTime: {
51
+ date: 18,
52
+ day: 1,
53
+ hours: 11,
54
+ minutes: 14,
55
+ month: 8,
56
+ seconds: 53,
57
+ time: 1695006893000,
58
+ timezoneOffset: -480,
59
+ year: 123
60
+ }
61
+ };
5
62
  var UserGroupDemo = function UserGroupDemo() {
6
- return /*#__PURE__*/React.createElement(InnerDemo, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(BizUserGroup, {
63
+ var _useState = useState(),
64
+ _useState2 = _slicedToArray(_useState, 2),
65
+ groupCallback = _useState2[0],
66
+ setGroupCallback = _useState2[1];
67
+ var _useState3 = useState(false),
68
+ _useState4 = _slicedToArray(_useState3, 2),
69
+ showUserGroupModal = _useState4[0],
70
+ setShowUserGroupModal = _useState4[1];
71
+ return /*#__PURE__*/React.createElement(InnerDemo, {
72
+ contextProps: {
73
+ showUserGroupModal: function showUserGroupModal(onCreate, onBack) {
74
+ setGroupCallback({
75
+ onCreate: onCreate,
76
+ onBack: onBack
77
+ });
78
+ setShowUserGroupModal(true);
79
+ }
80
+ }
81
+ }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(BizUserGroup, {
7
82
  enableDelete: false,
8
83
  enableTags: true,
9
- value: ['4061:679558480527360'],
10
84
  placeholder: "\u652F\u6301\u6807\u7B7E",
11
85
  onChange: function onChange(value) {
12
86
  return console.log(value);
13
87
  }
14
- }), /*#__PURE__*/React.createElement(BizUserGroup, {
88
+ }), showUserGroupModal && /*#__PURE__*/React.createElement(BizDialog, {
89
+ open: true,
90
+ title: "\u6DFB\u52A0\u7528\u6237\u7FA4",
91
+ closable: true,
92
+ onOk: function onOk() {
93
+ var _groupCallback$onCrea;
94
+ setShowUserGroupModal(false);
95
+ groupCallback === null || groupCallback === void 0 ? void 0 : (_groupCallback$onCrea = groupCallback.onCreate) === null || _groupCallback$onCrea === void 0 ? void 0 : _groupCallback$onCrea.call(groupCallback, group);
96
+ },
97
+ onCancel: function onCancel() {
98
+ setShowUserGroupModal(false);
99
+ }
100
+ }, "\u6DFB\u52A0\u7528\u6237\u7FA4"), /*#__PURE__*/React.createElement(BizUserGroup, {
15
101
  value: 758,
16
102
  enableDelete: false,
17
103
  placeholder: "\u4E0D\u652F\u6301\u6807\u7B7E",
package/es/userGroup/overlay.js CHANGED
@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  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; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React, { useContext, useEffect, useRef, useState } from 'react';
11
+ import React, { useContext, useEffect, useState } from 'react';
12
12
  import { classPrefix } from '.';
13
13
  import CascaderOverlay from '../userTagsSelector/cascaderOverlay';
14
14
  import Search from '../userTagsSelector/components/search';
@@ -58,7 +58,6 @@ var Overlay = function Overlay(_ref2) {
58
58
  enableTags = _useContext2.enableTags,
59
59
  value = _useContext2.value,
60
60
  setValue = _useContext2.setValue;
61
- var groupRef = useRef();
62
61
  useEffect(function () {
63
62
  onSearch('');
64
63
  if (!enableTags) setType('userGroup');
@@ -74,13 +73,6 @@ var Overlay = function Overlay(_ref2) {
74
73
  console.log('setValue', type, currentGroup);
75
74
  setValue(type === 'tag' ? chosenTags : currentGroup);
76
75
  }, [type, chosenTags, currentGroup]);
77
- useEffect(function () {
78
- if (!groupRef.current) return;
79
- console.log('groupRef.current:', groupRef.current);
80
- setCurrentGroup(function () {
81
- return groupRef.current;
82
- });
83
- }, [groupRef.current]);
84
76
  function onSearch(v) {
85
77
  if (v) {
86
78
  setShowList((userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.filter(function (item) {
@@ -94,11 +86,7 @@ var Overlay = function Overlay(_ref2) {
94
86
  onClickCreate === null || onClickCreate === void 0 ? void 0 : onClickCreate();
95
87
  if (showUserGroupModal) {
96
88
  showUserGroupModal(function (group) {
97
- console.log('add:', group);
98
- groupRef.current = group;
99
- setCurrentGroup(function () {
100
- return group;
101
- });
89
+ setValue && setValue(group);
102
90
  setUserGroupList === null || setUserGroupList === void 0 ? void 0 : setUserGroupList([group].concat(_toConsumableArray(userGroupList)));
103
91
  });
104
92
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.82-user.1",
3
+ "version": "1.1.82-user.2",
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": "c9a4b459604075bc3b812793c795c7c2a2baf9ed",
58
+ "gitHead": "eeb8e23047d04ad79828d79a0f41ffbcc1708364",
59
59
  "gitHooks": {
60
60
  "pre-commit": "lint-staged"
61
61
  }