@deepinnet-components/pc 0.0.12 → 0.0.14

package/dist/UserCenter/OrgPage/index.js

@@ -85,9 +85,12 @@ var memberMap = _defineProperty(_defineProperty({}, MEMBER_TYPE_ENUM.NORMAL, {
 
 // 组织管理
 var OrgList = function OrgList() {
+  var _orgList$;
   var contextValue = useContext(ValueContext);
   var ApiService = contextValue.ApiService,
     Components = contextValue.Components;
+  var _getUrlQuery = getUrlQuery(),
+    id = _getUrlQuery.id;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     breadcrumb = _useState2[0],
@@ -105,11 +108,11 @@ var OrgList = function OrgList() {
   }
   function _getOrgList() {
     _getOrgList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _getUrlQuery, id, params, _ref, success, data, list, arr;
+      var _getUrlQuery2, id, params, _ref, success, data, list, _breadcrumb, arr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _getUrlQuery = getUrlQuery(), id = _getUrlQuery.id;
+            _getUrlQuery2 = getUrlQuery(), id = _getUrlQuery2.id;
             params = {
               parentId: id || -1
             };
@@ -123,9 +126,21 @@ var OrgList = function OrgList() {
             if (success) {
               list = data || [];
               if (list !== null && list !== void 0 && list.length) {
-                setBreadcrumb(list[0].path);
-                list[0].showType = 1;
-                list[0].isFirst = true;
+                if (id) {
+                  list[0].showType = 1;
+                  list[0].isFirst = true;
+                  _breadcrumb = [{
+                    id: undefined,
+                    name: '组织管理',
+                    level: -1
+                  }].concat(_toConsumableArray(list[0].path));
+                  setBreadcrumb(_breadcrumb);
+                } else {
+                  list.forEach(function (item) {
+                    item.showType = 1;
+                    item.isFirst = true;
+                  });
+                }
               }
               loopList(list); // 数据处理 children和members放到一起
               setOrgList(list);
@@ -195,7 +210,7 @@ var OrgList = function OrgList() {
       }, {
         text: '删除',
         isPopoverBtn: true,
-        popoverTitle: "\u786E\u5B9A\u5220\u9664\u5417",
+        popoverTitle: "\u786E\u5B9A\u5220\u9664\u5417\uFF1F",
         handleClick: function handleClick() {
           if (row.showType === 1) {
             handleDeleteOrg(row);
@@ -204,7 +219,7 @@ var OrgList = function OrgList() {
             handleDeleteMember(row);
           }
         },
-        show: row.showType === 1 && row.level !== 0 && String(row.id) !== String(getUrlQuery().id) || row.showType === 2
+        show: row.showType === 1 && String(row.id) !== String(getUrlQuery().id) || row.showType === 2
       }];
       return /*#__PURE__*/React.createElement(Components.OperationButton, {
         button: operationList.filter(function (item) {
@@ -221,7 +236,11 @@ var OrgList = function OrgList() {
     var newUrl = '';
     var url = new URL(window.location.href);
     var searchParams = url.searchParams;
-    searchParams.set('id', item.id);
+    if (item.id) {
+      searchParams.set('id', item.id);
+    } else {
+      searchParams.delete('id');
+    }
     url.search = searchParams.toString();
     newUrl = url.href;
     window.history.replaceState({}, '0', newUrl);
@@ -247,7 +266,7 @@ var OrgList = function OrgList() {
     return arr;
   }, [breadcrumb]);
 
-  // 组织/部门弹窗信息
+  // 组织/组织弹窗信息
   var _useState9 = useState({
       visible: false,
       addOrEdit: 'add',
@@ -261,9 +280,12 @@ var OrgList = function OrgList() {
   function handleAddOrg() {
     var isStart = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     var pid = [];
-    breadcrumb.forEach(function (item) {
-      pid.push(item.id);
-    });
+    if (id) {
+      breadcrumb.forEach(function (item, index) {
+        if (index === 0) return;
+        pid.push(item.id);
+      });
+    }
     setOrgModalInfo({
       visible: true,
       addOrEdit: 'add',
@@ -324,9 +346,12 @@ var OrgList = function OrgList() {
   function handleAddMember() {
     var isStart = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     var pid = [];
-    breadcrumb.forEach(function (item) {
-      pid.push(item.id);
-    });
+    if (id) {
+      breadcrumb.forEach(function (item, index) {
+        if (index === 0) return;
+        pid.push(item.id);
+      });
+    }
     setMemberModalInfo({
       visible: true,
       addOrEdit: 'add',
@@ -373,7 +398,7 @@ var OrgList = function OrgList() {
     }));
     return _handleDeleteMember.apply(this, arguments);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !orgList.length && /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !id && /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
       justifyContent: 'flex-end'
@@ -388,7 +413,7 @@ var OrgList = function OrgList() {
       paddingLeft: 12,
       paddingRight: 12
     }
-  }, "\u6DFB\u52A0\u7EC4\u7EC7")), !!orgList.length && /*#__PURE__*/React.createElement("div", {
+  }, "\u6DFB\u52A0\u7EC4\u7EC7")), !!id && /*#__PURE__*/React.createElement("div", {
     className: "flex justify-between items-center",
     style: {
       display: 'flex',
@@ -404,12 +429,12 @@ var OrgList = function OrgList() {
     onClick: function onClick() {
       handleAddOrg();
     },
-    disabled: orgList[0].level >= 5,
+    disabled: ((_orgList$ = orgList[0]) === null || _orgList$ === void 0 ? void 0 : _orgList$.level) >= 5,
     style: {
       paddingLeft: 12,
       paddingRight: 12
     }
-  }, "\u6DFB\u52A0\u90E8\u95E8"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u6DFB\u52A0\u7EC4\u7EC7"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       handleAddMember();

package/dist/UserCenter/OrgSelect/index.js

@@ -16,7 +16,7 @@ import { Cascader, TreeSelect } from 'antd';
 import React, { useContext, useEffect, useState } from 'react';
 import ValueContext from "../context";
 
-// 部门选择
+// 组织选择
 var OrgSelect = function OrgSelect(props) {
   var contextValue = useContext(ValueContext);
   var ApiService = contextValue.ApiService;

package/dist/UserCenter/RolePage/components/Create/index.js

@@ -11,7 +11,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { Form, FormButtonGroup, FormItem, Input } from '@formily/antd-v5';
 import { createForm } from '@formily/core';
 import { createSchemaField } from '@formily/react';
-import { Button, Spin, message } from 'antd';
+import { Button, Spin, message, Radio } from 'antd';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import AuthSelect from "../../../AuthSelect";
 import ValueContext from "../../../context";
@@ -19,7 +19,8 @@ var SchemaField = createSchemaField({
   components: {
     FormItem: FormItem,
     Input: Input,
-    AuthSelect: AuthSelect
+    AuthSelect: AuthSelect,
+    Radio: Radio
   }
 });
 var schema = {
@@ -56,7 +57,7 @@ var schema = {
     },
     authKeys: {
       type: 'string',
-      title: '权限',
+      title: '功能权限',
       'x-decorator': 'FormItem',
       'x-component': 'AuthSelect',
       'x-component-props': {},
@@ -64,6 +65,45 @@ var schema = {
         required: true,
         message: '至少选择一个权限'
       }]
+    },
+    dataScope: {
+      type: 'string',
+      title: '数据权限',
+      'x-decorator': 'FormItem',
+      'x-component': 'Radio.Group',
+      'x-component-props': {
+        style: {
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 8,
+          marginTop: 6
+        },
+        options: [{
+          value: 4,
+          label: '全局数据'
+        }, {
+          value: 5,
+          label: '组织数据（全局）'
+        }, {
+          value: 2,
+          label: '组织数据（本级及下属）'
+        }, {
+          value: 1,
+          label: '个人数据'
+        }]
+      },
+      'x-validator': [{
+        required: true,
+        message: '请选择数据权限'
+      }],
+      'x-reactions': [{
+        dependencies: [],
+        fulfill: {
+          state: {
+            visible: '{{!!showDataAuth}}'
+          }
+        }
+      }]
     }
   }
 };
@@ -77,7 +117,8 @@ var CreateRole = function CreateRole(props) {
     addOrEdit = props.addOrEdit;
   var contextValue = useContext(ValueContext);
   var ApiService = contextValue.ApiService,
-    Components = contextValue.Components;
+    Components = contextValue.Components,
+    showDataAuth = contextValue.showDataAuth;
   var getRoleDetail = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var params, _ref2, data;
@@ -101,7 +142,8 @@ var CreateRole = function CreateRole(props) {
                 desc: data.roleDesc,
                 authKeys: (data.rolePermissionList || []).map(function (item) {
                   return item.permissionCode;
-                })
+                }),
+                dataScope: data.dataScope
               });
             }
           case 8:
@@ -129,9 +171,12 @@ var CreateRole = function CreateRole(props) {
   }, [visible, actionRow]);
   var form = useMemo(function () {
     return createForm({
+      initialValues: {
+        // dataScope: 4,
+      },
       effects: function effects() {}
     });
-  }, []);
+  }, [visible]);
   var _useState = useState(addOrEdit === 'edit'),
     _useState2 = _slicedToArray(_useState, 2),
     getDataLoading = _useState2[0],
@@ -170,7 +215,8 @@ var CreateRole = function CreateRole(props) {
                 return {
                   code: item
                 };
-              })
+              }),
+              dataScope: values.dataScope
             };
             setLoading(true);
             _context2.next = 12;
@@ -202,7 +248,8 @@ var CreateRole = function CreateRole(props) {
                 return {
                   code: item
                 };
-              })
+              }),
+              dataScope: values.dataScope
             };
             setLoading(true);
             _context2.next = 25;
@@ -245,7 +292,8 @@ var CreateRole = function CreateRole(props) {
   }, /*#__PURE__*/React.createElement(SchemaField, {
     schema: schema,
     scope: {
-      type: addOrEdit
+      type: addOrEdit,
+      showDataAuth: showDataAuth
     }
   }), /*#__PURE__*/React.createElement(FormButtonGroup.FormItem, null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",

package/dist/UserCenter/RolePage/index.js

@@ -91,7 +91,7 @@ var RoleList = function RoleList() {
       }, {
         text: '删除',
         isPopoverBtn: true,
-        popoverTitle: "\u786E\u5B9A\u5220\u9664\u5417",
+        popoverTitle: "\u786E\u5B9A\u5220\u9664\u5417\uFF1F",
         handleClick: function handleClick() {
           handleDelete(row);
         }

package/dist/UserCenter/index.d.ts

@@ -4,5 +4,6 @@ declare const UserCenter: {
     AccountPage: import("react").FC;
     RolePage: import("react").FC;
     OrgPage: import("react").FC;
+    OrgSelect: (props: any) => import("react").JSX.Element;
 };
 export default UserCenter;

package/dist/UserCenter/index.js

@@ -2,10 +2,12 @@ import ConfigProvider from "./ConfigProvider";
 import AccountPage from "./AccountPage";
 import RolePage from "./RolePage";
 import OrgPage from "./OrgPage";
+import OrgSelect from "./OrgSelect";
 var UserCenter = {
   ConfigProvider: ConfigProvider,
   AccountPage: AccountPage,
   RolePage: RolePage,
-  OrgPage: OrgPage
+  OrgPage: OrgPage,
+  OrgSelect: OrgSelect
 };
 export default UserCenter;

package/dist/index.d.ts

@@ -2,3 +2,4 @@ export { default as AddressSelect } from './AddressSelect';
 export { default as OrgSelect } from './OrgSelect';
 export { default as ShenduTable } from './Table';
 export { default as UserCenter } from './UserCenter';
+export { default as Map2D } from './Map2D';

package/dist/index.js

@@ -1,4 +1,5 @@
 export { default as AddressSelect } from "./AddressSelect";
 export { default as OrgSelect } from "./OrgSelect";
 export { default as ShenduTable } from "./Table";
-export { default as UserCenter } from "./UserCenter";
+export { default as UserCenter } from "./UserCenter";
+export { default as Map2D } from "./Map2D";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepinnet-components/pc",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -49,12 +49,15 @@
     "@formily/core": "^2.3.2",
     "@formily/react": "^2.3.2",
     "@types/md5": "^2.3.5",
+    "@types/shortid": "^2.2.0",
+    "ahooks": "^3.9.0",
     "antd": "^5.16.1",
     "axios": "^1.5.1",
     "dayjs": "^1.11.13",
     "lodash-es": "^4.17.21",
     "md5": "^2.3.0",
-    "react-router-dom": "^7.6.2"
+    "react-router-dom": "^7.6.2",
+    "shortid": "^2.2.17"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.6.7",