@zgfe/business-lib 1.1.7-panel.2 → 1.1.7-path.0

package/es/addToPanel/index.js

@@ -75,7 +75,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
         return;
       }
 
-      setGroupList(res.panels);
+      setGroupList(res.panels || []);
     }).catch(function () {
       notification.error({
         message: '获取看板列表失败'

package/es/context/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { EventGroup, UserProp, EnvProp } from '../attributeSelector/types';
+import { UserGroupTypes } from '../userGroup/types';
 export interface AppInfoProps {
     appId?: string | number;
     platform?: string | number;
@@ -22,7 +23,7 @@ export interface Menu {
     childrens?: Menu[];
 }
 export interface GlobalContextProps {
-    userGroupList?: Array<any>;
+    userGroupList?: Array<UserGroupTypes.Instance>;
     eventGroupList?: EventGroup[];
     userPropList?: UserProp[];
     eventEnvList?: EnvProp[];

package/es/userGroup/demo/group.js

@@ -17,27 +17,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState } from 'react';
-import { BizUserGroup, IconFont } from '@zgfe/business-lib';
+import { BizUserGroup, IconFont, DemoWrapper } from '@zgfe/business-lib';
 import { Form } from 'antd';
-var groupOptions = [{
-  id: 1,
-  name: '用户群1'
-}, {
-  id: 2,
-  name: '用户群2'
-}, {
-  id: 3,
-  name: '用户群3'
-}, {
-  id: 4,
-  name: '用户群4'
-}, {
-  id: 5,
-  name: '用户群5'
-}, {
-  id: 6,
-  name: '用户群6'
-}];
 var initValue = {
   id: 1,
   name: '用户群1'
@@ -58,7 +39,9 @@ export default (function () {
     setTarget(arguments.length <= 1 ? undefined : arguments[1]);
   };
 
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form, {
+  return /*#__PURE__*/React.createElement(DemoWrapper, {
+    needMeta: true
+  }, /*#__PURE__*/React.createElement(Form, {
     initialValues: target,
     form: form,
     name: "usert_form",
@@ -73,7 +56,6 @@ export default (function () {
       return /*#__PURE__*/React.createElement(Form.Item, _objectSpread(_objectSpread({}, field), {}, {
         key: field.key
       }), /*#__PURE__*/React.createElement(BizUserGroup, {
-        options: groupOptions,
         onDelete: function onDelete() {
           return remove(index);
         },

package/es/userGroup/demo/index.js

@@ -11,7 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState } from 'react';
-import { BizUserGroup } from '@zgfe/business-lib';
+import { BizUserGroup, DemoWrapper } from '@zgfe/business-lib';
 var groupOptions = [{
   id: 1,
   name: '用户群1'
@@ -43,13 +43,9 @@ var UserGroupDemo = function UserGroupDemo() {
     setGroup(value);
   };
 
-  return /*#__PURE__*/React.createElement("div", {
-    className: "biz-user-group-demo",
-    style: {
-      width: '200px'
-    }
+  return /*#__PURE__*/React.createElement(DemoWrapper, {
+    needMeta: true
   }, /*#__PURE__*/React.createElement(BizUserGroup, {
-    options: groupOptions,
     onChange: handleChange,
     defaultValue: groupOptions[0],
     enableDelete: true

package/es/userGroup/index.js

@@ -10,22 +10,24 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import './styles/index.less';
 import BizSelect from '../select';
 import BizTargetOptionIcon from '../targetSelector/optionIcon';
 import { Skeleton } from 'antd';
+import BizGlobalDataContext from '../context';
 
 var BizUserGroup = function BizUserGroup(props) {
-  var enableDelete = props.enableDelete,
-      keyField = props.keyField,
-      labelField = props.labelField;
+  var enableDelete = props.enableDelete;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
       current = _useState2[0],
       setCurrent = _useState2[1];
 
+  var _useContext = useContext(BizGlobalDataContext),
+      userGroupList = _useContext.userGroupList;
+
   var _useState3 = useState(true),
       _useState4 = _slicedToArray(_useState3, 2),
       ready = _useState4[0],
@@ -61,9 +63,9 @@ var BizUserGroup = function BizUserGroup(props) {
     }
   }, /*#__PURE__*/React.createElement(BizSelect, {
     value: current,
-    options: props.options,
-    keyField: keyField,
-    labelField: labelField,
+    options: userGroupList || [],
+    keyField: "id",
+    labelField: "name",
     theme: "secondary",
     border: false,
     disableItemList: props.disableItemList,
@@ -78,8 +80,4 @@ var BizUserGroup = function BizUserGroup(props) {
   })));
 };
 
-BizUserGroup.defaultProps = {
-  keyField: 'id',
-  labelField: 'name'
-};
 export default BizUserGroup;

package/es/userGroup/types.d.ts

@@ -1,12 +1,16 @@
 import { BizSelectTypes } from '../select/types';
 export declare namespace UserGroupTypes {
+    interface Instance {
+        id: number;
+        name: string;
+        color: string;
+        createTime: string;
+        updateTime: string;
+    }
     interface Props {
         defaultValue?: BizSelectTypes.Option;
         value?: BizSelectTypes.Option;
         className?: string;
-        options: BizSelectTypes.Option[];
-        labelField?: string;
-        keyField?: string;
         enableDelete?: boolean;
         disableItemList?: BizSelectTypes.Option[];
         onChange?: (val: BizSelectTypes.Option) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.7-panel.2",
+  "version": "1.1.7-path.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "e22bc32b4be87eb1d3390d9861ddfda9e099f1ca"
+  "gitHead": "eb0fff1951f7d299966eb4e5e9dc2ed03df62903"
 }