@deepinnet-components/pc 0.0.13 → 0.0.14

package/dist/UserCenter/AccountPage/components/CreateAccount/index.js

@@ -5,43 +5,67 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { Form, FormButtonGroup, FormItem, Input } from '@formily/antd-v5';
-import { createForm } from '@formily/core';
+import { createForm, onFieldValueChange } from '@formily/core';
 import { createSchemaField } from '@formily/react';
 import { Button, Spin, message } from 'antd';
 import md5 from 'md5';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import OrgTreeSelect from "../../../OrgTreeSelect";
+import OrgSelect from "../../../OrgSelect";
 import RoleSelect from "../../../RoleSelect";
+import MemberSelect from "../../../MemberSelect";
 import ValueContext from "../../../context";
 var SchemaField = createSchemaField({
   components: {
     FormItem: FormItem,
     Input: Input,
     RoleSelect: RoleSelect,
-    OrgTreeSelect: OrgTreeSelect
+    OrgTreeSelect: OrgTreeSelect,
+    OrgSelect: OrgSelect,
+    MemberSelect: MemberSelect
   }
 });
 var schema = {
   type: 'object',
   properties: {
-    name: {
+    orgArr: {
       type: 'string',
-      title: '姓名',
+      title: '组织',
       'x-decorator': 'FormItem',
-      'x-component': 'Input',
+      // 'x-component': 'OrgTreeSelect',
+      'x-component': 'OrgSelect',
       'x-component-props': {
-        placeholder: '请输入姓名',
+        placeholder: '请选择组织'
+        // allowClear: true,
+        // disabled: '{{addOrEdit === "edit"}}',
+      },
+      'x-validator': [{
+        required: true,
+        message: '请选择组织'
+      }]
+    },
+    bindMemberId: {
+      type: 'string',
+      title: '成员',
+      'x-decorator': 'FormItem',
+      'x-component': 'MemberSelect',
+      'x-component-props': {
+        placeholder: '请选择关联成员',
         allowClear: true,
-        maxLength: 5,
-        showCount: true
+        disabled: true
       },
       'x-validator': [{
         required: true,
-        message: '请输入姓名'
+        message: '请选择关联成员'
       }]
     },
     phone: {
@@ -117,27 +141,14 @@ var schema = {
       'x-component-props': {
         placeholder: '请选择角色',
         allowClear: true,
-        mode: 'multiple',
+        // mode: 'multiple',
+        mode: '{{isMultiRole ? "multiple" : ""}}',
         showSearch: true
       },
       'x-validator': [{
         required: true,
         message: '请选择角色'
       }]
-    },
-    orgArr: {
-      type: 'string',
-      title: '部门',
-      'x-decorator': 'FormItem',
-      'x-component': 'OrgTreeSelect',
-      'x-component-props': {
-        placeholder: '请选择部门',
-        allowClear: true
-      },
-      'x-validator': [{
-        required: true,
-        message: '请选择部门'
-      }]
     }
   }
 };
@@ -152,10 +163,11 @@ var CreateAccount = function CreateAccount(props) {
   var contextValue = useContext(ValueContext);
   var ApiService = contextValue.ApiService,
     Components = contextValue.Components,
-    userType = contextValue.userType;
-  var getRoleDetail = /*#__PURE__*/function () {
+    userType = contextValue.userType,
+    isMultiRole = contextValue.isMultiRole;
+  var getAccountDetail = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var params, _yield$ApiService$get, data;
+      var params, _yield$ApiService$get, data, _data$departmentFlatD, _data$userMemberBindD;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -176,7 +188,15 @@ var CreateAccount = function CreateAccount(props) {
                 roleCodeList: (data.roleList || []).map(function (item) {
                   return item.roleCode;
                 }),
-                orgArr: data.departmentIds || []
+                orgArr: JSON.parse((_data$departmentFlatD = data.departmentFlatDTOs) === null || _data$departmentFlatD === void 0 || (_data$departmentFlatD = _data$departmentFlatD[0]) === null || _data$departmentFlatD === void 0 ? void 0 : _data$departmentFlatD.fullPath),
+                bindMemberId: (_data$userMemberBindD = data.userMemberBindDTO) === null || _data$userMemberBindD === void 0 ? void 0 : _data$userMemberBindD.memberId
+              });
+              // 下面这个是解决异步问题
+              setTimeout(function () {
+                var _data$userMemberBindD2;
+                form.setValues({
+                  bindMemberId: (_data$userMemberBindD2 = data.userMemberBindDTO) === null || _data$userMemberBindD2 === void 0 ? void 0 : _data$userMemberBindD2.memberId
+                });
               });
             }
           case 8:
@@ -189,14 +209,14 @@ var CreateAccount = function CreateAccount(props) {
         }
       }, _callee, null, [[0,, 8, 11]]);
     }));
-    return function getRoleDetail() {
+    return function getAccountDetail() {
       return _ref.apply(this, arguments);
     };
   }();
   useEffect(function () {
     if (visible) {
       if (addOrEdit === 'edit') {
-        getRoleDetail();
+        getAccountDetail();
       }
     } else {
       form.reset();
@@ -204,9 +224,26 @@ var CreateAccount = function CreateAccount(props) {
   }, [visible, actionRow]);
   var form = useMemo(function () {
     return createForm({
-      effects: function effects() {}
+      effects: function effects() {
+        onFieldValueChange('orgArr', function (field) {
+          form.setFieldState('bindMemberId', function (state) {
+            var _field$value, _field$value2;
+            state.value = undefined;
+            state.componentProps = _objectSpread(_objectSpread({}, state.componentProps), {}, {
+              disabled: addOrEdit === 'edit' || !field.value,
+              searchParams: {
+                departmentId: (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value[((_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : _field$value2.length) - 1],
+                memberStatus: addOrEdit === 'add' ? 'available' : 'occupied'
+              }
+            });
+          });
+        });
+        onFieldValueChange('bindMemberId', function (field) {
+          console.log(field.value);
+        });
+      }
     });
-  }, []);
+  }, [visible]);
   var _useState = useState(addOrEdit === 'edit'),
     _useState2 = _slicedToArray(_useState, 2),
     getDataLoading = _useState2[0],
@@ -238,12 +275,13 @@ var CreateAccount = function CreateAccount(props) {
             }
             _context2.prev = 6;
             params = {
-              name: values.name.trim(),
               phone: values.phone.trim(),
-              roleCodeList: values.roleCodeList,
+              roleCodeList: Array.isArray(values.roleCodeList) ? values.roleCodeList : [values.roleCodeList],
               password: md5(values.password.trim()),
-              departmentIdList: values.orgArr || [],
-              userType: userType
+              // departmentIdList: values.orgArr || [],
+              departmentIdList: [values.orgArr[values.orgArr.length - 1]],
+              userType: userType,
+              bindMemberId: values.bindMemberId
             };
             setLoading(true);
             _context2.next = 11;
@@ -269,10 +307,11 @@ var CreateAccount = function CreateAccount(props) {
             _context2.prev = 19;
             _params = {
               accountNo: actionRow.accountNo,
-              name: values.name.trim(),
-              roleCodeList: values.roleCodeList,
-              departmentIdList: values.orgArr || [],
-              userType: userType
+              roleCodeList: Array.isArray(values.roleCodeList) ? values.roleCodeList : [values.roleCodeList],
+              // departmentIdList: values.orgArr || [],
+              departmentIdList: [values.orgArr[values.orgArr.length - 1]],
+              userType: userType,
+              bindMemberId: values.bindMemberId
             };
             setLoading(true);
             _context2.next = 24;
@@ -315,7 +354,8 @@ var CreateAccount = function CreateAccount(props) {
   }, /*#__PURE__*/React.createElement(SchemaField, {
     schema: schema,
     scope: {
-      addOrEdit: addOrEdit
+      addOrEdit: addOrEdit,
+      isMultiRole: isMultiRole
     }
   }), /*#__PURE__*/React.createElement(FormButtonGroup.FormItem, null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",

package/dist/UserCenter/AccountPage/index.js

@@ -22,6 +22,16 @@ import dayjs from 'dayjs';
 import React, { useContext, useRef, useState } from 'react';
 import CreateAccount from "./components/CreateAccount";
 import ValueContext from "../context";
+var statusMap = {
+  0: {
+    text: '正常',
+    color: '#87d068'
+  },
+  1: {
+    text: '冻结',
+    color: '#f50'
+  }
+};
 
 // 账号管理
 var AccountList = function AccountList() {
@@ -35,7 +45,7 @@ var AccountList = function AccountList() {
   var columns = [{
     title: '姓名',
     dataIndex: 'name',
-    width: 120,
+    width: 90,
     searchConfig: {
       props: {
         allowClear: true
@@ -45,39 +55,66 @@ var AccountList = function AccountList() {
   }, {
     title: '账号',
     dataIndex: 'phone',
-    width: 150,
+    width: 100,
     searchConfig: {
       props: {
         allowClear: true
       }
     }
   }, {
-    title: '部门',
+    title: '组织',
     dataIndex: 'departments',
-    width: 200,
+    width: 150,
+    // render: (_: any) => {
+    //   const arr: any = [];
+    //   _?.forEach((item: any) => {
+    //     arr.push(item[item.length - 1]);
+    //   });
+    //   if (!arr.length) return '-';
+    //   return (
+    //     <div className="flex items-center flex-wrap">
+    //       {arr.map((item: any, index: number) => {
+    //         const isLast = index === arr.length - 1;
+    //         return (
+    //           <div
+    //             key={index}
+    //             className="hover:cursor-pointer"
+    //             onClick={() => {
+    //               handleClickOrg(item.id);
+    //             }}
+    //           >
+    //             {item.name}
+    //             {!isLast && '；'}
+    //           </div>
+    //         );
+    //       })}
+    //     </div>
+    //   );
+    // },
     render: function render(_) {
-      var arr = [];
-      _ === null || _ === void 0 || _.forEach(function (item) {
-        arr.push(item[item.length - 1]);
-      });
-      if (!arr.length) return '-';
+      var arr = _[0];
       return /*#__PURE__*/React.createElement("div", {
         className: "flex items-center flex-wrap"
       }, arr.map(function (item, index) {
         var isLast = index === arr.length - 1;
         return /*#__PURE__*/React.createElement("div", {
-          key: index,
-          className: "hover:cursor-pointer",
+          key: item.id,
+          className: "flex items-center"
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "cursor-pointer",
           onClick: function onClick() {
             handleClickOrg(item.id);
           }
-        }, item.name, !isLast && '；');
+        }, item.name), !isLast && /*#__PURE__*/React.createElement("div", null, "/"));
       }));
     }
   }, {
     title: '创建人',
     dataIndex: 'creatorName',
-    width: 100
+    width: 100,
+    render: function render(_) {
+      return _ || '-';
+    }
   }, {
     title: '创建时间',
     dataIndex: 'createTime',
@@ -85,28 +122,68 @@ var AccountList = function AccountList() {
     render: function render(_) {
       return dayjs(_).format('YYYY-MM-DD HH:mm:ss');
     }
+  }, {
+    title: '账号状态',
+    dataIndex: 'status',
+    width: 100,
+    render: function render(_) {
+      var obj = statusMap[_];
+      if (!obj) return '-';
+      return /*#__PURE__*/React.createElement("div", {
+        className: "flex items-center"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "w-[4px] h-[4px] rounded-[50%] mr-[6px]",
+        style: {
+          background: obj.color
+        }
+      }), /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: obj.color
+        }
+      }, obj === null || obj === void 0 ? void 0 : obj.text));
+    }
   }, {
     title: '操作',
     dataIndex: 'action',
     fixed: 'right',
-    width: 80,
+    width: 100,
     align: 'left',
     render: function render(_, row) {
       var operationList = [{
         text: '编辑',
         handleClick: function handleClick() {
           handleEditAccount(row);
-        }
+        },
+        show: true
+      }, {
+        text: '冻结',
+        isPopoverBtn: true,
+        popoverTitle: "\u786E\u5B9A\u51BB\u7ED3\u5417\uFF1F",
+        handleClick: function handleClick() {
+          handleFreezeAccount(row);
+        },
+        show: row.status === 0
+      }, {
+        text: '解冻',
+        isPopoverBtn: true,
+        popoverTitle: "\u786E\u5B9A\u89E3\u51BB\u5417\uFF1F",
+        handleClick: function handleClick() {
+          handleUnFreezeAccount(row);
+        },
+        show: row.status === 1
       }, {
         text: '删除',
         isPopoverBtn: true,
-        popoverTitle: "\u786E\u5B9A\u5220\u9664\u5417",
+        popoverTitle: "\u786E\u5B9A\u5220\u9664\u5417\uFF1F",
         handleClick: function handleClick() {
           handleDeleteAccount(row);
-        }
+        },
+        show: true
       }];
       return /*#__PURE__*/React.createElement(Components.OperationButton, {
-        button: operationList
+        button: operationList.filter(function (item) {
+          return item.show;
+        })
       });
     }
   }];
@@ -134,9 +211,11 @@ var AccountList = function AccountList() {
       actionRow: row
     });
   }
