@riil-frontend/component-topology 2.3.21 → 2.4.0

package/lib/core/editor/{buildContextmenu.d.ts → contextmenu/buildContextmenu.d.ts}

@@ -1,9 +1,6 @@
 export default function buildContextmenu(topoApp: any): {
     node: {
         enable: boolean;
-        items: {
-            label: string;
-            id: string;
-        }[];
+        items: any[];
     };
 };

package/lib/core/editor/{buildContextmenu.js → contextmenu/buildContextmenu.js}

@@ -7,13 +7,9 @@ function buildContextmenu(topoApp) {
   return {
     node: {
       enable: true,
-      items: [{
-        label: '打开属性设置',
-        id: 'openSet'
-      }, {
-        label: '打开全局属性设置',
-        id: 'openAllSet'
-      }]
+      items: [// { label: '打开属性设置', id: 'openSet' },
+        // { label: '打开全局属性设置', id: 'openAllSet' },
+      ]
     }
   };
 }

package/lib/hooks/useSelection.js

@@ -18,7 +18,9 @@ function getElementData(element) {
     // 业务id
     name: element.getName(),
     attrObject: element.getAttrObject(),
-    styleMap: element.getStyleMap()
+    attr: element.getAttrObject(),
+    styleMap: element.getStyleMap(),
+    style: element.getStyleMap()
   };
 
   if (className === 'ht.Edge') {
@@ -59,18 +61,22 @@ function _default(props) {
     var selectionModel = topoApp.getSelectionModel();
     updateSelection();
     selectionModel.addSelectionChangeListener(function (e) {
-      // console.info('SelectionChange');
+      // console.info('selectionChangeListener', e);
       updateSelection();
     });
     dataModel.addDataPropertyChangeListener(function (e) {
       var property = e.property,
           data = e.data;
+
+      if (['position'].indexOf(property) !== -1) {
+        return;
+      }
+
       var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
         return item.getId();
       });
 
       if (selectionIds.indexOf(data.getId()) > -1) {
-        // console.info('DataPropertyChange');
         updateSelection();
       }
     });

package/lib/plugins/useSelectionPlugin.d.ts

@@ -0,0 +1,23 @@
+export default useTableSelectionPlugin;
+/**
+ * Modified version of @ahooksjs/use-selection-plugin.
+ * Selected keys can be persistent across page changes, if not be reset.
+ */
+declare function useTableSelectionPlugin(options?: {}): {
+    middlewares: (ctx: any, next: any) => any;
+    props: () => {
+        tableProps: {
+            rowSelection: {
+                onChange: (selectedRowKeys: any, records: any) => void;
+                selectedRowKeys: any;
+                mode: any;
+                getProps: (record: any) => {
+                    disabled: any;
+                };
+            };
+            primaryKey: any;
+        };
+        getSelectedRowKeys: () => any;
+        setSelectedRowKeys: (selectedRowKeys: any) => void;
+    };
+};

package/lib/plugins/useSelectionPlugin.js

