@riil-frontend/component-topology 6.0.19 → 6.0.21

package/es/core/editor/components/settings/propertyViews/index.js

@@ -3,8 +3,9 @@ import LayerPropertyView from "./layer/LayerPropertyView";
 import TextPropertyView from "./text/TextPropertyView";
 import GroupPropertyView from "./group/GroupPropertyView";
 import BoxPropertyView from "./box/BoxPropertyView";
+import ViewPropertyView from "./view/ViewPropertyViewV2";
 var propertyPanelMap = {
-  // view: ViewPropertyView,
+  view: ViewPropertyView,
   group: GroupPropertyView,
   node: NodePropertyView,
   // edge: EdgePropertyView,

package/es/core/editor/components/settings/propertyViews/view/ViewPropertyViewV2.js

@@ -0,0 +1,53 @@
+import _Form from "@alifd/next/es/form";
+import _Collapse from "@alifd/next/es/collapse";
+import React from 'react';
+import useBackgroundConfig from "./hooks/useBackgroundConfig";
+import BackgroundSize from "./BackgroundSize";
+var CollapsePanel = _Collapse.Panel;
+export default function ViewPropertyView(props) {
+  var topo = props.topo,
+      topoShowType = props.topoShowType,
+      editorProps = props.editorProps,
+      settingRuntimeState = props.settingRuntimeState;
+  var backgroundConfig = useBackgroundConfig({
+    topo: topo
+  });
+  var collapsePanels = [{
+    key: '背景',
+    visible: !!backgroundConfig.current,
+    createCollapsePanel: function createCollapsePanel() {
+      return /*#__PURE__*/React.createElement(CollapsePanel, {
+        key: "\u80CC\u666F",
+        title: "\u80CC\u666F"
+      }, /*#__PURE__*/React.createElement(_Form.Item, {
+        label: "\u80CC\u666F\u5C3A\u5BF8",
+        style: {
+          marginBottom: 0
+        }
+      }, /*#__PURE__*/React.createElement(BackgroundSize, {
+        topo: topo,
+        backgroundConfig: backgroundConfig,
+        settingRuntimeState: settingRuntimeState
+      })));
+    }
+  }];
+  var visibleCollapsePanels = collapsePanels.filter(function (panel) {
+    return panel.visible;
+  });
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      paddingTop: 4
+    }
+  }, /*#__PURE__*/React.createElement(_Form, {
+    labelAlign: "top"
+  }, /*#__PURE__*/React.createElement(_Form.Item, null, !!collapsePanels.length && /*#__PURE__*/React.createElement(_Collapse, {
+    defaultExpandedKeys: collapsePanels.map(function (panel) {
+      return panel.key;
+    }),
+    style: {
+      border: 'none'
+    }
+  }, visibleCollapsePanels.map(function (panel) {
+    return panel.createCollapsePanel();
+  })))));
+}

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.19" === 'string' ? "6.0.19" : null;
+var version = typeof "6.0.21" === 'string' ? "6.0.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -1,7 +1,6 @@
 import _Message from "@alifd/next/es/message";
 import _Table from "@alifd/next/es/table";
 import _extends from "@babel/runtime/helpers/extends";
-import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 
@@ -442,30 +441,33 @@ export default function ResourceOverview(props) {
         title: moment(value).format('YYYY-MM-DD HH:mm:ss')
       }, moment(value).format('YYYY-MM-DD HH:mm:ss'));
     }
-  }, {
-    title: '操作',
-    dataIndex: 'status',
-    key: 'status',
-    width: 64,
-    cell: function cell(status, index, record) {
-      if (record.type === 'alarm') {
-        return status === 'toDeal' ? /*#__PURE__*/React.createElement(_Button, {
-          text: true,
-          type: "primary",
-          onClick: function onClick() {
-            return alarmRiskOperation(record.type, record.params);
-          }
-        }, "\u53D7\u7406") : /*#__PURE__*/React.createElement(_Button, {
-          disabled: true,
-          text: true,
-          type: "primary"
-        }, "\u5DF2\u53D7\u7406");
-      } else {
-        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
-        return '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
+  } // {
+  //   title: '操作',
+  //   dataIndex: 'status',
+  //   key: 'status',
+  //   width: 64,
+  //   cell: (status, index, record) => {
+  //     if (record.type === 'alarm') {
+  //       return status === 'toDeal' ? (
+  //         <Button
+  //           text
+  //           type="primary"
+  //           onClick={() => alarmRiskOperation(record.type, record.params)}
+  //         >
+  //           受理
+  //         </Button>
+  //       ) : (
+  //         <Button disabled text type="primary">
+  //           已受理
+  //         </Button>
+  //       );
+  //     } else {
+  //       // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
+  //       return '';
+  //     }
+  //   },
+  // },
+  ]; // 告警/风险 操作 (受理)
 
   function alarmRiskOperation(_x3, _x4) {
     return _alarmRiskOperation.apply(this, arguments);

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -98,6 +98,7 @@
   }
   .alarm {
     margin-top: 12px;
+    margin-bottom: 16px;
     .alarm-title {
       overflow: hidden;
       text-overflow: ellipsis;

package/lib/core/editor/components/settings/propertyViews/index.js

@@ -15,8 +15,10 @@ var _GroupPropertyView = _interopRequireDefault(require("./group/GroupPropertyVi
 
 var _BoxPropertyView = _interopRequireDefault(require("./box/BoxPropertyView"));
 
+var _ViewPropertyViewV = _interopRequireDefault(require("./view/ViewPropertyViewV2"));
+
 var propertyPanelMap = {
-  // view: ViewPropertyView,
+  view: _ViewPropertyViewV["default"],
   group: _GroupPropertyView["default"],
   node: _NodePropertyView["default"],
   // edge: EdgePropertyView,

package/lib/core/editor/components/settings/propertyViews/view/ViewPropertyViewV2.js

@@ -0,0 +1,66 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = ViewPropertyView;
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _useBackgroundConfig = _interopRequireDefault(require("./hooks/useBackgroundConfig"));
+
+var _BackgroundSize = _interopRequireDefault(require("./BackgroundSize"));
+
+var CollapsePanel = _collapse["default"].Panel;
+
+function ViewPropertyView(props) {
+  var topo = props.topo,
+      topoShowType = props.topoShowType,
+      editorProps = props.editorProps,
+      settingRuntimeState = props.settingRuntimeState;
+  var backgroundConfig = (0, _useBackgroundConfig["default"])({
+    topo: topo
+  });
+  var collapsePanels = [{
+    key: '背景',
+    visible: !!backgroundConfig.current,
+    createCollapsePanel: function createCollapsePanel() {
+      return /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
+        key: "\u80CC\u666F",
+        title: "\u80CC\u666F"
+      }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+        label: "\u80CC\u666F\u5C3A\u5BF8",
+        style: {
+          marginBottom: 0
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_BackgroundSize["default"], {
+        topo: topo,
+        backgroundConfig: backgroundConfig,
+        settingRuntimeState: settingRuntimeState
+      })));
+    }
+  }];
+  var visibleCollapsePanels = collapsePanels.filter(function (panel) {
+    return panel.visible;
+  });
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      paddingTop: 4
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    labelAlign: "top"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, !!collapsePanels.length && /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
+    defaultExpandedKeys: collapsePanels.map(function (panel) {
+      return panel.key;
+    }),
+    style: {
+      border: 'none'
+    }
+  }, visibleCollapsePanels.map(function (panel) {
+    return panel.createCollapsePanel();
+  })))));
+}

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.19" === 'string' ? "6.0.19" : null;
+var version = typeof "6.0.21" === 'string' ? "6.0.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -13,8 +13,6 @@ var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
-
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -474,30 +472,33 @@ function ResourceOverview(props) {
         title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
       }, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
     }
-  }, {
-    title: '操作',
-    dataIndex: 'status',
-    key: 'status',
-    width: 64,
-    cell: function cell(status, index, record) {
-      if (record.type === 'alarm') {
-        return status === 'toDeal' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
-          text: true,
-          type: "primary",
-          onClick: function onClick() {
-            return alarmRiskOperation(record.type, record.params);
-          }
-        }, "\u53D7\u7406") : /*#__PURE__*/_react["default"].createElement(_button["default"], {
-          disabled: true,
-          text: true,
-          type: "primary"
-        }, "\u5DF2\u53D7\u7406");
-      } else {
-        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
-        return '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
+  } // {
+  //   title: '操作',
+  //   dataIndex: 'status',
+  //   key: 'status',
+  //   width: 64,
+  //   cell: (status, index, record) => {
+  //     if (record.type === 'alarm') {
+  //       return status === 'toDeal' ? (
+  //         <Button
+  //           text
+  //           type="primary"
+  //           onClick={() => alarmRiskOperation(record.type, record.params)}
+  //         >
+  //           受理
+  //         </Button>
+  //       ) : (
+  //         <Button disabled text type="primary">
+  //           已受理
+  //         </Button>
+  //       );
+  //     } else {
+  //       // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
+  //       return '';
+  //     }
+  //   },
+  // },
+  ]; // 告警/风险 操作 (受理)
 
   function alarmRiskOperation(_x3, _x4) {
     return _alarmRiskOperation.apply(this, arguments);

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -98,6 +98,7 @@
   }
   .alarm {
     margin-top: 12px;
+    margin-bottom: 16px;
     .alarm-title {
       overflow: hidden;
       text-overflow: ellipsis;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.19",
+  "version": "6.0.21",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.19/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.21/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }