@nocobase/plugin-graph-collection-manager 0.9.0-alpha.2 → 0.9.1-alpha.1

package/README.md

@@ -0,0 +1,11 @@
+# graph-collection-manager
+
+English | [中文](./README.zh-CN.md)
+
+## 安装激活
+
+```bash
+yarn pm enable graph-collection-manager 
+```
+
+## 使用方法

package/README.zh-CN.md

@@ -0,0 +1,11 @@
+# graph-collection-manager
+
+[English](./README.md) | 中文
+
+## 安装激活
+
+```bash
+yarn pm enable graph-collection-manager 
+```
+
+## 使用方法

package/lib/client/GraphDrawPage.js

@@ -633,7 +633,6 @@ const GraphDrawPage = _react2().default.memo(() => {
   const refreshGM = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(function* () {
       const data = yield refreshCM();
-      console.log(data);
       targetGraph.collections = data;
       targetGraph.updatePositionAction = useUpdatePositionAction;
       const currentNodes = targetGraph.getNodes();
@@ -750,7 +749,7 @@ const GraphDrawPage = _react2().default.memo(() => {
           inherit: true,
           scope: scope,
           components: components
-        }, _react2().default.createElement(_client().CollectionManagerProvider, {
+        }, _react2().default.createElement(_client().CollectionCategroriesProvider, null, _react2().default.createElement(_client().CollectionManagerProvider, {
           collections: (_targetGraph2 = targetGraph) === null || _targetGraph2 === void 0 ? void 0 : _targetGraph2.collections,
           refreshCM: refreshGM,
           interfaces: ctx.interfaces
@@ -762,7 +761,7 @@ const GraphDrawPage = _react2().default.memo(() => {
           node: node,
           setTargetNode: setTargetNode,
           targetGraph: targetGraph
-        }))))));
+        })))))));
       },
       ports: {
         groups: {

package/lib/client/components/Entity.js

@@ -136,10 +136,12 @@ const Entity = props => {
         id = node.id;
   const database = (0, _client().useCurrentAppInfo)();
   const collectionData = (0, _react().useRef)();
+  const categoryData = (0, _react().useContext)(_client().CollectionCategroriesContext);
   collectionData.current = _objectSpread(_objectSpread({}, item), {}, {
     title,
     inherits: item.inherits && new Proxy(item.inherits, {})
   });
+  const category = item.category;
   const compile = (0, _client().useCompile)();
 
   const loadCollections = /*#__PURE__*/function () {
@@ -157,6 +159,19 @@ const Entity = props => {
     };
   }();
 
+  const loadCategories = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(function* () {
+      return categoryData.data.map(item => ({
+        label: compile(item.name),
+        value: item.id
+      }));
+    });
+
+    return function loadCategories() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
   const portsProps = {
     targetGraph,
     collectionData,
@@ -170,10 +185,22 @@ const Entity = props => {
       boxShadow: attrs === null || attrs === void 0 ? void 0 : attrs.boxShadow,
       border: select ? '2px dashed #f5a20a' : 0
     }
-  }, _react().default.createElement("div", {
+  }, category.map((v, index) => {
+    return _react().default.createElement(_antd().Badge.Ribbon, {
+      color: v.color,
+      style: {
+        width: '103%',
+        height: '3px',
+        marginTop: index * 5 - 8,
+        borderRadius: 0
+      },
+      placement: "start"
+    });
+  }), _react().default.createElement("div", {
     className: _style.headClass,
     style: {
-      background: (attrs === null || attrs === void 0 ? void 0 : attrs.hightLight) ? '#1890ff' : null
+      background: (attrs === null || attrs === void 0 ? void 0 : attrs.hightLight) ? '#1890ff' : null,
+      paddingTop: category.length * 3
     }
   }, _react().default.createElement("span", {
     className: _style.tableNameClass
@@ -189,6 +216,7 @@ const Entity = props => {
       useUpdateCollectionActionAndRefreshCM: _actionHooks.useUpdateCollectionActionAndRefreshCM,
       useCancelAction: _actionHooks.useCancelAction,
       loadCollections,
+      loadCategories,
       useAsyncDataSource: _actionHooks.useAsyncDataSource,
       Action: _client().Action,
       DeleteOutlined: _icons().DeleteOutlined,

package/lib/client/style.js

@@ -143,7 +143,7 @@ const entityContainer = (0, _css().css)`
 `;
 exports.entityContainer = entityContainer;
 const headClass = (0, _css().css)`
-  height: 40px;
+  height: 50px;
   font-size: 14px;
   font-weight: 500;
   display: flex;

package/lib/server/collections/graphPositions.js

@@ -16,6 +16,8 @@ function _database() {
 }
 
 var _default = (0, _database().defineCollection)({
+  namespace: 'graph-collection-manager',
+  duplicator: 'required',
   name: 'graphPositions',
   fields: [{
     type: 'string',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-graph-collection-manager",
-  "version": "0.9.0-alpha.2",
+  "version": "0.9.1-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
@@ -11,8 +11,8 @@
     "dagre": "^0.8.5"
   },
   "devDependencies": {
-    "@nocobase/client": "0.9.0-alpha.2",
-    "@nocobase/test": "0.9.0-alpha.2"
+    "@nocobase/client": "0.9.1-alpha.1",
+    "@nocobase/test": "0.9.1-alpha.1"
   },
-  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
+  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
 }