+
+  // 删除账号
   function handleDeleteAccount(_x) {
     return _handleDeleteAccount.apply(this, arguments);
-  }
+  } // 冻结账号
   function _handleDeleteAccount() {
     _handleDeleteAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(row) {
       var _yield$ApiService$del, success;
@@ -166,6 +245,70 @@ var AccountList = function AccountList() {
     }));
     return _handleDeleteAccount.apply(this, arguments);
   }
+  function handleFreezeAccount(_x2) {
+    return _handleFreezeAccount.apply(this, arguments);
+  } // 解冻账号
+  function _handleFreezeAccount() {
+    _handleFreezeAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(row) {
+      var _yield$ApiService$fre, success;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return ApiService.freezeAccount({
+              accountNo: row.accountNo
+            });
+          case 2:
+            _yield$ApiService$fre = _context3.sent;
+            success = _yield$ApiService$fre.success;
+            if (success) {
+              message.success('冻结成功');
+              if (tableList.current.length === 1) {
+                tableRef.current.reload();
+              } else {
+                tableRef.current.reloadCurrentPage();
+              }
+            }
+          case 5:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return _handleFreezeAccount.apply(this, arguments);
+  }
+  function handleUnFreezeAccount(_x3) {
+    return _handleUnFreezeAccount.apply(this, arguments);
+  }
+  function _handleUnFreezeAccount() {
+    _handleUnFreezeAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(row) {
+      var _yield$ApiService$unF, success;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.next = 2;
+            return ApiService.unFreezeAccount({
+              accountNo: row.accountNo
+            });
+          case 2:
+            _yield$ApiService$unF = _context4.sent;
+            success = _yield$ApiService$unF.success;
+            if (success) {
+              message.success('解冻成功');
+              if (tableList.current.length === 1) {
+                tableRef.current.reload();
+              } else {
+                tableRef.current.reloadCurrentPage();
+              }
+            }
+          case 5:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return _handleUnFreezeAccount.apply(this, arguments);
+  }
   var tableList = useRef([]);
   function handleClickOrg(id) {
     navigate("".concat(pageUrl.orgPage, "?id=").concat(id));
@@ -207,7 +350,7 @@ var AccountList = function AccountList() {
           }
         }, _callee);
       }));
-      return function (_x2) {
+      return function (_x4) {
         return _ref.apply(this, arguments);
       };
     }()),

package/dist/UserCenter/AuthSelect/index.js

@@ -63,7 +63,10 @@ var AuthSelect = function AuthSelect(props) {
   if (!authTree.length) return null;
   return /*#__PURE__*/React.createElement("div", {
     style: {
-      marginTop: 6
+      marginTop: 6,
+      padding: '8px 0',
+      borderRadius: 4,
+      border: '1px solid #d9d9d9'
     }
   }, /*#__PURE__*/React.createElement(Tree, {
     checkable: true,

package/dist/UserCenter/ConfigProvider/index.d.ts

@@ -1,12 +1,14 @@
 import React from 'react';
 export interface MainProps {
-    request: any;
+    request?: any;
     api?: any;
-    components: any;
+    components?: any;
     pageUrl?: any;
     children?: any;
-    navigate: any;
+    navigate?: any;
     userType?: string;
+    showDataAuth?: boolean;
+    isMultiRole?: boolean;
 }
 declare const Index: React.FC<MainProps>;
 export default Index;

package/dist/UserCenter/ConfigProvider/index.js

@@ -19,9 +19,18 @@ var Index = function Index(props) {
     _props$api = props.api,
     api = _props$api === void 0 ? {
       getAccountList: '/admin/account/page',
+      // 获取账号列表
       saveAccount: '/admin/account/save',
+      // 保存账号
       getAccountDetail: '/admin/account/detail',
+      // 获取账号详情
       deleteAccount: '/admin/account/delete',
+      // 删除账号
+      freezeAccount: '/admin/account/freeze',
+      // 冻结账号
+      unFreezeAccount: '/admin/account/unfreeze',
+      // 解冻账号
+
       getRoleList: '/admin/role/page',
       saveRole: '/admin/role/save',
       getRoleDetail: '/admin/role/detail',
@@ -32,7 +41,8 @@ var Index = function Index(props) {
       updateOrg: '/admin/department/update',
       deleteOrg: '/admin/department/delete',
       deleteMember: '/admin/department/delete/member',
-      saveMember: '/admin/department/add/member'
+      saveMember: '/admin/department/add/member',
+      getMemberByOrg: '/admin/department/members'
     } : _props$api,
     _props$components = props.components,
     components = _props$components === void 0 ? {} : _props$components,
@@ -43,7 +53,11 @@ var Index = function Index(props) {
       orgPage: '/org'
     } : _props$pageUrl,
     navigate = props.navigate,
-    userType = props.userType;
+    userType = props.userType,
+    _props$showDataAuth = props.showDataAuth,
+    showDataAuth = _props$showDataAuth === void 0 ? false : _props$showDataAuth,
+    _props$isMultiRole = props.isMultiRole,
+    isMultiRole = _props$isMultiRole === void 0 ? true : _props$isMultiRole;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -82,6 +96,18 @@ var Index = function Index(props) {
             params: params
           });
         }
+        // 冻结账号
+      }, {
+        key: "freezeAccount",
+        value: function freezeAccount(params) {
+          return request.post(api.freezeAccount, params);
+        }
+        // 解冻账号
+      }, {
+        key: "unFreezeAccount",
+        value: function unFreezeAccount(params) {
+          return request.post(api.unFreezeAccount, params);
+        }
 
         // 获取角色列表
       }, {
@@ -117,27 +143,25 @@ var Index = function Index(props) {
           return request.post(api.getPermissionTree, params);
         }
 
-        // 获取部门树
+        // 获取组织树
       }, {
         key: "getOrgTree",
         value: function getOrgTree(params) {
-          return request.get(api.getOrgTree, {
-            params: params
-          });
+          return request.post(api.getOrgTree, params);
         }
-        // 保存部门
+        // 保存组织
       }, {
         key: "saveOrg",
         value: function saveOrg(params) {
           return request.post(api.saveOrg, params);
         }
-        // 更新部门
+        // 更新组织
       }, {
         key: "updateOrg",
         value: function updateOrg(params) {
           return request.post(api.updateOrg, params);
         }
-        // 删除部门
+        // 删除组织
       }, {
         key: "deleteOrg",
         value: function deleteOrg(params) {
@@ -151,7 +175,7 @@ var Index = function Index(props) {
         value: function saveMember(params) {
           return request.post(api.saveMember, params);
         }
-        // 删除部门
+        // 删除组织
       }, {
         key: "deleteMember",
         value: function deleteMember(params) {
@@ -159,6 +183,13 @@ var Index = function Index(props) {
             params: params
           });
         }
+
+        // 获取组织下的成员
+      }, {
+        key: "getMemberByOrg",
+        value: function getMemberByOrg(params) {
+          return request.post(api.getMemberByOrg, params);
+        }
       }]);
       return Service;
     }();
@@ -169,7 +200,9 @@ var Index = function Index(props) {
       pageUrl: pageUrl,
       ApiService: Service,
       navigate: navigate,
-      userType: userType
+      userType: userType,
+      showDataAuth: showDataAuth,
+      isMultiRole: isMultiRole
     });
   }, []);
   if (!value) return null;

package/dist/UserCenter/MemberSelect/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const MemberSelect: (props: any) => React.JSX.Element;
+export default MemberSelect;

package/dist/UserCenter/MemberSelect/index.js

@@ -0,0 +1,132 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["searchParams"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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."); }
+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); }
+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; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { Select } from 'antd';
+import { debounce } from 'lodash-es';
+import React, { useContext, useEffect, useState } from 'react';
+import ValueContext from "../context";
+
+// 成员选择
+var MemberSelect = function MemberSelect(props) {
+  var contextValue = useContext(ValueContext);
+  var ApiService = contextValue.ApiService;
+  var _props$searchParams = props.searchParams,
+    searchParams = _props$searchParams === void 0 ? {} : _props$searchParams,
+    comProps = _objectWithoutProperties(props, _excluded); // searchParams 外部传过来的额外搜索条件
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  useEffect(function () {
+    setValue(props.value);
+  }, [props.value]);
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    options = _useState4[0],
+    setOptions = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var getData = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var name,
+        _ref2,
+        data,
+        list,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            name = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
+            if (searchParams.departmentId) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return");
+          case 3:
+            setOptions([]);
+            _context.prev = 4;
+            _context.next = 7;
+            return ApiService.getMemberByOrg(_objectSpread({}, searchParams));
+          case 7:
+            _ref2 = _context.sent;
+            data = _ref2.data;
+            if (data) {
+              list = data || [];
+              setOptions(list);
+            }
+          case 10:
+            _context.prev = 10;
+            setLoading(false);
+            return _context.finish(10);
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[4,, 10, 13]]);
+    }));
+    return function getData() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    getData();
+  }, []);
+  useEffect(function () {
+    getData();
+  }, [searchParams]);
+  var handleChange = function handleChange(v, options) {
+    var _props$onChange, _props$onOptionChange;
+    if (!v) {
+      // 点击 x 时，重新请求数据
+      getData();
+    }
+    setValue(v);
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, v);
+    (_props$onOptionChange = props.onOptionChange) === null || _props$onOptionChange === void 0 || _props$onOptionChange.call(props, options);
+  };
+  var debounceSearch = debounce(function (v) {
+    getData(v);
+  }, 400);
+  function onFocus(e) {
+    getData(e.target.value);
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React.createElement(Select, _extends({}, comProps, {
+    value: value || null,
+    onChange: handleChange,
+    options: options,
+    placeholder: props.placeholder || '请选择',
+    loading: loading,
+    allowClear: true,
+    filterOption: false,
+    onSearch: props.showSearch ? debounceSearch : undefined,
+    fieldNames: {
+      label: 'name',
+      value: 'id'
+    },
+    onFocus: onFocus
+  })));
+};
+export default MemberSelect;

