@deepinnet-components/pc 0.0.33 → 0.0.35

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

@@ -16,6 +16,7 @@ export interface MainProps {
     hideMemberType?: Boolean;
     showMemberPilot?: Boolean;
     canEditPassword?: Boolean;
+    orgSortConfig?: any;
 }
 declare const Index: React.FC<MainProps>;
 export default Index;

package/dist/UserCenter/ConfigProvider/index.js

@@ -73,7 +73,9 @@ var Index = function Index(props) {
     _props$showMemberPilo = props.showMemberPilot,
     showMemberPilot = _props$showMemberPilo === void 0 ? false : _props$showMemberPilo,
     _props$canEditPasswor = props.canEditPassword,
-    canEditPassword = _props$canEditPasswor === void 0 ? false : _props$canEditPasswor;
+    canEditPassword = _props$canEditPasswor === void 0 ? false : _props$canEditPasswor,
+    _props$orgSortConfig = props.orgSortConfig,
+    orgSortConfig = _props$orgSortConfig === void 0 ? false : _props$orgSortConfig;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -231,7 +233,8 @@ var Index = function Index(props) {
       hideDeleteAccountBtn: hideDeleteAccountBtn,
       hideMemberType: hideMemberType,
       showMemberPilot: showMemberPilot,
-      canEditPassword: canEditPassword
+      canEditPassword: canEditPassword,
+      orgSortConfig: orgSortConfig
     });
   }, []);
   if (!value) return null;

package/dist/UserCenter/OrgPage/index.js

@@ -93,7 +93,8 @@ var OrgList = function OrgList() {
   var ApiService = contextValue.ApiService,
     Components = contextValue.Components,
     hideMemberType = contextValue.hideMemberType,
-    showMemberPilot = contextValue.showMemberPilot;
+    showMemberPilot = contextValue.showMemberPilot,
+    orgSortConfig = contextValue.orgSortConfig;
   var _getUrlQuery = getUrlQuery(),
     id = _getUrlQuery.id;
   var _useState = useState([]),
@@ -113,7 +114,7 @@ var OrgList = function OrgList() {
   }
   function _getOrgList() {
     _getOrgList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _getUrlQuery2, id, params, _ref, success, data, list, _breadcrumb, arr;
+      var _getUrlQuery2, id, params, _ref, success, data, _list, bList, list, orderMap, _breadcrumb, arr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -129,8 +130,24 @@ var OrgList = function OrgList() {
             success = _ref.success;
             data = _ref.data;
             if (success) {
-              list = data || [];
-              if (list !== null && list !== void 0 && list.length) {
+              bList = data || [];
+              if (orgSortConfig) {
+                // 创建 id 到排序权重的映射
+                orderMap = new Map();
+                orgSortConfig.forEach(function (id, index) {
+                  orderMap.set(id, index);
+                });
+                // 排序
+                bList.sort(function (a, b) {
+                  var aOrder = orderMap.has(a.id) ? orderMap.get(a.id) : Infinity;
+                  var bOrder = orderMap.has(b.id) ? orderMap.get(b.id) : Infinity;
+                  return aOrder - bOrder;
+                });
+                list = bList;
+              } else {
+                list = bList;
+              }
+              if ((_list = list) !== null && _list !== void 0 && _list.length) {
                 if (id) {
                   list[0].showType = 1;
                   list[0].isFirst = true;
@@ -464,24 +481,23 @@ var OrgList = function OrgList() {
     rowKey: "key",
     scroll: {
       x: 1200
-    }
-    // expandable={{
-    //   defaultExpandAllRows: true, // 为啥不生效
-    //   defaultExpandedRowKeys: expandedRowKeys,
-    //   expandedRowKeys,
-    //   onExpand: (flag, row) => {
-    //     if (flag) {
-    //       setExpandedRowKeys([...expandedRowKeys, row.key]);
-    //     } else {
-    //       setExpandedRowKeys(
-    //         [...expandedRowKeys].filter((item) => item !== row.key),
-    //       );
-    //     }
-    //   },
-    //   childrenColumnName: 'listChildren',
-    //   indentSize: 50,
-    // }}
-    ,
+    },
+    expandable: {
+      // defaultExpandAllRows: true, // 为啥不生效
+      // defaultExpandedRowKeys: expandedRowKeys,
+      // expandedRowKeys,
+      // onExpand: (flag, row) => {
+      //   if (flag) {
+      //     setExpandedRowKeys([...expandedRowKeys, row.key]);
+      //   } else {
+      //     setExpandedRowKeys(
+      //       [...expandedRowKeys].filter((item) => item !== row.key),
+      //     );
+      //   }
+      // },
+      childrenColumnName: 'listChildren',
+      indentSize: 50
+    },
     loading: loading
   })), /*#__PURE__*/React.createElement(CreateOrg, {
     isStart: orgModalInfo.isStart,

package/package.json

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