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

package/lib/client/locale/index.js

@@ -21,11 +21,7 @@ Object.defineProperty(exports, "zhCN", {
     return _zhCN.default;
   }
 });
-
 var _enUS = _interopRequireDefault(require("./en-US"));
-
 var _zhCN = _interopRequireDefault(require("./zh-CN"));
-
 var _jaJP = _interopRequireDefault(require("./ja-JP"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/client/locale/pt-BR.d.ts

@@ -0,0 +1,16 @@
+declare const _default: {
+    'Graph Collection': string;
+    'Collection List': string;
+    'Full Screen': string;
+    'Collection Search': string;
+    'Create Collection': string;
+    'All Fields': string;
+    'Association Fields': string;
+    'Optional fields': string;
+    'All relationships': string;
+    'Entity relationship only': string;
+    'Inheritance relationship only': string;
+    'Graphical interface': string;
+    Selection: string;
+};
+export default _default;

package/lib/client/locale/pt-BR.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  'Graph Collection': 'Coleção de Gráficos',
+  'Collection List': 'Lista de Coleções',
+  'Full Screen': 'Tela Cheia',
+  'Collection Search': 'Busca de Coleção',
+  'Create Collection': 'Criar Coleção',
+  'All Fields': 'Todos os Campos',
+  'Association Fields': 'Campos de Associação',
+  'Optional fields': 'Campos Opcionais',
+  'All relationships': 'Todos os relacionamentos',
+  'Entity relationship only': 'Somente relação de Entidade',
+  'Inheritance relationship only': 'Somente relação de Herança',
+  'Graphical interface': 'Interface Gráfica',
+  'Selection': 'Seleção'
+};
+exports.default = _default;

package/lib/client/locale/zh-CN.d.ts

@@ -6,6 +6,7 @@ declare const _default: {
     'Create Collection': string;
     'All Fields': string;
     'Association Fields': string;
+    'Optional fields': string;
     'All relationships': string;
     'Entity relationship only': string;
     'Inheritance relationship only': string;

package/lib/client/locale/zh-CN.js

@@ -12,6 +12,7 @@ var _default = {
   'Create Collection': '创建数据表',
   'All Fields': '全部',
   'Association Fields': '关系字段',
+  'Optional fields': '可选字段',
   'All relationships': '所有关系',
   'Entity relationship only': '实体关系',
   'Inheritance relationship only': '继承关系',

package/lib/client/style.js

@@ -4,17 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.tableNameClass = exports.tableBtnClass = exports.nodeSubtreeClass = exports.headClass = exports.graphCollectionContainerClass = exports.entityContainer = exports.collectionListClass = exports.collectiionPopoverClass = exports.addButtonClass = void 0;
-
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 const nodeSubtreeClass = (0, _css().css)`
   display: flex;
   flex-direction: column-reverse;

package/lib/client/utils.d.ts

@@ -6,7 +6,7 @@ export declare const formatData: (data: any) => {
     edgesData: any[];
     inheritEdges: any[];
 };
-export declare const formatPortData: (ports: any) => import("lodash").Dictionary<[any, ...any[]]>;
+export declare const formatPortData: (ports: any) => import("lodash").Dictionary<any[]>;
 export declare const formatInheritEdgeData: (collections: any) => any[];
 export declare const getDiffNode: (newNodes: any, oldNodes: any) => any[];
 export declare const getDiffEdge: (newEdges: any, oldEdges: any) => any[];

package/lib/client/utils.js

@@ -4,53 +4,39 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useGCMTranslation = exports.getInheritCollections = exports.getDiffNode = exports.getDiffEdge = exports.getChildrenCollections = exports.formatPortData = exports.formatInheritEdgeData = exports.formatData = void 0;
-
 function _lodash() {
   const data = require("lodash");
-
   _lodash = function _lodash() {
     return data;
   };
-
   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; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const shape = {
   ER: 'er-rect',
   EDGE: 'edge'
 };
-
 const useGCMTranslation = () => {
   return (0, _reactI18next().useTranslation)('graph-collection-manager');
 };
-
 exports.useGCMTranslation = useGCMTranslation;
-
 const getInheritCollections = (collections, name) => {
   const parents = [];
-
   const getParents = name => {
     const collection = collections === null || collections === void 0 ? void 0 : collections.find(collection => collection.name === name);
-
     if (collection) {
       const inherits = collection.inherits;
-
       if (inherits) {
         for (let index = 0; index < inherits.length; index++) {
           const collectionKey = inherits[index];
@@ -59,22 +45,16 @@ const getInheritCollections = (collections, name) => {
         }
       }
     }
-
     return (0, _lodash().uniq)(parents);
   };
-
   return getParents(name);
 };
-
 exports.getInheritCollections = getInheritCollections;
-
 const getChildrenCollections = (collections, name) => {
   const childrens = [];
-
   const getChildrens = name => {
     const inheritCollections = collections.filter(v => {
       var _v$inherits;
-
       return (_v$inherits = v.inherits) === null || _v$inherits === void 0 ? void 0 : _v$inherits.includes(name);
     });
     inheritCollections.forEach(v => {
@@ -84,12 +64,9 @@ const getChildrenCollections = (collections, name) => {
     });
     return childrens;
   };
-
   return getChildrens(name);
 };
-
 exports.getChildrenCollections = getChildrenCollections;
-
 const formatData = data => {
   const edgeData = [];
   const targetTablekeys = [];
@@ -99,7 +76,6 @@ const formatData = data => {
     const inheritCollections = getInheritCollections(data, item.name);
     const inheritedFields = (0, _lodash().reduce)(inheritCollections, (result, value) => {
       var _data$find;
-
       const arr = result;
       const parentFields = (_data$find = data.find(k => k.name === value)) === null || _data$find === void 0 ? void 0 : _data$find.fields.map(v => {
         return _objectSpread(_objectSpread({}, v), {}, {
@@ -136,9 +112,7 @@ const formatData = data => {
     inheritEdges
   };
 };
-
 exports.formatData = formatData;
-
 const formatPortData = ports => {
   const portsData = (0, _lodash().groupBy)(ports, v => {
     if (v.isForeignKey || v.primaryKey || ['obo', 'oho', 'o2o', 'o2m', 'm2o', 'm2m', 'linkTo', 'id'].includes(v.interface)) {
@@ -149,9 +123,7 @@ const formatPortData = ports => {
   });
   return portsData;
 };
-
 exports.formatPortData = formatPortData;
-
 const formatInheritEdgeData = collections => {
   const commonAttrs = {
     attrs: {
@@ -160,10 +132,11 @@ const formatInheritEdgeData = collections => {
         textAnchor: 'middle',
         textVerticalAnchor: 'middle',
         stroke: '#ddd',
-        sourceMarker: null // targetMarker: null,
-
+        sourceMarker: null
+        // targetMarker: null,
       }
     },
+
     router: {
       name: 'smooth',
       args: {
@@ -210,7 +183,6 @@ const formatInheritEdgeData = collections => {
   const inheritEdges = [];
   collections.forEach(v => {
     const parentCollectonKeys = v.inherits || [];
-
     if (parentCollectonKeys.length) {
       parentCollectonKeys.forEach(k => {
         inheritEdges.push(_objectSpread({
@@ -231,12 +203,9 @@ const formatInheritEdgeData = collections => {
   });
   return inheritEdges;
 };
-
 exports.formatInheritEdgeData = formatInheritEdgeData;
-
 const formatEdgeData = (data, targetTables, tableData) => {
   const edges = [];
-
   for (let i = 0; i < data.length; i++) {
     if (targetTables.includes(data[i].target)) {
       const targetTable = tableData.find(v => v.name === data[i].target);
@@ -343,24 +312,18 @@ const formatEdgeData = (data, targetTables, tableData) => {
           }
         }]
       };
-
       const isuniq = id => {
         const targetEdge = edges.find(v => v.id === id);
-
         if (targetEdge) {
           targetEdge.associated.push(data[i].name);
           return false;
         }
-
         return true;
       };
-
       if (['m2m', 'linkTo'].includes(data[i].interface)) {
         const throughTable = tableData.find(v => v.name === data[i].through);
-
         if (throughTable) {
           var _sourceTable$ports$fi, _throughTable$ports$f, _targetTable$ports$fi, _throughTable$ports$f2;
-
           const sCellId1 = sourceTable.id;
           const tCellId1 = throughTable.id;
           const sPortId1 = (_sourceTable$ports$fi = sourceTable.ports.find(v => v.name === data[i].sourceKey)) === null || _sourceTable$ports$fi === void 0 ? void 0 : _sourceTable$ports$fi.id;
@@ -412,7 +375,6 @@ const formatEdgeData = (data, targetTables, tableData) => {
         }
       } else {
         var _targetTable$ports$fi2, _sourceTable$ports$fi2, _targetTable$ports$fi3;
-
         const isLegalEdge = tableData.find(v => v.name == (data[i].sourceCollectionName || data[i].collectionName)).ports.find(v => v.name === data[i].foreignKey);
         const sCellId1 = sourceTable.id;
         const tCellId1 = targetTable.id;
@@ -463,36 +425,28 @@ const formatEdgeData = (data, targetTables, tableData) => {
       }
     }
   }
-
   return (0, _lodash().uniqBy)(edges, 'id');
 };
-
 const getRelationship = relatioship => {
   switch (relatioship) {
     case 'm2m':
     case 'linkTo':
       return ['1', 'N'];
-
     case 'o2m':
       return ['1', 'N'];
-
     case 'm2o':
       return ['N', '1'];
-
     case 'obo':
     case 'oho':
       return ['1', '1'];
-
     default:
       return [];
   }
 };
-
 const getDiffNode = (newNodes, oldNodes) => {
   let arr = [];
   const length1 = newNodes.length;
   const length2 = oldNodes.length;
-
   for (let i = 0; i < length1; i++) {
     if (!oldNodes.find(v => v.id === newNodes[i].id)) {
       arr.push({
@@ -503,7 +457,6 @@ const getDiffNode = (newNodes, oldNodes) => {
       const oldNode = oldNodes.find(v => v.id === newNodes[i].id);
       const oldPorts = oldNode === null || oldNode === void 0 ? void 0 : oldNode.ports.items;
       const newPorts = newNodes[i].ports;
-
       if (oldNode) {
         for (let h = 0; h < newPorts.length; h++) {
           if (!oldPorts.find(v => v.id === newPorts[h].id)) {
@@ -517,7 +470,6 @@ const getDiffNode = (newNodes, oldNodes) => {
             });
           }
         }
-
         for (let k = 0; k < oldPorts.length; k++) {
           if (!newPorts.find(v => v.id === oldPorts[k].id)) {
             arr.push({
@@ -527,7 +479,6 @@ const getDiffNode = (newNodes, oldNodes) => {
             });
           }
         }
-
         if (oldNode.title !== newNodes[i].title) {
           arr.push({
             status: 'updateNode',
@@ -537,7 +488,6 @@ const getDiffNode = (newNodes, oldNodes) => {
       }
     }
   }
-
   for (let i = 0; i < length2; i++) {
     if (!newNodes.find(v => v.id === oldNodes[i].id)) {
       arr.push({
@@ -546,17 +496,13 @@ const getDiffNode = (newNodes, oldNodes) => {
       });
     }
   }
-
   return arr;
 };
-
 exports.getDiffNode = getDiffNode;
-
 const getDiffEdge = (newEdges, oldEdges) => {
   const length1 = newEdges.length;
   const length2 = oldEdges === null || oldEdges === void 0 ? void 0 : oldEdges.length;
   const edges = [];
-
   for (let i = 0; i < length1; i++) {
     if (!oldEdges.find(v => v.id === newEdges[i].id)) {
       edges.push({
@@ -565,7 +511,6 @@ const getDiffEdge = (newEdges, oldEdges) => {
       });
     }
   }
-
   for (let i = 0; i < length2; i++) {
     if (!newEdges.find(v => v.id === oldEdges[i].id)) {
       edges.push({
@@ -574,8 +519,6 @@ const getDiffEdge = (newEdges, oldEdges) => {
       });
     }
   }
-
   return edges;
 };
-
 exports.getDiffEdge = getDiffEdge;

package/lib/index.js

@@ -9,7 +9,5 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
-
 var _server = _interopRequireDefault(require("./server"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/server/collections/graphPositions.js

@@ -4,19 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 var _default = (0, _database().defineCollection)({
-  namespace: 'graph-collection-manager',
+  namespace: 'graph-collection-manager.graphCollectionPositions',
   duplicator: 'required',
   name: 'graphPositions',
   fields: [{
@@ -31,5 +27,4 @@ var _default = (0, _database().defineCollection)({
     name: 'y'
   }]
 });
-
 exports.default = _default;

package/lib/server/index.js

@@ -4,48 +4,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.GraphCollectionManagerPlugin = void 0;
-
 function _server() {
   const data = require("@nocobase/server");
-
   _server = function _server() {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function _path() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 class GraphCollectionManagerPlugin extends _server().Plugin {
   load() {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       yield _this.db.import({
         directory: _path().default.resolve(__dirname, 'collections')
       });
-
       _this.app.acl.allow('graphPositions', '*');
     })();
   }
-
 }
-
 exports.GraphCollectionManagerPlugin = GraphCollectionManagerPlugin;
 var _default = GraphCollectionManagerPlugin;
 exports.default = _default;

package/package.json

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