@pisell/private-materials 6.0.2 → 6.0.4

package/es/components/workSpaceList/components/AppearanceEdit/Color.less

@@ -19,5 +19,6 @@
     border: 3px solid var(--color-item-background-color);
     left: -6px;
     top: -6px;
+    box-sizing: border-box;
   }
 }

package/es/components/workSpaceList/components/AppearanceEdit/IconPanel.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import './IconPanel.less';
 interface IconPanel {
     name: string;
     color?: string;

package/es/components/workSpaceList/components/AppearanceEdit/IconPanel.js

@@ -15,6 +15,10 @@ import { useControllableValue } from 'ahooks';
 import { Space } from 'antd';
 import cs from 'classnames';
 import { useState } from 'react';
+import "./IconPanel.less";
+
+// 面板
+
 var IconPanel = function IconPanel(props) {
   var color = props.color,
     name = props.name,

package/es/components/workSpaceList/components/Card/constants.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Edit03, MagicWand02, Trash01 } from '@pisell/icon';
+import { Edit03, MagicWand02 } from '@pisell/icon';
 export var items = [{
   key: 'rename',
   label: 'Rename base',
@@ -26,7 +26,7 @@ export var items = [{
   key: 'customize',
   label: 'Customize appearance',
   icon: /*#__PURE__*/React.createElement(MagicWand02, null)
-},
+}
 // {
 //   type: 'divider',
 // },
@@ -35,10 +35,12 @@ export var items = [{
 //   label: 'Settings',
 //   icon: <SettingOutlined />,
 // },
-{
-  type: 'divider'
-}, {
-  key: 'delete',
-  label: 'Delete base',
-  icon: /*#__PURE__*/React.createElement(Trash01, null)
-}];
+// {
+//   type: 'divider',
+// },
+// {
+//   key: 'delete',
+//   label: 'Delete base',
+//   icon: <Trash01 />,
+// },
+];

package/es/components/workSpaceList/components/Card/index.js

@@ -15,6 +15,7 @@ import { antdConfirmPromise } from "./../Modal/antdConfirmPromise";
 import { items } from "./../Card/constants";
 import EditableString from "./../EditableString";
 import { EllipsisOutlined } from '@ant-design/icons';
+import useEngineContext from "./../../../../hooks/useEngineContext";
 import { Dropdown, Input, Popover, Select, Space, Switch } from '@pisell/materials';
 import { isFunction } from '@pisell/utils';
 import React, { useMemo, useRef, useState } from 'react';
@@ -67,6 +68,8 @@ var Card = function Card(props) {
     id = props.id,
     onDeleteBase = props.onDeleteBase,
     onUpdateBase = props.onUpdateBase;
+  var context = useEngineContext();
+  var pushV2AdminPage = context.appHelper.utils.getApp().history.pushV2AdminPage;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     editing = _useState2[0],
@@ -233,9 +236,10 @@ var Card = function Card(props) {
     };
   }();
   var handleCardClick = function handleCardClick() {
-    window.location.href = "/lowcode/".concat(id);
-    window.location.reload();
+    pushV2AdminPage("/lowcode/".concat(id));
+    // window.location.reload();
   };
+
   return /*#__PURE__*/React.createElement(Popover, {
     placement: "bottomLeft",
     content: content,

package/es/components/workSpaceList/components/SearchBar/index.js

@@ -75,6 +75,7 @@ var SearchBar = function SearchBar(props) {
   var handleGoBack = function handleGoBack() {
     window.history.back();
   };
+  console.log('%c [ onDelete ]-80', 'font-size:13px; background:pink; color:#bf2c9f;', onDelete);
   var onDropdownClick = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var key;

package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.js

@@ -65,6 +65,7 @@ var Search = function Search() {
       manual: true,
       debounceWait: 300
     }),
+    run = _useRequest.run,
     data = _useRequest.data;
   var handleSearch = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchText) {
@@ -78,7 +79,7 @@ var Search = function Search() {
             return _context.abrupt("return");
           case 2:
             _context.next = 4;
-            return data.run({
+            return run({
               tenant_id: '0',
               search: searchText
             });
@@ -93,7 +94,7 @@ var Search = function Search() {
     };
   }();
   useEffect(function () {
-    var _ref2 = data.data || {},
+    var _ref2 = data || {},
       workspace = _ref2.workspace,
       base = _ref2.base;
     if (workspace !== null && workspace !== void 0 && workspace.length || base !== null && base !== void 0 && base.length) {

package/es/components/workSpaceList/components/WorkspaceItem/index.js

@@ -26,7 +26,8 @@ var WorkspaceItem = function WorkspaceItem(props) {
     data = props.data,
     describe = props.describe,
     isDetail = props.isDetail,
-    id = props.id,
+    _props$id = props.id,
+    id = _props$id === void 0 ? 0 : _props$id,
     onSort = props.onSort,
     onAddBase = props.onAddBase,
     loading = props.loading,
@@ -43,16 +44,18 @@ var WorkspaceItem = function WorkspaceItem(props) {
     _useState2 = _slicedToArray(_useState, 2),
     editingTitle = _useState2[0],
     setEditingTitle = _useState2[1];
-  var params = new URLSearchParams(window.location.search);
-  var tenant_id = params.get('tenant_id') || '0';
+  var tenant_id = '0';
   useEffect(function () {
     if (searchParams.get('create') === 'true') {
       setEditingTitle(true);
     }
   }, [searchParams]);
   var handleDetailClick = function handleDetailClick() {
-    window.location.href = "/workspaces/".concat(tenant_id, "/detail/").concat(id);
+    console.log('%c [  ]-56', 'font-size:13px; background:pink; color:#bf2c9f;', context.appHelper.utils.getApp());
+    context.appHelper.utils.getApp().history.push("/workspaces/".concat(id));
+    // window.location.href = `/workspaces/${tenant_id}/detail/${id}`;
   };
+
   var handleDelete = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {

package/es/components/workSpaceList/index.js

@@ -49,7 +49,7 @@ var SearchBar = function SearchBar(props) {
     onChange: onSort
   })));
 };
-var defaultSize = 10;
+var defaultSize = 15;
 var WorkspacesList = function WorkspacesList() {
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -95,7 +95,7 @@ var WorkspacesList = function WorkspacesList() {
               }
               _data$list = data.list, list = _data$list === void 0 ? [] : _data$list, _data$count = data.count, count = _data$count === void 0 ? 0 : _data$count;
               return _context.abrupt("return", {
-                tenant_id: newParams.tenant_id,
+                tenant_id: 0,
                 list: list,
                 page: newParams.page + 1,
                 size: newParams.size,
@@ -141,7 +141,8 @@ var WorkspacesList = function WorkspacesList() {
   var _useRequest2 = useRequest(addWorkspace, {
       manual: true
     }),
-    run = _useRequest2.run;
+    run = _useRequest2.run,
+    runAsync = _useRequest2.runAsync;
   var add = useRequest(addBase, {
     manual: true
   });
@@ -155,18 +156,20 @@ var WorkspacesList = function WorkspacesList() {
   }, [sort, refreshKey]);
   var handleAdd = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _workspace$data;
       var workspace;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return run({
+            return runAsync({
               tenant_id: Number(tenant_id)
             });
           case 2:
             workspace = _context2.sent;
-            window.location.href = "/workspaces/".concat(tenant_id, "/detail/").concat(workspace.id, "?create=true");
-          case 4:
+            console.log('%c [ workspace ]-143', 'font-size:13px; background:pink; color:#bf2c9f;', workspace);
+            window.location.href = "/workspaces/".concat((workspace === null || workspace === void 0 ? void 0 : (_workspace$data = workspace.data) === null || _workspace$data === void 0 ? void 0 : _workspace$data.id) || '0', "?create=true");
+          case 5:
           case "end":
             return _context2.stop();
         }

package/es/components/workSpaceList/index.less

@@ -1,4 +1,7 @@
 .workspaces-wrap {
+  div {
+    box-sizing: border-box;
+  }
   padding: 16px;
   display: flex;
   flex-direction: column;

package/es/components/workSpaceList/server.js

@@ -89,7 +89,7 @@ export var updateWorkspace = /*#__PURE__*/function () {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           id = params.id, others = _objectWithoutProperties(params, _excluded);
-          return _context4.abrupt("return", request.getRequest().post("/workspace/".concat(id), others));
+          return _context4.abrupt("return", request.getRequest().put("/workspace/".concat(id), others));
         case 2:
         case "end":
           return _context4.stop();

package/es/components/workSpaceListDetail/index.js

@@ -15,14 +15,18 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import WorkspaceItem from "./../workSpaceList/components/WorkspaceItem";
+import useEngineContext from "./../../hooks/useEngineContext";
 import { useRef, useState } from 'react';
 import "./index.less";
 import { getWorkspaceDetail, getBaseList, deleteBaseDetail, updateBaseDetail, addBase } from "./../workSpaceList/server";
 import { useRequest } from 'ahooks';
 var defaultSize = 50;
 var workSpaceListDetail = function workSpaceListDetail() {
-  var params = new URLSearchParams(window.location.search);
-  var id = params.get('id');
+  var context = useEngineContext();
+  var useParams = context.appHelper.utils.getApp().history.useParams;
+  var _useParams = useParams(),
+    _useParams$id = _useParams.id,
+    id = _useParams$id === void 0 ? 0 : _useParams$id;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     order_by = _useState2[0],

package/lib/components/workSpaceList/components/AppearanceEdit/Color.less

@@ -19,5 +19,6 @@
     border: 3px solid var(--color-item-background-color);
     left: -6px;
     top: -6px;
+    box-sizing: border-box;
   }
 }

package/lib/components/workSpaceList/components/AppearanceEdit/IconPanel.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import './IconPanel.less';
 interface IconPanel {
     name: string;
     color?: string;

package/lib/components/workSpaceList/components/AppearanceEdit/IconPanel.js

@@ -39,6 +39,7 @@ var import_ahooks = require("ahooks");
 var import_antd = require("antd");
 var import_classnames = __toESM(require("classnames"));
 var import_react = require("react");
+var import_IconPanel = require("./IconPanel.less");
 var IconPanel = (props) => {
   const { color, name, value } = props;
   const [state, setState] = (0, import_ahooks.useControllableValue)(props);

package/lib/components/workSpaceList/components/Card/constants.js

@@ -61,7 +61,7 @@ var items = [
     key: "customize",
     label: "Customize appearance",
     icon: /* @__PURE__ */ import_react.default.createElement(import_icon.MagicWand02, null)
-  },
+  }
   // {
   //   type: 'divider',
   // },
@@ -70,14 +70,14 @@ var items = [
   //   label: 'Settings',
   //   icon: <SettingOutlined />,
   // },
-  {
-    type: "divider"
-  },
-  {
-    key: "delete",
-    label: "Delete base",
-    icon: /* @__PURE__ */ import_react.default.createElement(import_icon.Trash01, null)
-  }
+  // {
+  //   type: 'divider',
+  // },
+  // {
+  //   key: 'delete',
+  //   label: 'Delete base',
+  //   icon: <Trash01 />,
+  // },
 ];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/workSpaceList/components/Card/index.js

@@ -39,6 +39,7 @@ var import_antdConfirmPromise = require("./../Modal/antdConfirmPromise");
 var import_constants = require("./../Card/constants");
 var import_EditableString = __toESM(require("./../EditableString"));
 var import_icons = require("@ant-design/icons");
+var import_useEngineContext = __toESM(require("./../../../../hooks/useEngineContext"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_react = __toESM(require("react"));
@@ -82,6 +83,8 @@ var Card = (props) => {
     onDeleteBase,
     onUpdateBase
   } = props;
+  const context = (0, import_useEngineContext.default)();
+  const { pushV2AdminPage } = context.appHelper.utils.getApp().history;
   const [editing, setEditing] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [popoverOpen, setPopoverOpen] = (0, import_react.useState)(false);
@@ -167,8 +170,7 @@ var Card = (props) => {
     }
   };
   const handleCardClick = () => {
-    window.location.href = `/lowcode/${id}`;
-    window.location.reload();
+    pushV2AdminPage(`/lowcode/${id}`);
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.Popover,

package/lib/components/workSpaceList/components/SearchBar/index.js

@@ -95,6 +95,11 @@ var SearchBar = (props) => {
   const handleGoBack = () => {
     window.history.back();
   };
+  console.log(
+    "%c [ onDelete ]-80",
+    "font-size:13px; background:pink; color:#bf2c9f;",
+    onDelete
+  );
   const onDropdownClick = async ({ key }) => {
     if (key === "rename") {
       setEditingTitle(true);

package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.js

@@ -67,20 +67,20 @@ var Search = () => {
   import_utils.request.setRequest(context.appHelper.utils.request);
   const [options, setOptions] = (0, import_react2.useState)([]);
   const searchParams = new URLSearchParams(window.location.search);
-  const { data } = (0, import_ahooks.useRequest)(import_server.searchWorkspace, {
+  const { run, data } = (0, import_ahooks.useRequest)(import_server.searchWorkspace, {
     manual: true,
     debounceWait: 300
   });
   const handleSearch = async (searchText) => {
     if (!searchText)
       return;
-    await data.run({
+    await run({
       tenant_id: "0",
       search: searchText
     });
   };
   (0, import_react2.useEffect)(() => {
-    const { workspace, base } = data.data || {};
+    const { workspace, base } = data || {};
     if ((workspace == null ? void 0 : workspace.length) || (base == null ? void 0 : base.length)) {
       const newOptions = [
         {

package/lib/components/workSpaceList/components/WorkspaceItem/index.js

@@ -51,7 +51,7 @@ var WorkspaceItem = (props) => {
     data,
     describe,
     isDetail,
-    id,
+    id = 0,
     onSort,
     onAddBase,
     loading,
@@ -66,15 +66,19 @@ var WorkspaceItem = (props) => {
   import_utils.request.setRequest(context.appHelper.utils.request);
   const searchParams = new URLSearchParams(window.location.search);
   const [editingTitle, setEditingTitle] = (0, import_react.useState)(false);
-  const params = new URLSearchParams(window.location.search);
-  const tenant_id = params.get("tenant_id") || "0";
+  const tenant_id = "0";
   (0, import_react.useEffect)(() => {
     if (searchParams.get("create") === "true") {
       setEditingTitle(true);
     }
   }, [searchParams]);
   const handleDetailClick = () => {
-    window.location.href = `/workspaces/${tenant_id}/detail/${id}`;
+    console.log(
+      "%c [  ]-56",
+      "font-size:13px; background:pink; color:#bf2c9f;",
+      context.appHelper.utils.getApp()
+    );
+    context.appHelper.utils.getApp().history.push(`/workspaces/${id}`);
   };
   const handleDelete = async () => {
     await (0, import_server.deleteWorkspace)(id);

package/lib/components/workSpaceList/index.js

@@ -48,7 +48,7 @@ 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 })));
 };
-var defaultSize = 10;
+var defaultSize = 15;
 var WorkspacesList = () => {
   const [sort, setSort] = (0, import_react2.useState)("");
   const [refreshKey, setRefreshKey] = (0, import_react2.useState)({});
@@ -77,7 +77,7 @@ var WorkspacesList = () => {
       if (code === 200) {
         const { list = [], count = 0 } = data2;
         return {
-          tenant_id: newParams.tenant_id,
+          tenant_id: 0,
           list,
           page: newParams.page + 1,
           size: newParams.size,
@@ -112,7 +112,7 @@ var WorkspacesList = () => {
       refreshDeps: [sort, refreshKey]
     }
   );
-  const { run } = (0, import_ahooks.useRequest)(import_server.addWorkspace, {
+  const { run, runAsync } = (0, import_ahooks.useRequest)(import_server.addWorkspace, {
     manual: true
   });
   const add = (0, import_ahooks.useRequest)(import_server.addBase, {
@@ -121,10 +121,16 @@ var WorkspacesList = () => {
   (0, import_react2.useEffect)(() => {
   }, [sort, refreshKey]);
   const handleAdd = async () => {
-    const workspace = await run({
+    var _a;
+    const workspace = await runAsync({
       tenant_id: Number(tenant_id)
     });
-    window.location.href = `/workspaces/${tenant_id}/detail/${workspace.id}?create=true`;
+    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`;
   };
   const handleSort = (val) => {
     setSort((val == null ? void 0 : val[0]) || "");

package/lib/components/workSpaceList/index.less

@@ -1,4 +1,7 @@
 .workspaces-wrap {
+  div {
+    box-sizing: border-box;
+  }
   padding: 16px;
   display: flex;
   flex-direction: column;

package/lib/components/workSpaceList/server.js

@@ -46,7 +46,7 @@ var addWorkspace = async (params) => {
 };
 var updateWorkspace = async (params) => {
   const { id, ...others } = params;
-  return import_utils.request.getRequest().post(`/workspace/${id}`, others);
+  return import_utils.request.getRequest().put(`/workspace/${id}`, others);
 };
 var getWorkspaceDetail = async (id) => {
   return import_utils.request.getRequest().get(`/workspace/${id}`, {});

package/lib/components/workSpaceListDetail/index.js

@@ -34,14 +34,16 @@ __export(workSpaceListDetail_exports, {
 module.exports = __toCommonJS(workSpaceListDetail_exports);
 var import_react = __toESM(require("react"));
 var import_WorkspaceItem = __toESM(require("./../workSpaceList/components/WorkspaceItem"));
+var import_useEngineContext = __toESM(require("./../../hooks/useEngineContext"));
 var import_react2 = require("react");
 var import_index = require("./index.less");
 var import_server = require("./../workSpaceList/server");
 var import_ahooks = require("ahooks");
 var defaultSize = 50;
 var workSpaceListDetail = () => {
-  const params = new URLSearchParams(window.location.search);
-  const id = params.get("id");
+  const context = (0, import_useEngineContext.default)();
+  const { useParams } = context.appHelper.utils.getApp().history;
+  const { id = 0 } = useParams();
   const [order_by, setOrder_by] = (0, import_react2.useState)("");
   const [refreshKey, setRefreshKey] = (0, import_react2.useState)({});
   const scrollRef = (0, import_react2.useRef)(null);
@@ -54,8 +56,8 @@ var workSpaceListDetail = () => {
     loading,
     mutate
   } = (0, import_ahooks.useRequest)(
-    async (params2) => {
-      const newParams = params2 || {
+    async (params) => {
+      const newParams = params || {
         workspace_id: Number(id),
         page: 1,
         size: defaultSize,
@@ -112,8 +114,8 @@ var workSpaceListDetail = () => {
   const handleSort = (val) => {
     setOrder_by((val == null ? void 0 : val[0]) || "");
   };
-  const handleAddBase = async (params2) => {
-    const { name: name2, color, icon } = params2;
+  const handleAddBase = async (params) => {
+    const { name: name2, color, icon } = params;
     await add.run({
       name: name2,
       color,
@@ -132,13 +134,13 @@ var workSpaceListDetail = () => {
     });
     await (0, import_server.deleteBaseDetail)(id2);
   };
-  const handleUpdateBase = async (params2) => {
+  const handleUpdateBase = async (params) => {
     mutate((oldBase) => {
       const newList = oldBase.list.map((item) => {
-        if (item.id === params2.id) {
+        if (item.id === params.id) {
           return {
             ...item,
-            ...params2
+            ...params
           };
         }
         return item;
@@ -149,10 +151,10 @@ var workSpaceListDetail = () => {
       };
     });
     await (0, import_server.updateBaseDetail)({
-      id: params2.id,
-      color: params2 == null ? void 0 : params2.color,
-      icon: params2 == null ? void 0 : params2.icon,
-      name: params2 == null ? void 0 : params2.name
+      id: params.id,
+      color: params == null ? void 0 : params.color,
+      icon: params == null ? void 0 : params.icon,
+      name: params == null ? void 0 : params.name
     });
   };
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "workspace-detail-wrap" }, /* @__PURE__ */ import_react.default.createElement(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,9 +59,9 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/icon": "0.0.11",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "6.0.2",
+    "@pisell/materials": "6.0.3",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {