@pisell/private-materials 6.0.14 → 6.0.16

package/lib/components/workSpaceList/index.js

@@ -45,19 +45,23 @@ var import_react2 = require("react");
 var import_index = require("./index.less");
 var import_server = require("./server");
 var SearchBar = (props) => {
-  const { title, onAddWorkspace, onSort } = props;
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "search-bar-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "line-1" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", { className: "title" }, title)), /* @__PURE__ */ import_react.default.createElement(import_materials.Space, { size: 24 }, /* @__PURE__ */ import_react.default.createElement(import_SearchWorkspaceAndBase.default, null), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "primary", onClick: onAddWorkspace }, "Create a workspace"))), /* @__PURE__ */ import_react.default.createElement("div", { className: "line-2" }, /* @__PURE__ */ import_react.default.createElement(import_Sort.default, { onChange: onSort })));
+  const { title, onAddWorkspace, onSort, className, ...rest } = props;
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "search-bar-wrap", ...rest }, /* @__PURE__ */ import_react.default.createElement("div", { className: "line-1" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", { className: "title" }, title)), /* @__PURE__ */ import_react.default.createElement(import_materials.Space, { size: 24 }, /* @__PURE__ */ import_react.default.createElement(import_SearchWorkspaceAndBase.default, null), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "primary", onClick: onAddWorkspace }, "Create a workspace"))), /* @__PURE__ */ import_react.default.createElement("div", { className: "line-2" }, /* @__PURE__ */ import_react.default.createElement(import_Sort.default, { onChange: onSort })));
 };
 var defaultSize = 15;
-var WorkspacesList = () => {
+var getTenantId = () => {
+  return Number(new URLSearchParams(window.location.search).get("tenant_id") || 0);
+};
+var WorkspacesList = (props) => {
+  const { className, ...rest } = props;
   const [sort, setSort] = (0, import_react2.useState)("");
   const [refreshKey, setRefreshKey] = (0, import_react2.useState)({});
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
-  const tenant_id = new URLSearchParams(window.location.search).get("tenant_id") || 0;
+  const tenant_id = getTenantId();
   const scrollRef = (0, import_react2.useRef)(null);
   const {
-    data = [],
+    data = {},
     loading,
     mutate
   } = (0, import_ahooks.useRequest)(
@@ -69,31 +73,19 @@ var WorkspacesList = () => {
         order_by: sort
       };
       const { code, data: data2 } = await (0, import_server.getWorkspaces)({
-        tenant_id: 0,
-        page: newParams == null ? void 0 : newParams.page,
-        size: newParams == null ? void 0 : newParams.size,
-        order_by: newParams == null ? void 0 : newParams.order_by
+        tenant_id,
+        page: newParams.page,
+        size: newParams.size,
+        order_by: newParams.order_by
       });
-      if (code === 200) {
-        const { list = [], count = 0 } = data2;
-        return {
-          tenant_id: 0,
-          list,
-          page: newParams.page + 1,
-          size: newParams.size,
-          count,
-          order_by: newParams == null ? void 0 : newParams.order_by
-        };
-      } else {
-        return {
-          tenant_id: newParams.tenant_id,
-          list: [],
-          page: newParams.page,
-          size: newParams.size,
-          count: 0,
-          order_by: newParams == null ? void 0 : newParams.order_by
-        };
-      }
+      return {
+        tenant_id,
+        list: code === 200 ? data2.list || [] : [],
+        page: newParams.page + 1,
+        size: newParams.size,
+        count: code === 200 ? data2.count || 0 : 0,
+        order_by: newParams.order_by
+      };
     },
     {
       defaultParams: [
@@ -104,7 +96,6 @@ var WorkspacesList = () => {
           order_by: sort
         }
       ],
-      loadMore: true,
       ref: scrollRef,
       isNoMore: (d) => {
         return d ? d.list.length >= d.count : false;
@@ -112,25 +103,18 @@ var WorkspacesList = () => {
       refreshDeps: [sort, refreshKey]
     }
   );
-  const { run, runAsync } = (0, import_ahooks.useRequest)(import_server.addWorkspace, {
+  const { runAsync } = (0, import_ahooks.useRequest)(import_server.addWorkspace, {
     manual: true
   });
   const add = (0, import_ahooks.useRequest)(import_server.addBase, {
     manual: true
   });
-  (0, import_react2.useEffect)(() => {
-  }, [sort, refreshKey]);
   const handleAdd = async () => {
     var _a;
     const workspace = await runAsync({
-      tenant_id: Number(tenant_id)
+      tenant_id
     });
-    console.log(
-      "%c [ workspace ]-143",
-      "font-size:13px; background:pink; color:#bf2c9f;",
-      workspace
-    );
-    window.location.href = `/workspaces/${((_a = workspace == null ? void 0 : workspace.data) == null ? void 0 : _a.id) || "0"}?create=true`;
+    context.appHelper.utils.getApp().history.push(`/workspaces/${((_a = workspace == null ? void 0 : workspace.data) == null ? void 0 : _a.id) || "0"}?create=true`);
   };
   const handleSort = (val) => {
     setSort((val == null ? void 0 : val[0]) || "");
@@ -148,21 +132,24 @@ var WorkspacesList = () => {
   };
   const handleDelete = (id) => {
     mutate((oldList) => {
-      var _a;
+      if (!oldList)
+        return oldList;
       return {
         ...oldList,
-        list: (_a = oldList == null ? void 0 : oldList.list) == null ? void 0 : _a.filter((item) => item.id !== id)
+        list: oldList.list.filter((item) => item.id !== id)
       };
     });
   };
   const handleUpdateBase = async (params) => {
     mutate((oldBase) => {
+      if (!oldBase)
+        return oldBase;
       const newList = oldBase.list.map((item) => {
         var _a;
         if (item.id === params.workspaceId) {
           return {
             ...item,
-            base: (_a = item == null ? void 0 : item.base) == null ? void 0 : _a.map((bas) => {
+            base: (_a = item.base) == null ? void 0 : _a.map((bas) => {
               if (bas.id === params.id) {
                 return {
                   ...bas,
@@ -187,39 +174,39 @@ var WorkspacesList = () => {
       name: params == null ? void 0 : params.name
     });
   };
+  const renderWorkspaceItem = (item) => /* @__PURE__ */ import_react.default.createElement(
+    import_WorkspaceItem.default,
+    {
+      key: item.id,
+      id: item.id,
+      title: item.name,
+      loading: false,
+      describe: item.description,
+      data: item.base || [],
+      onRefresh: () => setRefreshKey({}),
+      onDelete: () => handleDelete(item.id),
+      baseCount: item.base_count,
+      onUpdateBase: (params) => handleUpdateBase({
+        ...params,
+        workspaceId: item.id
+      }),
+      onAddBase: (params) => handleAddBase({
+        ...item,
+        ...params
+      })
+    }
+  );
   const content = (0, import_react2.useMemo)(() => {
+    var _a;
     if (loading) {
       return /* @__PURE__ */ import_react.default.createElement(import_materials.Skeleton, null);
     }
-    if (data.list.length) {
-      return data == null ? void 0 : data.list.map((item) => {
-        return /* @__PURE__ */ import_react.default.createElement(
-          import_WorkspaceItem.default,
-          {
-            key: item.id,
-            id: item.id,
-            title: item.name,
-            loading: false,
-            describe: item.description,
-            data: (item == null ? void 0 : item.base) || [],
-            onRefresh: () => setRefreshKey({}),
-            onDelete: () => handleDelete(item.id),
-            baseCount: item.base_count,
-            onUpdateBase: (params) => handleUpdateBase({
-              ...params,
-              workspaceId: item.id
-            }),
-            onAddBase: (params) => handleAddBase({
-              ...item,
-              ...params
-            })
-          }
-        );
-      });
+    if ((_a = data.list) == null ? void 0 : _a.length) {
+      return data.list.map(renderWorkspaceItem);
     }
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Empty, null);
   }, [loading, data]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "workspaces-wrap" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "workspaces-wrap", ...rest }, /* @__PURE__ */ import_react.default.createElement(
     SearchBar,
     {
       title: "All Workspaces",

package/lib/components/workSpaceListDetail/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { FC } from 'react';
 import './index.less';
-declare const workSpaceListDetail: () => React.JSX.Element;
-export default workSpaceListDetail;
+declare const WorkSpaceListDetail: FC;
+export default WorkSpaceListDetail;

package/lib/components/workSpaceListDetail/index.js

@@ -40,7 +40,7 @@ var import_index = require("./index.less");
 var import_server = require("./../workSpaceList/server");
 var import_ahooks = require("ahooks");
 var defaultSize = 50;
-var workSpaceListDetail = () => {
+var WorkSpaceListDetail = () => {
   const context = (0, import_useEngineContext.default)();
   const { useParams } = context.appHelper.utils.getApp().history;
   const { id = 0 } = useParams();
@@ -64,31 +64,19 @@ var workSpaceListDetail = () => {
         order_by
       };
       const { code, data } = await (0, import_server.getBaseList)({
-        workspace_id: newParams == null ? void 0 : newParams.workspace_id,
-        page: newParams == null ? void 0 : newParams.page,
-        size: newParams == null ? void 0 : newParams.size,
-        order_by: newParams == null ? void 0 : newParams.order_by
+        workspace_id: newParams.workspace_id,
+        page: newParams.page,
+        size: newParams.size,
+        order_by: newParams.order_by
       });
-      if (code === 200) {
-        const { list: list2 = [], count = 0 } = data;
-        return {
-          workspace_id: newParams.workspace_id,
-          list: list2,
-          page: newParams.page + 1,
-          size: newParams.size,
-          count,
-          order_by: newParams == null ? void 0 : newParams.order_by
-        };
-      } else {
-        return {
-          workspace_id: newParams.workspace_id,
-          list: [],
-          page: newParams.page + 1,
-          size: newParams.size,
-          count: 0,
-          order_by: newParams == null ? void 0 : newParams.order_by
-        };
-      }
+      return {
+        workspace_id: newParams.workspace_id,
+        list: code === 200 ? data.list || [] : [],
+        page: newParams.page + 1,
+        size: newParams.size,
+        count: code === 200 ? data.count || 0 : 0,
+        order_by: newParams.order_by
+      };
     },
     {
       defaultParams: [
@@ -109,7 +97,7 @@ var workSpaceListDetail = () => {
   const add = (0, import_ahooks.useRequest)(import_server.addBase, {
     manual: true
   });
-  const { name, id: workspace_id, tenant_id, description } = detail || {};
+  const { name, id: workspace_id, tenant_id, description } = (detail == null ? void 0 : detail.data) || {};
   const { list = [] } = baseDetail || {};
   const handleSort = (val) => {
     setOrder_by((val == null ? void 0 : val[0]) || "");
@@ -127,6 +115,8 @@ var workSpaceListDetail = () => {
   };
   const handleDeleteBase = async (id2) => {
     mutate((oldBase) => {
+      if (!oldBase)
+        return oldBase;
       return {
         ...oldBase,
         list: oldBase.list.filter((item) => item.id !== id2)
@@ -136,6 +126,8 @@ var workSpaceListDetail = () => {
   };
   const handleUpdateBase = async (params) => {
     mutate((oldBase) => {
+      if (!oldBase)
+        return oldBase;
       const newList = oldBase.list.map((item) => {
         if (item.id === params.id) {
           return {
@@ -175,4 +167,4 @@ var workSpaceListDetail = () => {
     }
   ));
 };
-var workSpaceListDetail_default = workSpaceListDetail;
+var workSpaceListDetail_default = WorkSpaceListDetail;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.0.14",
+  "version": "6.0.16",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,8 +61,8 @@
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.0.12",
-    "@pisell/date-picker": "1.0.100"
+    "@pisell/date-picker": "1.0.100",
+    "@pisell/materials": "6.0.14"
   },
   "peerDependencies": {
     "react": "^18.0.0",