@@ -0,0 +1,90 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = require("react");
+
+/**
+ * Modified version of @ahooksjs/use-selection-plugin.
+ * Selected keys can be persistent across page changes, if not be reset.
+ */
+var useTableSelectionPlugin = function useTableSelectionPlugin(options) {
+  if (options === void 0) {
+    options = {};
+  }
+
+  var _useState = (0, _react.useState)({
+    selectedRowKeys: options.defaultSelectedRowKeys || []
+  }),
+      state = _useState[0],
+      setSelectedRowKeys = _useState[1];
+
+  var _options = options,
+      _options$primaryKey = _options.primaryKey,
+      primaryKey = _options$primaryKey === void 0 ? 'id' : _options$primaryKey,
+      _options$mode = _options.mode,
+      mode = _options$mode === void 0 ? 'multiple' : _options$mode,
+      _options$checkIsNeedR = _options.checkIsNeedReset,
+      checkIsNeedReset = _options$checkIsNeedR === void 0 ? function () {
+    return true;
+  } : _options$checkIsNeedR,
+      checkIsDisabled = _options.checkIsDisabled;
+
+  var onChange = function onChange(selectedRowKeys, records) {
+    setSelectedRowKeys({
+      selectedRowKeys: selectedRowKeys
+    });
+  };
+
+  var getSelectedRowKeys = function getSelectedRowKeys() {
+    return state.selectedRowKeys;
+  };
+
+  var $setSelectedRowKeys = function $setSelectedRowKeys(selectedRowKeys) {
+    setSelectedRowKeys({
+      selectedRowKeys: selectedRowKeys
+    });
+  };
+
+  return {
+    middlewares: function middlewares(ctx, next) {
+      var isNeedReset = checkIsNeedReset(ctx);
+
+      if (isNeedReset) {
+        return next().then(function () {
+          setSelectedRowKeys({
+            selectedRowKeys: []
+          });
+        });
+      }
+
+      return next();
+    },
+    props: function props() {
+      var getProps = checkIsDisabled ? function (record) {
+        return {
+          disabled: checkIsDisabled(record)
+        };
+      } : undefined;
+      return {
+        tableProps: {
+          rowSelection: {
+            // onSelect,
+            // onSelectAll,
+            onChange: onChange,
+            selectedRowKeys: state.selectedRowKeys,
+            mode: mode,
+            getProps: getProps
+          },
+          primaryKey: primaryKey
+        },
+        getSelectedRowKeys: getSelectedRowKeys,
+        setSelectedRowKeys: $setSelectedRowKeys
+      };
+    }
+  };
+};
+
+var _default = useTableSelectionPlugin;
+exports["default"] = _default;

package/lib/style.js

@@ -25,6 +25,7 @@ require('@alifd/next/lib/tab/style');
 require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/collapse/style');
 require('@alifd/next/lib/list/style');
+require('@alifd/next/lib/tree-select/style');
 require('@alifd/next/lib/avatar/style');
 
 require('./index.scss');

package/lib/utils/topoData.js

@@ -22,7 +22,7 @@ var _topoPermissionUtil = _interopRequireDefault(require("./topoPermissionUtil")
 
 var _buildContextmenu = _interopRequireDefault(require("../core/viewer/contextmenu/buildContextmenu"));
 
-var _buildContextmenu2 = _interopRequireDefault(require("../core/editor/buildContextmenu"));
+var _buildContextmenu2 = _interopRequireDefault(require("../core/editor/contextmenu/buildContextmenu"));
 
 var _topoIconUtil = require("./topoIconUtil");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.3.21",
+  "version": "2.4.0",
   "description": "拓扑",
   "files": [
     "demo/",
@@ -55,8 +55,8 @@
     "@riil-frontend/component-row-delete-ballon": "^1.0.2",
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.1",
-    "@riil-frontend/component-topology-graph": "^2.1.11",
-    "@riil-frontend/component-topology-utils": "^2.0.12",
+    "@riil-frontend/component-topology-graph": "^2.1.12",
+    "@riil-frontend/component-topology-utils": "^2.0.13",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -72,7 +72,7 @@
   },
   "devDependencies": {
     "@alifd/next": "^1.21.16",
-    "@alifd/theme-19926": "^0.16.3",
+    "@alifd/theme-19926": "^0.17.0",
     "@iceworks/spec": "^1.0.0",
     "axios": "^0.21.1",
     "build-plugin-component": "^1.0.0",
@@ -99,6 +99,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.3.21/build/index.html",
-  "gitHead": "acd84d669c432aec95797d5873045b308a3e64d3"
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.4.0/build/index.html",
+  "gitHead": "4c30a81dfb48bf8ebfd910e644605ce85604fcb7"
 }

package/es/core/editor/buildContextmenu.js

@@ -1,14 +0,0 @@
-export default function buildContextmenu(topoApp) {
-  return {
-    node: {
-      enable: true,
-      items: [{
-        label: '打开属性设置',
-        id: 'openSet'
-      }, {
-        label: '打开全局属性设置',
-        id: 'openAllSet'
-      }]
-    }
-  };
-}