@nocobase/plugin-graph-collection-manager 0.9.0-alpha.1 → 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/GraphCollectionProvider.js

@@ -25,19 +25,9 @@ function _react() {
   return data;
 }
 
-function _reactI18next() {
-  const data = require("react-i18next");
-
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-
-  return data;
-}
-
 var _GraphCollectionShortcut = require("./GraphCollectionShortcut");
 
-var _locale = require("./locale");
+var _utils = require("./utils");
 
 const _excluded = ["routes", "components"];
 
@@ -61,16 +51,13 @@ const GraphCollectionProvider = _react().default.memo(props => {
   const _useContext = (0, _react().useContext)(_client().RouteSwitchContext),
         routes = _useContext.routes,
         components = _useContext.components,
-        others = _objectWithoutProperties(_useContext, _excluded);
-
-  _client().i18n.addResources('en-US', 'graphPositions', _locale.enUS);
-
-  _client().i18n.addResources('ja-JP', 'graphPositions', _locale.jaJP);
+        others = _objectWithoutProperties(_useContext, _excluded); // i18n.addResources('en-US', 'graphPositions', enUS);
+  // i18n.addResources('ja-JP', 'graphPositions', jaJP);
+  // i18n.addResources('zh-CN', 'graphPositions', zhCN);
 
-  _client().i18n.addResources('zh-CN', 'graphPositions', _locale.zhCN);
 
-  const _useTranslation = (0, _reactI18next().useTranslation)('graphPositions'),
-        t = _useTranslation.t;
+  const _useGCMTranslation = (0, _utils.useGCMTranslation)(),
+        t = _useGCMTranslation.t;
 
   const items = (0, _react().useContext)(_client().SettingsCenterContext);
   items['collection-manager']['tabs']['graph'] = {

package/lib/client/GraphCollectionShortcut.js

@@ -15,6 +15,16 @@ function _icons() {
   return data;
 }
 
+function _css() {
+  const data = require("@emotion/css");
+
+  _css = function _css() {
+    return data;
+  };
+
+  return data;
+}
+
 function _shared() {
   const data = require("@formily/shared");
 
@@ -45,26 +55,6 @@ function _react() {
   return data;
 }
 
-function _css() {
-  const data = require("@emotion/css");
-
-  _css = function _css() {
-    return data;
-  };
-
-  return data;
-}
-
-function _reactI18next() {
-  const data = require("react-i18next");
-
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-
-  return data;
-}
-
 function _reactRouterDom() {
   const data = require("react-router-dom");
 
@@ -79,6 +69,8 @@ var _actionHooks = require("./action-hooks");
 
 var _GraphDrawPage = require("./GraphDrawPage");
 
+var _utils = require("./utils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -220,8 +212,8 @@ const GraphCollectionPane = () => {
 exports.GraphCollectionPane = GraphCollectionPane;
 
 const GraphCollectionShortcut = () => {
-  const _useTranslation = (0, _reactI18next().useTranslation)('graphPositions'),
-        t = _useTranslation.t;
+  const _useGCMTranslation = (0, _utils.useGCMTranslation)(),
+        t = _useGCMTranslation.t;
 
   const history = (0, _reactRouterDom().useHistory)();
   return _react().default.createElement(_client().PluginManager.Toolbar.Item, {

package/lib/client/GraphDrawPage.js

@@ -107,28 +107,18 @@ function _react2() {
   return data;
 }
 
-function _reactI18next() {
-  const data = require("react-i18next");
-
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-
-  return data;
-}
-
 var _actionHooks = require("./action-hooks");
 
 var _AddCollectionAction = require("./components/AddCollectionAction");
 
 var _Entity = _interopRequireDefault(require("./components/Entity"));
 
+var _ViewNode = require("./components/ViewNode");
+
 var _style = require("./style");
 
 var _utils = require("./utils");
 
-var _ViewNode = require("./components/ViewNode");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -557,8 +547,8 @@ const GraphDrawPage = _react2().default.memo(() => {
   const api = (0, _client().useAPIClient)();
   const compile = (0, _client().useCompile)();
 
-  const _useTranslation = (0, _reactI18next().useTranslation)('graphPositions'),
-        t = _useTranslation.t;
+  const _useGCMTranslation = (0, _utils.useGCMTranslation)(),
+        t = _useGCMTranslation.t;
 
   const _useState = (0, _react2().useState)([]),
         _useState2 = _slicedToArray(_useState, 2),
@@ -643,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();
@@ -760,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
@@ -772,7 +761,7 @@ const GraphDrawPage = _react2().default.memo(() => {
           node: node,
           setTargetNode: setTargetNode,
           targetGraph: targetGraph
-        }))))));
+        })))))));
       },
       ports: {
         groups: {

package/lib/client/components/Entity.js

@@ -47,16 +47,6 @@ function _client() {
   return data;
 }
 
-function _reactI18next() {
-  const data = require("react-i18next");
-
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-
-  return data;
-}
-
 function _antd() {
   const data = require("antd");
 
@@ -67,20 +57,20 @@ function _antd() {
   return data;
 }
 
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
+function _lodash() {
+  const data = require("lodash");
 
-  _react = function _react() {
+  _lodash = function _lodash() {
     return data;
   };
 
   return data;
 }
 
-function _lodash() {
-  const data = require("lodash");
+function _react() {
+  const data = _interopRequireWildcard(require("react"));
 
-  _lodash = function _lodash() {
+  _react = function _react() {
     return data;
   };
 
@@ -91,20 +81,22 @@ var _actionHooks = require("../action-hooks");
 
 var _style = require("../style");
 
-var _FieldSummary = require("./FieldSummary");
+var _utils = require("../utils");
 
 var _AddFieldAction = require("./AddFieldAction");
 
 var _CollectionNodeProvder = require("./CollectionNodeProvder");
 
+var _EditCollectionAction = require("./EditCollectionAction");
+
 var _EditFieldAction = require("./EditFieldAction");
 
+var _FieldSummary = require("./FieldSummary");
+
 var _OverrideFieldAction = require("./OverrideFieldAction");
 
 var _ViewFieldAction = require("./ViewFieldAction");
 
-var _EditCollectionAction = require("./EditCollectionAction");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -144,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 () {
@@ -165,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,
@@ -178,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
@@ -197,6 +216,7 @@ const Entity = props => {
       useUpdateCollectionActionAndRefreshCM: _actionHooks.useUpdateCollectionActionAndRefreshCM,
       useCancelAction: _actionHooks.useCancelAction,
       loadCollections,
+      loadCategories,
       useAsyncDataSource: _actionHooks.useAsyncDataSource,
       Action: _client().Action,
       DeleteOutlined: _icons().DeleteOutlined,
@@ -284,8 +304,8 @@ const PortsCom = _react().default.memo(({
         collapse = _useState2[0],
         setCollapse = _useState2[1];
 
-  const _useTranslation = (0, _reactI18next().useTranslation)('graphPositions'),
-        t = _useTranslation.t;
+  const _useGCMTranslation = (0, _utils.useGCMTranslation)(),
+        t = _useGCMTranslation.t;
 
   const compile = (0, _client().useCompile)();
   const portsData = (0, _lodash().groupBy)(ports.items, v => {

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/client/utils.d.ts

@@ -1,3 +1,4 @@
+export declare const useGCMTranslation: () => import("react-i18next").UseTranslationResponse<"graph-collection-manager", undefined>;
 export declare const getInheritCollections: (collections: any, name: any) => any[];
 export declare const getChildrenCollections: (collections: any, name: any) => any[];
 export declare const formatData: (data: any) => {

package/lib/client/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getInheritCollections = exports.getDiffNode = exports.getDiffEdge = exports.getChildrenCollections = exports.formatPortData = exports.formatInheritEdgeData = exports.formatData = void 0;
+exports.useGCMTranslation = exports.getInheritCollections = exports.getDiffNode = exports.getDiffEdge = exports.getChildrenCollections = exports.formatPortData = exports.formatInheritEdgeData = exports.formatData = void 0;
 
 function _lodash() {
   const data = require("lodash");
@@ -15,6 +15,16 @@ function _lodash() {
   return data;
 }
 
+function _reactI18next() {
+  const data = require("react-i18next");
+
+  _reactI18next = function _reactI18next() {
+    return data;
+  };
+
+  return data;
+}
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -26,6 +36,12 @@ const shape = {
   EDGE: 'edge'
 };
 
+const useGCMTranslation = () => {
+  return (0, _reactI18next().useTranslation)('graph-collection-manager');
+};
+
+exports.useGCMTranslation = useGCMTranslation;
+
 const getInheritCollections = (collections, name) => {
   const parents = [];
 

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.1",
+  "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.1",
-    "@nocobase/test": "0.9.0-alpha.1"
+    "@nocobase/client": "0.9.1-alpha.1",
+    "@nocobase/test": "0.9.1-alpha.1"
   },
-  "gitHead": "d84c2a47c42c2ffec4fbf317d53268952fbd58d7"
+  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
 }