@riil-frontend/component-topology 2.12.4 → 2.12.6-alpha.0

package/es/components/Link/index.module.scss

@@ -1,5 +1,5 @@
-@import '@riil-frontend/css/lib/index.scss';
-@import "@alifd/next/variables";
+//@import '@riil-frontend/css/lib/index.scss';
+@import "~@alifd/next/variables";
 
 .layout {
   height: 100%;

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -35,7 +35,7 @@ function ResourceSelectDrawer(props) {
               setLoading(true);
               selected = resourceSelectRef.current.getSelectedRowKeys();
               _context.next = 4;
-              return onOk(selected);
+              return onOk(selectionMode === 'single' ? selected[0] : selected);
 
             case 4:
               shouldClose = _context.sent;

package/es/components/SingleResourceDrawer/SingleResourceDrawer.js

@@ -0,0 +1,58 @@
+import _Message from "@alifd/next/lib/message";
+import React, { useRef } from 'react';
+import { isAvailableArray } from '@riil-frontend/utils';
+import Drawer from "../Drawer";
+import ResourceList from "../ResourceList";
+/**
+ * 旧版单选
+ * @param props
+ * @return {*}
+ * @constructor
+ */
+
+var SingleResourceDrawer = function SingleResourceDrawer(props) {
+  var store = props.store,
+      visible = props.visible,
+      loading = props.loading,
+      selectedKey = props.selectedKey,
+      totalSelection = props.totalSelection,
+      onSave = props.onSave,
+      onClose = props.onClose;
+  var ref = useRef();
+
+  var onDrawerSave = function onDrawerSave() {
+    var data = ref.current.getSelectedData();
+
+    if (!isAvailableArray(data)) {
+      _Message.error('请选择一项资源。');
+
+      return;
+    }
+
+    var intercept = onSave(data[0]);
+
+    if (!intercept) {
+      onClose();
+    }
+  };
+
+  var initialData = {
+    selected: [selectedKey],
+    total: totalSelection
+  };
+  return /*#__PURE__*/React.createElement(Drawer, {
+    title: "\u9009\u62E9\u8D44\u6E90",
+    visible: visible,
+    loading: loading,
+    onSave: onDrawerSave,
+    onClose: onClose,
+    buttons: ['确定', '取消']
+  }, /*#__PURE__*/React.createElement(ResourceList, {
+    ref: ref,
+    store: store,
+    initialData: initialData,
+    selectionMode: "single"
+  }));
+};
+
+export default SingleResourceDrawer;

package/es/components/SingleResourceDrawer/index.js

@@ -1,52 +1,2 @@
-import _Message from "@alifd/next/lib/message";
-import React, { useRef } from 'react';
-import { isAvailableArray } from '@riil-frontend/utils';
-import Drawer from "../Drawer";
-import ResourceList from "../ResourceList";
-
-var SingleResourceDrawer = function SingleResourceDrawer(props) {
-  var store = props.store,
-      visible = props.visible,
-      loading = props.loading,
-      selectedKey = props.selectedKey,
-      totalSelection = props.totalSelection,
-      onSave = props.onSave,
-      onClose = props.onClose;
-  var ref = useRef();
-
-  var onDrawerSave = function onDrawerSave() {
-    var data = ref.current.getSelectedData();
-
-    if (!isAvailableArray(data)) {
-      _Message.error('请选择一项资源。');
-
-      return;
-    }
-
-    var intercept = onSave(data[0]);
-
-    if (!intercept) {
-      onClose();
-    }
-  };
-
-  var initialData = {
-    selected: [selectedKey],
-    total: totalSelection
-  };
-  return /*#__PURE__*/React.createElement(Drawer, {
-    title: "\u9009\u62E9\u8D44\u6E90",
-    visible: visible,
-    loading: loading,
-    onSave: onDrawerSave,
-    onClose: onClose,
-    buttons: ['确定', '取消']
-  }, /*#__PURE__*/React.createElement(ResourceList, {
-    ref: ref,
-    store: store,
-    initialData: initialData,
-    selectionMode: "single"
-  }));
-};
-
-export default SingleResourceDrawer;
+import Drawer from "./SelectDrawer";
+export default Drawer;

package/es/core/components/TopoView/topoView.js

@@ -75,16 +75,8 @@ var TopoView = function TopoView(props) {
     onLineDelete: onLineDelete,
     topoShowType: topoShowType
   });
-  var topoLoading = topoEditApi.topoLoading,
-      showSingleResDrawer = topoEditApi.showSingleResDrawer,
-      initialSingleRes = topoEditApi.initialSingleRes,
-      showComboResDrawer = topoEditApi.showComboResDrawer,
-      initialComboRes = topoEditApi.initialComboRes,
-      resSelections = topoEditApi.resSelections,
-      onExitEdit = topoEditApi.onExitEdit,
+  var onExitEdit = topoEditApi.onExitEdit,
       onBindData = topoEditApi.onBindData,
-      onSaveSingleRes = topoEditApi.onSaveSingleRes,
-      onCloseSigleResDrawer = topoEditApi.onCloseSigleResDrawer,
       onSaveComboRes = topoEditApi.onSaveComboRes,
       onCloseComboResDrawer = topoEditApi.onCloseComboResDrawer,
       onDeleteElement = topoEditApi.onDeleteElement,
@@ -240,20 +232,12 @@ var TopoView = function TopoView(props) {
     topoEditApi: topoEditApi,
     selection: selection,
     editorProps: props.editorProps
-  })), /*#__PURE__*/React.createElement(SingleResDrawer, {
-    visible: showSingleResDrawer,
-    loading: topoLoading,
-    store: store,
-    selectedKey: initialSingleRes,
-    totalSelection: resSelections,
-    onSave: onSaveSingleRes,
-    onClose: onCloseSigleResDrawer
-  }), /*#__PURE__*/React.createElement(ComboResDrawer, {
-    visible: showComboResDrawer,
-    loading: topoLoading,
-    initialData: initialComboRes,
-    totalSelection: resSelections,
-    isLayerTopo: topoShowType === 'layers',
+  })), /*#__PURE__*/React.createElement(ComboResDrawer, {
+    visible: topoEditApi.showComboResDrawer,
+    loading: topoEditApi.topoLoading,
+    initialData: topoEditApi.initialComboRes,
+    totalSelection: topoEditApi.resSelections,
+    isLayerTopo: topoEditApi.topoShowType === 'layers',
     onSave: onSaveComboRes,
     onClose: onCloseComboResDrawer
   }), /*#__PURE__*/React.createElement(ViewerPlugin, {

package/es/core/editor/components/EditorPlugin.js

@@ -6,7 +6,8 @@ import ResourceViewAttributeSettingPlugin from "./ResourceViewAttributeSetting/R
 import LinkDrawer from "../../../components/Link";
 export default function TopoEditPlugin(props) {
   var topo = props.topo,
-      topoContext = props.topoContext;
+      topoContext = props.topoContext,
+      topoEditApi = props.topoEditApi;
   var store = topo.store;
 
   var _store$useModel = store.useModel('topoEdit'),

package/es/core/editor/components/LinkDynamicStyleSettingDrawer/rule/ColorPicker.module.scss

@@ -1,4 +1,4 @@
-@import "@alifd/theme-19926/variables";
+@import "~@alifd/theme-19926/variables.scss";
 
 .swatch {
   background: #fff;

package/es/core/editor/components/resource/SingleResourceDrawer/SelectDrawer.js

@@ -0,0 +1,54 @@
+import _Message from "@alifd/next/lib/message";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React, { useRef } from 'react';
+import ResourceSelectDrawer from "../../../../../components/ResourceSelectDrawer";
+
+var SingleSelectDrawer = function SingleSelectDrawer(props) {
+  var visible = props.visible,
+      totalSelection = props.totalSelection,
+      onSave = props.onSave,
+      onClose = props.onClose;
+
+  var onDrawerSave = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (selected.length) {
+                _context.next = 3;
+                break;
+              }
+
+              _Message.error('请选择一项资源。');
+
+              return _context.abrupt("return", false);
+
+            case 3:
+              _context.next = 5;
+              return onSave(selected[0]);
+
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function onDrawerSave(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/React.createElement(ResourceSelectDrawer, {
+    visible: visible,
+    excludeIds: totalSelection,
+    selectionMode: "single",
+    onOk: onDrawerSave,
+    onClose: onClose
+  });
+};
+
+export default SingleSelectDrawer;

package/es/core/editor/components/resource/SingleResourceDrawer/SingleResourceDrawer.js

@@ -0,0 +1,58 @@
+import _Message from "@alifd/next/lib/message";
+import React, { useRef } from 'react';
+import { isAvailableArray } from '@riil-frontend/utils';
+import Drawer from "../Drawer";
+import ResourceList from "../ResourceList";
+/**
+ * 旧版单选
+ * @param props
+ * @return {*}
+ * @constructor
+ */
+
+var SingleResourceDrawer = function SingleResourceDrawer(props) {
+  var store = props.store,
+      visible = props.visible,
+      loading = props.loading,
+      selectedKey = props.selectedKey,
+      totalSelection = props.totalSelection,
+      onSave = props.onSave,
+      onClose = props.onClose;
+  var ref = useRef();
+
+  var onDrawerSave = function onDrawerSave() {
+    var data = ref.current.getSelectedData();
+
+    if (!isAvailableArray(data)) {
+      _Message.error('请选择一项资源。');
+
+      return;
+    }
+
+    var intercept = onSave(data[0]);
+
+    if (!intercept) {
+      onClose();
+    }
+  };
+
+  var initialData = {
+    selected: [selectedKey],
+    total: totalSelection
+  };
+  return /*#__PURE__*/React.createElement(Drawer, {
+    title: "\u9009\u62E9\u8D44\u6E90",
+    visible: visible,
+    loading: loading,
+    onSave: onDrawerSave,
+    onClose: onClose,
+    buttons: ['确定', '取消']
+  }, /*#__PURE__*/React.createElement(ResourceList, {
+    ref: ref,
+    store: store,
+    initialData: initialData,
+    selectionMode: "single"
+  }));
+};
+
+export default SingleResourceDrawer;

package/es/core/editor/components/resource/SingleResourceDrawer/index.js

@@ -0,0 +1,2 @@
+import Drawer from "./SelectDrawer";
+export default Drawer;

package/es/core/editor/components/settings/common/GroupNodeList/ResourceList.js

@@ -1,5 +1,5 @@
 import _List from "@alifd/next/lib/list";
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React from 'react';
 import styles from "./ResourceList.module.scss";
 
 function ResourceList(props) {

package/es/core/editor/components/settings/common/text/FontStyleCheckbox.module.scss

@@ -1,4 +1,4 @@
-@import "@alifd/theme-19926/variables";
+@import "~@alifd/theme-19926/variables.scss";
 
 .buttonGroup {
   display: flex;

package/es/core/editor/components/settings/group/DataTab/GroupNodeList.js

@@ -5,7 +5,7 @@ import { getIconById } from "../../common/GroupNodeList/icon";
 export default function GroupNodeList(props) {
   var topo = props.topo,
       group = props.group;
-  var nodes = getGroupChildrenData(topo.getDataModel().getDataById(group.id));
+  var nodes = getGroupChildrenData(group);
   var data = nodes.map(function (node) {
     return {
       title: node.name,

package/es/core/editor/components/settings/group/DataTab/RelateData.js

@@ -6,6 +6,7 @@ var CollapsePanel = _Collapse.Panel;
 export default function GroupRelateData(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi,
+      group = props.group,
       values = props.values,
       editorProps = props.editorProps;
 
@@ -32,7 +33,7 @@ export default function GroupRelateData(props) {
       }))
     }, /*#__PURE__*/React.createElement(GroupNodeList, {
       topo: topo,
-      group: values
+      group: group
     }));
   };
 

package/es/core/editor/components/settings/node/NodePropertyView.js

@@ -10,7 +10,7 @@ import NodeSizeInput from "../common/NodeSizeInput/NodeSizeInput";
 import textStyles from "../../../../common/text.module.scss";
 import TopoTreeSelect from "./TopoTreeSelect";
 import NodeIconSelect from "./NodeIconSelect";
-import NodeRelateResourceButton from "./NodeRelateResourceButton";
+import NodeRelateResourceButton from "./data/NodeRelateResourceButton";
 import styles from "./NodePropertyView.module.scss";
 import TabView from "../common/tab/TabView";
 var Option = _Select.Option;

package/es/core/editor/components/settings/node/data/BindResourceDrawer.js

@@ -0,0 +1,65 @@
+import _Message from "@alifd/next/lib/message";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React, { useRef } from 'react';
+import ResourceSelectDrawer from "../../../../../../components/ResourceSelectDrawer";
+/**
+ * 关联、重新关联资源
+ * @param props
+ * @return {*}
+ * @constructor
+ */
+
+var BindResourceDrawer = function BindResourceDrawer(props) {
+  var visible = props.visible,
+      topoEditApi = props.topoEditApi,
+      node = props.node,
+      currentResId = props.currentResId,
+      onClose = props.onClose;
+
+  var handleSave = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (selected) {
+                _context.next = 3;
+                break;
+              }
+
+              _Message.error('请选择一项资源。');
+
+              return _context.abrupt("return", false);
+
+            case 3:
+              _context.next = 5;
+              return topoEditApi.bindNodeResource({
+                id: node.id,
+                newResId: selected,
+                oldResId: currentResId
+              });
+
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleSave(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/React.createElement(ResourceSelectDrawer, {
+    visible: visible,
+    excludeIds: topoEditApi.resSelections,
+    selectionMode: "single",
+    onOk: handleSave,
+    onClose: onClose
+  });
+};
+
+export default BindResourceDrawer;

package/es/core/editor/components/settings/node/data/NodeRelateResourceButton.js

@@ -0,0 +1,41 @@
+import _Button from "@alifd/next/lib/button";
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useState } from 'react';
+import BindResourceDrawer from "./BindResourceDrawer";
+/**
+ * @return {React.ReactNode | null}
+ */
+
+export default function NodeRelateResourceButton(props) {
+  var _node$attrObject$data;
+
+  var topo = props.topo,
+      topoEditApi = props.topoEditApi,
+      node = props.node;
+  var hide = ((_node$attrObject$data = node.attrObject.data) === null || _node$attrObject$data === void 0 ? void 0 : _node$attrObject$data.relateResource) === false;
+  var currentResId = node.tag;
+
+  var _useState = useState(false),
+      visible = _useState[0],
+      setVisible = _useState[1];
+
+  return !hide ? /*#__PURE__*/React.createElement(_Button, {
+    type: "primary",
+    text: true,
+    onClick: function onClick() {
+      topoEditApi.openBindNodeResourceDrawer({
+        id: currentResId
+      });
+      setVisible(true);
+    }
+  }, "\u9009\u62E9\u8D44\u6E90", /*#__PURE__*/React.createElement(BindResourceDrawer, _extends({
+    visible: visible,
+    currentResId: currentResId
+  }, props, {
+    onClose: function onClose() {
+      setVisible(false);
+      setVisible(true);
+    }
+  }))) : null;
+}
+;

package/es/hooks/useSelection.js

@@ -44,8 +44,8 @@ export default function (props) {
     var selectionModel = topoApp.getSelectionModel();
     var selectionArr = selectionModel.getSelection().getArray().map(function (item) {
       return getElementData(item);
-    }); // console.info('updateSelection', selectionArr);
-
+    });
+    console.info('updateSelection', selectionArr);
     setSelection(selectionArr);
   }, []);
   var initSelection = useCallback(function () {
@@ -53,7 +53,7 @@ export default function (props) {
     var selectionModel = topoApp.getSelectionModel();
     updateSelection();
     selectionModel.addSelectionChangeListener(function (e) {
-      // console.info('selectionChangeListener', e);
+      console.info('selectionChangeListener', e);
       updateSelection();
     });
     dataModel.addDataPropertyChangeListener(function (e) {
@@ -64,6 +64,7 @@ export default function (props) {
         return;
       }
 
+      console.info('PropertyChangeListener', e);
       var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
         return item.getId();
       });