package/dist/UserCenter/OrgPage/components/CreateMember/index.js

@@ -151,16 +151,16 @@ var CreateMember = function CreateMember(props) {
     properties: {
       pid: {
         type: 'string',
-        title: '所属部门',
+        title: '所属组织',
         'x-decorator': 'FormItem',
         'x-component': 'OrgSelect',
         'x-component-props': {
-          placeholder: '请选择所属部门',
+          placeholder: '请选择所属组织',
           disabled: true
         },
         'x-validator': [{
           required: true,
-          message: '请选择所属部门'
+          message: '请选择所属组织'
         }]
       },
       name: {

package/dist/UserCenter/OrgPage/components/CreateOrg/index.js

@@ -60,7 +60,7 @@ var CreateOrg = function CreateOrg(props) {
     if (isStart) {
       str = addOrEdit === 'add' ? '添加组织' : '编辑组织';
     } else {
-      str = addOrEdit === 'add' ? '添加部门' : '编辑部门';
+      str = addOrEdit === 'add' ? '添加组织' : '编辑组织';
     }
     return str;
   }, [isStart, addOrEdit]);
@@ -152,18 +152,18 @@ var CreateOrg = function CreateOrg(props) {
     properties: {
       name: {
         type: 'string',
-        title: isStart ? '组织名称' : '部门名称',
+        title: isStart ? '组织名称' : '组织名称',
         'x-decorator': 'FormItem',
         'x-component': 'Input',
         'x-component-props': {
-          placeholder: isStart ? '请输入组织名称' : '请输入部门名称',
+          placeholder: isStart ? '请输入组织名称' : '请输入组织名称',
           allowClear: true,
           maxLength: 20,
           showCount: true
         },
         'x-validator': [{
           required: true,
-          message: isStart ? '请输入组织名称' : '请输入部门名称'
+          message: isStart ? '请输入组织名称' : '请输入组织名称'
         }]
       }
     }
@@ -174,32 +174,32 @@ var CreateOrg = function CreateOrg(props) {
       properties: {
         pid: {
           type: 'string',
-          title: '所属部门',
+          title: '所属组织',
           'x-decorator': 'FormItem',
           'x-component': 'OrgSelect',
           'x-component-props': {
-            placeholder: '请选择所属部门',
+            placeholder: '请选择所属组织',
             disabled: true
           },
           'x-validator': [{
             required: true,
-            message: '请选择所属部门'
+            message: '请选择所属组织'
           }]
         },
         name: {
           type: 'string',
-          title: isStart ? '组织名称' : '部门名称',
+          title: isStart ? '组织名称' : '组织名称',
           'x-decorator': 'FormItem',
           'x-component': 'Input',
           'x-component-props': {
-            placeholder: isStart ? '请输入组织名称' : '请输入部门名称',
+            placeholder: isStart ? '请输入组织名称' : '请输入组织名称',
             allowClear: true,
             maxLength: 20,
             showCount: true
           },
           'x-validator': [{
             required: true,
-            message: isStart ? '请输入组织名称' : '请输入部门名称'
+            message: isStart ? '请输入组织名称' : '请输入组织名称'
           }]
         }
       }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepinnet-components/pc",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",