@riil-frontend/component-topology 10.0.46 → 10.0.48

package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
+
 var _htElementUtils = require("../../../../../utils/htElementUtils");
 
 var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
@@ -86,8 +88,8 @@ function FontStyleButton(props) {
     setDisabled(getDisabled(fieldDisabled));
   }, [fieldDisabled]);
   /**
-   * 
-   * @param {Array} selectedKeys 
+   *
+   * @param {Array} selectedKeys
    */
 
   var handleSelect = function handleSelect(selectedKeys, item, extra) {
@@ -131,7 +133,7 @@ function FontStyleButton(props) {
         alt: ""
       }), /*#__PURE__*/_react["default"].createElement("span", {
         style: fieldDisabled[item.key] ? {} : {
-          color: '#4d6277'
+          color: _variables["default"]['$color-text1-4']
         }
       }, item.label)),
       align: "r",

package/lib/core/editor/components/Toolbar/widgets/Layout/components/LayoutSettings.module.scss

@@ -12,7 +12,8 @@
   :global {
     .checked {
       // border: 2px solid $color-brand1-5 !important;
-      color: #4D6277 !important;
+      // color: #4D6277 !important;
+      color: $color-text1-4 !important;
       border-color: #fff !important;
       background:#F2F7FD !important;
     }

package/lib/core/editor/components/Toolbar/widgets/WidgetBox.module.scss

@@ -1,3 +1,4 @@
+@import '~@alifd/next/variables.scss';
 .container {
   margin: 0 6px;
   display: flex;
@@ -39,8 +40,8 @@
   margin-top: 4px;
   font-size: 10px;
   font-family: Helvetica;
-  color: #78849C;
-  line-height: 12px;
+  color:$color-text1-6;
+  line-height: 14px;
   text-align: center;
 }
 
@@ -49,7 +50,7 @@
 }
 
 .normalLabel {
-  color: #78849C;
+  color: $color-text1-6;
 }
 
 .ButtonBox {
@@ -71,4 +72,4 @@
     cursor: not-allowed;
   }
 
-}
+}

package/lib/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -21,6 +21,8 @@ var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
+
 var _textModule = _interopRequireDefault(require("../../../../../../common/text.module.scss"));
 
 var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateResourceButton"));
@@ -40,10 +42,10 @@ var CollapsePanel = _collapse["default"].Panel;
 
 function parseValues(values) {
   return (0, _extends2["default"])({}, values, {
-    "attrObject.customName": values["attrObject.customName"] || values["attrObject.name"],
-    "attrObject.bindTopo": values["attrObject.bindTopo"] || "",
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '',
     // 解决切换节点时关联拓扑选项未重置
-    "attrObject.bindIp": values["attrObject.bindIp"] || ""
+    'attrObject.bindIp': values['attrObject.bindIp'] || ''
   });
 }
 
@@ -52,11 +54,11 @@ function getBindType(values) {
     return values.attrObject.bindType;
   }
 
-  if (values.tag && !values.tag.startsWith("ip:")) {
-    return "resource";
+  if (values.tag && !values.tag.startsWith('ip:')) {
+    return 'resource';
   }
 
-  return "none";
+  return 'none';
 }
 
 function Data(props) {
@@ -90,11 +92,11 @@ function Data(props) {
   var setBindType = function setBindType(newBindType) {
     topo.historyManager.beginTransaction();
 
-    _onChange("attrObject.bindType", newBindType);
+    _onChange('attrObject.bindType', newBindType);
 
     topo.historyManager.endTransaction();
 
-    if (newBindType === "topo") {//
+    if (newBindType === 'topo') {//
     }
   };
 
@@ -106,8 +108,8 @@ function Data(props) {
             case 0:
               topo.historyManager.beginTransaction(); // 设置名称为拓扑名称，清空自定义名称
 
-              node.a("name", data.label);
-              node.a("customName", null);
+              node.a('name', data.label);
+              node.a('customName', null);
               _context.next = 5;
               return topoEditApi.deleteExLink(node);
 
@@ -129,9 +131,9 @@ function Data(props) {
 
   var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
   return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
-    defaultExpandedKeys: ["相关资源"],
+    defaultExpandedKeys: ['相关资源'],
     style: {
-      border: "none"
+      border: 'none'
     }
   }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
     key: "\u76F8\u5173\u8D44\u6E90",
@@ -139,13 +141,13 @@ function Data(props) {
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
     labelAlign: "top"
-  }, (!values.tag || bindType === "ip") && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }, (!values.tag || bindType === 'ip') && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u7C7B\u578B"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "bindType",
     value: bindType,
     style: {
-      width: "100%",
+      width: '100%',
       marginRight: 8
     },
     onChange: setBindType
@@ -157,28 +159,29 @@ function Data(props) {
     value: "ip"
   }, "\u5173\u8054IP"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
     value: "topo"
-  }, "\u5173\u8054\u62D3\u6251"))), bindType === "resource" && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u8D44\u6E90"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      display: "flex"
+      display: 'flex'
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _textModule["default"].textEllipsis,
     style: {
       flex: 1,
       paddingRight: 16,
-      color: "#4D6277",
-      lineHeight: "20px"
+      color: _variables["default"]['$color-text1-4'],
+      // color: '#4D6277',
+      lineHeight: '20px'
     },
     title: values.tag ? values.name : null
-  }, values.tag ? values.name : "—"), /*#__PURE__*/_react["default"].createElement(_NodeRelateResourceButton["default"], {
+  }, values.tag ? values.name : '—'), /*#__PURE__*/_react["default"].createElement(_NodeRelateResourceButton["default"], {
     nodeElement: node,
     node: values,
     topo: topo,
     topoEditApi: topoEditApi,
     nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
-  }))), bindType === "ip" &&
+  }))), bindType === 'ip' &&
   /*#__PURE__*/
   // <Form.Item
   //   label="关联IP"
@@ -200,13 +203,13 @@ function Data(props) {
     onChange: _onChange,
     maxLength: 128
   }) // </Form.Item>
-  , bindType === "topo" && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  , bindType === 'topo' && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === "cmpTopo" && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u6240\u5C5E\u5E73\u53F0"
   }, /*#__PURE__*/_react["default"].createElement(_PlatformDisplay["default"], props)))));
 }

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "10.0.46" === 'string' ? "10.0.46" : null;
+var version = typeof "10.0.48" === 'string' ? "10.0.48" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -12,8 +12,8 @@
       flex: 1;
       height: 20px;
       font-size: 14px;
-      font-weight: 600;
-      color: #4d6277;
+      font-weight: 700;
+      color: $color-text1-8;
       :global {
         .#{$css-prefix}divider-ver {
           height: 1em;

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

@@ -21,13 +21,14 @@
     line-height: 22px;
     .label {
       white-space: nowrap;
+      color:$color-text1-6;
     }
     .content {
       flex: 1;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
-      color: #4d6277;
+      color: $color-text1-4;
       .link {
         width: 100%;
         display: block;

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

@@ -30,7 +30,7 @@
   .drawer-title{
     font-size: 16px;
     font-weight: 500;
-    color: #4D6277;
+    color: $color-text1-8;
   }
   :global {
     .#{$css-prefix}drawer-body {

package/lib/style.js

@@ -31,6 +31,7 @@ require('@riil-frontend/component-common-res-list/lib/style');
 require('@alifd/next/lib/balloon/style');
 require('@alifd/next/lib/menu/style');
 require('@alifd/next/lib/dropdown/style');
+
 require('@alifd/next/lib/range/style');
 require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/tag/style');

package/package.json

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