@riil-frontend/component-topology 11.0.27 → 11.0.28

package/es/core/editor/components/BottomFloatTool/HelpIcon.module.scss

@@ -1,3 +1,5 @@
+@import '@alifd/next/variables.scss';
+
 .topoHelpIconBtn{
     width: '100%';
     height: '100%';
@@ -16,25 +18,25 @@
 }
 
 :global{
-    .white.next-overlay-inner{
+    .white.#{$css-prefix}overlay-inner{
         padding: 10px;
-        .next-balloon-close{
+        .#{$css-prefix}balloon-close{
             right: 10px;
             top:8px
         }
     }
-    .dark.next-overlay-inner{
+    .dark.#{$css-prefix}overlay-inner{
         padding: 10px;
         background-color: #063658;
         border-color: #08A5F4;
-        .next-balloon-close{
+        .#{$css-prefix}balloon-close{
             right: 10px;
             /* color:$color-text1-5; */
             color:#fff;
             top:8px
         }
     }
-    .dark.next-overlay-inner:after{
+    .dark.#{$css-prefix}overlay-inner:after{
         border-color: #08A5F4;
         background: #063658;
     }
@@ -61,10 +63,10 @@
             line-height: 20px;
             margin-top: 8px;
             :global{
-                .next-row{
+                .#{$css-prefix}row{
                     margin: 4px 0;
                 }
-                .next-col-8{
+                .#{$css-prefix}col-8{
                     text-align: right;
                     color:$color-text1-4;
                 }
@@ -78,7 +80,7 @@
         .conten{
             color:$color-text1-5;
             :global{
-                .next-col-8{
+                .#{$css-prefix}col-8{
                     color:$color-text1-5;
                 }
             }

package/es/core/editor/components/Sidebar/views/BackgroundPanel/BackgroundPanel.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import BackgroundView from "../../../BackgroundView";
 export default function BackgroundPanel(props) {
-  var topo = props.topo,
-    editorProps = props.editorProps;
+  var topo = props.topo;
   return /*#__PURE__*/React.createElement(BackgroundView, {
     topo: topo
   });

package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundButton.js

@@ -1,5 +1,3 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["topo", "showLabel"];
 import React, { useEffect, useState, useMemo } from 'react';
 import DropdownButton from "../components/DropdownButton";
 import WidgetBox from "../WidgetBox";
@@ -12,8 +10,7 @@ import { getHtSelection, getGroupsStyle, setGroupsStyle } from "./BoxBackgroundU
  */
 function BoxBackgroundButton(props) {
   var topo = props.topo,
-    showLabel = props.showLabel,
-    otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+    showLabel = props.showLabel;
   var _useState = useState(true),
     disabled = _useState[0],
     setDisabled = _useState[1];

package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js

@@ -1,6 +1,4 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["topo", "showLabel"];
 import React, { useEffect, useState } from 'react';
 import { getEdgesBySelection } from "../../../../utils/edgeTypeStyleUtil";
 import DropdownButton from "../components/DropdownButton";
@@ -14,8 +12,7 @@ import Content from "./Content";
  */
 function EdgeColorButton(props) {
   var topo = props.topo,
-    showLabel = props.showLabel,
-    otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+    showLabel = props.showLabel;
   var _useState = useState(true),
     disabled = _useState[0],
     setDisabled = _useState[1];

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -80,7 +80,6 @@ function getValuesByEdges(topo) {
     edges.forEach(function (edge) {
       edgeValues.push({
         baseAgreement: false,
-        //,
         lineButton: edge.a('edge.type.name') || edge.s('edge.type'),
         startPoint: getStartPoint(edge),
         endPoint: getEndPoint(edge),

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -1,7 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["topo", "showLabel", "editorProps"];
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { getEdgesBySelection, setEdgesAndChildren, setEdgesType } from "../../../../utils/edgeTypeStyleUtil";
 import DropdownButton from "../components/DropdownButton";
 import WidgetBox from "../WidgetBox";
@@ -16,8 +14,7 @@ import EdgeType from "./EdgeType";
 function EdgeTypeButton(props) {
   var topo = props.topo,
     showLabel = props.showLabel,
-    editorProps = props.editorProps,
-    otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+    editorProps = props.editorProps;
   var _useState = useState(true),
     disabled = _useState[0],
     setDisabled = _useState[1];

package/es/core/editor/components/Toolbar/widgets/NodeAlignWidget.js

@@ -1,7 +1,5 @@
 import _Balloon from "@alifd/next/es/balloon";
 import _NumberPicker from "@alifd/next/es/number-picker";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["topo", "showLabel"];
 import React, { useState, useEffect } from 'react';
 import WidgetBox from "./WidgetBox";
 import DropdownButton from "./components/DropdownButton";
@@ -10,8 +8,7 @@ import { isEdge, isLayer } from "../../../../../utils/htElementUtils";
 import styles from "./NodeAlignWidget.module.scss";
 function NodeAlignWidget(props) {
   var topo = props.topo,
-    showLabel = props.showLabel,
-    otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+    showLabel = props.showLabel;
   var _useState = useState(true),
     disabled = _useState[0],
     setDisabled = _useState[1];

package/es/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js

@@ -1,5 +1,3 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["topo", "showLabel"];
 import React, { useEffect, useState } from "react";
 import { isGroup, isNode, isText } from "../../../../../../utils/htElementUtils";
 import DropdownButton from "../components/DropdownButton";
@@ -19,8 +17,7 @@ function isElementSetImageEnabled(element) {
  */
 function NodeImageButton(props) {
   var topo = props.topo,
-    showLabel = props.showLabel,
-    otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+    showLabel = props.showLabel;
   var _useState = useState(true),
     disabled = _useState[0],
     setDisabled = _useState[1];

package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js

@@ -1,5 +1,3 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["topo", "showLabel"];
 import React, { useEffect, useState } from 'react';
 // import BatchSetNodeSize from "../../../settings/propertyViews/view/BatchSetNodeSize";
 import BatchSetNodeSize from "../../../settings/propertyViews/multipleElements/BatchSetNodeSize/BatchSetNodeSize";
@@ -16,8 +14,7 @@ import { isGroup, isNode } from "../../../../../../utils/htElementUtils";
  */
 function NodeSizeButton(props) {
   var topo = props.topo,
-    showLabel = props.showLabel,
-    otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+    showLabel = props.showLabel;
   var _useState = useState(true),
     disabled = _useState[0],
     setDisabled = _useState[1];

package/es/core/models/TopoApp.js

@@ -25,7 +25,7 @@ import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache";
 
 // eslint-disable-next-line no-undef
-var version = typeof "11.0.27" === 'string' ? "11.0.27" : null;
+var version = typeof "11.0.28" === 'string' ? "11.0.28" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 
 /**

package/es/core/models/topoData.js

@@ -36,11 +36,11 @@ export function saveTopo(_x) {
 }
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
+          topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
           rlog.debug("saveTopo", data);
 
           // 保存布局

package/es/core/store/models/topoConfig.js

@@ -6,7 +6,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
  */
 import { getUUID, isAvailableArray } from "@riil-frontend/utils";
 import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
-import topoService, { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
+import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { removeFromArray } from "../../../utils/format";
 import { DEFAULT_GROUP } from "../../../utils/template";
@@ -220,17 +220,16 @@ export default function (topoApp) {
         fetchDataByConfig: function fetchDataByConfig(params, rootState) {
           var _this2 = this;
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, _editState$ipNodes, ipNodes, query, data;
+            var editState, resources, _editState$groups, groups, _editState$ipNodes, ipNodes, query, data;
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   editState = rootState.topoConfig;
-                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes; // console.log("editState", editState);
+                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
                   query = {
                     id: rootState.topoMod.topoId,
                     resources: resources,
                     groups: groups,
-                    // exportLinkIdList,
                     ipNodes: ipNodes
                   };
                   _context2.next = 5;

package/es/utils/topoData.js

@@ -339,148 +339,6 @@ export function getLinksBetweenTwoNodes(links, id1, id2) {
   });
 }
 
-// 批量更新指标状态
-export var updateAllCiDoc = function updateAllCiDoc(dataType, doc, ciDoc, allCiSet) {
-  rlog.debug("updateAllCiDoc", dataType, doc, ciDoc);
-  var cidoc = _.cloneDeep(ciDoc);
-  var allciset = _.cloneDeep(allCiSet);
-  var ciArr = Object.keys(cidoc);
-  ciArr.map(function (key) {
-    rlog.debug("Object.keys", allciset, cidoc, key);
-    var arr = [];
-    var list = cidoc[key].list.map(function (d) {
-      var ciType = cidoc[key].code;
-
-      // rlog.debug('Object.keys---list-item', cidoc[key], ciType, d);
-      var item = findItem(doc[ciType], "code", d.code);
-      // rlog.debug('Object.keys---list-findItem', doc[ciType], item);
-      var r = _extends({}, d);
-      var name = cidoc[key].name;
-      // rlog.debug('Object.keys---r', r);
-      if (item) {
-        r[dataType] = true;
-        var num = 0;
-        var nameArr = [];
-        ciArr.map(function (ci) {
-          var ciItem = cidoc[ci];
-          if (ciItem.code === ciType) {
-            num += 1;
-            nameArr.push(ciItem.name);
-          }
-          return "";
-        });
-        rlog.debug("Object.keys---nameArr", num, nameArr);
-        if (dataType === "tip") {
-          r.ciTipNum = num;
-          r.ciTipArr = nameArr;
-        } else if (dataType === "tag") {
-          r.ciTagNum = num;
-          r.ciTagArr = nameArr;
-        }
-        arr.push(item);
-      } else {
-        r[dataType] = false;
-        if (dataType === "tip") {
-          r.ciTipNum = 0;
-          r.ciTipArr = [];
-        } else if (dataType === "tag") {
-          r.ciTagNum = 0;
-          r.ciTagArr = [];
-        }
-      }
-      return r;
-    });
-    var uniqArr = _.uniqWith(arr, _.isEqual);
-    rlog.debug("Object.keys---list-result-arr,list", arr, uniqArr, list);
-    allciset[cidoc[key].code].list = list;
-    cidoc[key][dataType] = uniqArr;
-    cidoc[key].list = list;
-    return "";
-  });
-  rlog.debug("updateAllCiDoc-result", cidoc);
-  return {
-    cidoc: cidoc,
-    allciset: allciset
-  };
-};
-// 更新指标状态
-export var updateCiDoc = function updateCiDoc(dataType, doc, ciDoc, allCiSet) {
-  rlog.debug("updateCiDoc", dataType, doc, ciDoc, allCiSet);
-  var dt = {
-    attribute: "attributes",
-    metric: "metrics"
-  };
-  var cidoc = _.cloneDeep(ciDoc);
-  var allciset = _.cloneDeep(allCiSet);
-  Object.keys(doc).map(function (key) {
-    var arr = doc[key].map(function (item) {
-      return item;
-    });
-    var list = cidoc[key].list.map(function (d) {
-      var r = _extends({}, d);
-      var ciname = cidoc[key].name;
-      if (findItemIndex(arr, "code", d.code) < 0) {
-        r[dataType] = false;
-        if (dataType === "tip") {
-          r.ciTipNum = r.ciTipNum > 1 ? r.ciTipNum - 1 : 0;
-          r.ciTipArr = r.ciTipArr.length > 1 ? r.ciTipArr.splice(r.ciTipArr.indexOf(ciname), 1) : [];
-        } else if (dataType === "tag") {
-          r.ciTagNum = r.ciTagNum > 1 ? r.ciTagNum - 1 : 0;
-          r.ciTagArr = r.ciTagArr.length > 1 ? r.ciTagArr.splice(r.ciTagArr.indexOf(ciname), 1) : [];
-        }
-      } else {
-        r[dataType] = true;
-        if (dataType === "tip") {
-          if (r.ciTipArr.indexOf(ciname) < 0) {
-            r.ciTipNum += 1;
-            r.ciTipArr.push(ciname);
-          }
-        } else if (dataType === "tag") {
-          if (r.ciTagArr.indexOf(ciname) < 0) {
-            r.ciTagNum += 1;
-            r.ciTagArr.push(ciname);
-          }
-        }
-      }
-      return r;
-    });
-    var list2 = cidoc[key].list.map(function (d) {
-      var r = _extends({}, d);
-      var ciname = cidoc[key].name;
-      if (findItemIndex(arr, "code", d.code) < 0) {
-        if (dataType === "tip") {
-          r.ciTipNum = r.ciTipNum > 1 ? r.ciTipNum - 1 : 0;
-          r.ciTipArr = r.ciTipArr.length > 1 ? r.ciTipArr.splice(r.ciTipArr.indexOf(ciname), 1) : [];
-        } else if (dataType === "tag") {
-          r.ciTagNum = r.ciTagNum > 1 ? r.ciTagNum - 1 : 0;
-          r.ciTagArr = r.ciTagArr.length > 1 ? r.ciTagArr.splice(r.ciTagArr.indexOf(ciname), 1) : [];
-        }
-      } else if (dataType === "tip") {
-        if (r.ciTipArr.indexOf(ciname) < 0) {
-          r.ciTipNum += 1;
-          r.ciTipArr.push(ciname);
-        }
-      } else if (dataType === "tag") {
-        if (r.ciTagArr.indexOf(ciname) < 0) {
-          r.ciTagNum += 1;
-          r.ciTagArr.push(ciname);
-        }
-      }
-      return r;
-    });
-    rlog.debug("updateCiDoc-result-----list", list, list2);
-    allciset[cidoc[key].code].list = list2;
-    cidoc[key][dataType] = arr;
-    cidoc[key].list = list;
-    return "";
-  });
-  // rlog.debug('updateCiDoc-result', cidoc);
-  return {
-    cidoc: cidoc,
-    allciset: allciset
-  };
-};
-
 /**
  * 将从topo组件返回的数据（global）转化为后端接收的数据
  * 具体格式内容参考

package/lib/components/BatchAttrMetric/index.js

@@ -12,41 +12,32 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 var _setting = _interopRequireDefault(require("./setting"));
 var _constant = require("./constant");
-var _excluded = ["saveCb"],
+var _excluded = ["saveCb", "showType"],
   _excluded2 = ["drawerTitle", "drawerWidth"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * 属性指标配置抽屉
  */
-var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var _saveCb = _ref.saveCb,
-    props = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
+var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _saveCb = props.saveCb,
+    showType = props.showType,
+    settingProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var _useBoolean = (0, _ahooks.useBoolean)(false),
     visible = _useBoolean[0],
     _useBoolean$ = _useBoolean[1],
     setTrue = _useBoolean$.setTrue,
     setFalse = _useBoolean$.setFalse;
-  // 选择类型，single/batch
   var selectType = 'batch';
-  // 数据类型，tip/tag
-  var _useState = (0, _react.useState)(),
-    showType = _useState[0],
-    setShowType = _useState[1];
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       /**
        * 展开抽屉
-       * @param {*} entryConfig 入口配置对象，必须
-       * @param {*} entryConfig.selectType 选择类型(single/batch)，必须
-       * @param {*} entryConfig.dataType 数据类型(tip/tag)，必须
        */
       show: function show(entryConfig) {
         if (entryConfig === void 0) {
           entryConfig = {};
         }
-        // setSelectType(entryConfig.selectType);
-        setShowType(entryConfig.showType);
         setTrue();
       }
     };
@@ -62,19 +53,18 @@ var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
     title: drawerTitle,
     className: _indexModule["default"].drawer,
     width: drawerWidth
-  }, visible && /*#__PURE__*/_react["default"].createElement(_setting["default"], (0, _extends2["default"])({}, pageConfig, props, {
-    showType: showType,
+  }, visible && /*#__PURE__*/_react["default"].createElement(_setting["default"], (0, _extends2["default"])({}, pageConfig, settingProps, {
     cancelCb: setFalse,
     saveCb: function saveCb(values) {
       setFalse();
-      _saveCb(showType, values, selectType);
+      _saveCb(showType, values);
     }
   })));
 });
-BatchAttrMetricDrawer.displayName = 'BatchAttrMetricDrawer';
+BatchAttrMetricDrawer.displayName = 'BatchAttrMetricDrawerV2';
 BatchAttrMetricDrawer.propTypes = {
   // 数据项
-  allCiSet: _propTypes["default"].any.isRequired,
+  dataSource: _propTypes["default"].array.isRequired,
   // 保存回调
   saveCb: _propTypes["default"].func
 };

package/lib/components/BatchAttrMetric/setting.js

@@ -18,24 +18,33 @@ var _componentTableLayout = _interopRequireDefault(require("@riil-frontend/compo
 var _hooks = _interopRequireDefault(require("@riil-frontend/hooks"));
 var utils = _interopRequireWildcard(require("./utils"));
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
-var _excluded = ["value", "defaultSet", "allCiSet", "showType"];
+var _treeUtil = require("../../utils/treeUtil");
+var _excluded = ["value", "defaultSet", "dataSource"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var Setting = function Setting(_ref) {
   var _ref$value = _ref.value,
     value = _ref$value === void 0 ? {} : _ref$value,
     defaultSet = _ref.defaultSet,
-    allCiSet = _ref.allCiSet,
-    showType = _ref.showType,
+    dataSource = _ref.dataSource,
     props = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
-  // const allCiSet = utils.dsTransform(props.allCiSet);
-
   var limit = props.limit,
-    saveCb = props.saveCb,
-    elementType = props.elementType;
-  var _useState = (0, _react.useState)(Object.keys(allCiSet)[0]),
+    saveCb = props.saveCb;
+  var allCiSet = (0, _react.useMemo)(function () {
+    var map = {};
+    (0, _treeUtil.loopTreeNode)(dataSource, function (item) {
+      if (item.type !== 'folder') {
+        map[item.id] = item;
+      }
+    });
+    return map;
+  }, [dataSource]);
+  var _useState = (0, _react.useState)(utils.getDefaultSelectedCiType(dataSource)),
     ciType = _useState[0],
     setCiType = _useState[1];
+  (0, _react.useEffect)(function () {
+    setCiType(utils.getDefaultSelectedCiType(dataSource));
+  }, [dataSource]);
   var _useState2 = (0, _react.useState)(''),
     search = _useState2[0],
     setSearch = _useState2[1];
@@ -44,31 +53,46 @@ var Setting = function Setting(_ref) {
     setSelected = _useState3[1];
   var selectedRowKeys = selected[ciType] || [];
   var _RiilHooks$useTableCo = _hooks["default"].useTableColumn({
-      columns: utils.columns(showType, props.showCiNum)
+      columns: [{
+        width: '100%',
+        dataIndex: 'name',
+        title: '数据',
+        cellOption: {
+          nowrap: true
+        }
+      }, {
+        width: '70px',
+        dataIndex: 'type',
+        title: '类型',
+        cellOption: {
+          nowrap: {
+            nowrapCell: utils.typeCell,
+            title: utils.typeCell
+          }
+        }
+      }]
     }),
     columnNodes = _RiilHooks$useTableCo.columnNodes;
   var onTreeSelect = function onTreeSelect(_ref2) {
     var selectedKey = _ref2[0];
-    if (selectedKey) {
+    if (selectedKey && allCiSet[selectedKey] && allCiSet[selectedKey].type !== 'folder') {
       setCiType(selectedKey);
     }
   };
   var onTableSelect = function onTableSelect(selectedKeys) {
     var values = (0, _extends2["default"])({}, selected);
-    _rlog["default"].debug("Setting-allCiSet-onTableSelect", limit, selectedKeys, selected);
+    _rlog["default"].debug('Setting-allCiSet-onTableSelect', limit, selectedKeys, selected);
     values[ciType] = selectedKeys;
     setSelected(values);
   };
   var saveSelected = function saveSelected() {
-    saveCb(utils.saveTransform(selected));
+    saveCb(selected);
   };
   var onReset = function onReset() {
-    var values = utils.defaultSelected(allCiSet, defaultSet, showType);
-    setSelected(values);
+    setSelected({});
   };
   var tableData = (0, _react.useMemo)(function () {
     var _allCiSet$ciType;
-    // console.log('allCiSet,ciType,search', allCiSet, ciType, search);
     var list = ((_allCiSet$ciType = allCiSet[ciType]) === null || _allCiSet$ciType === void 0 ? void 0 : _allCiSet$ciType.list) || [];
     if (search) {
       list = list.filter(function (item) {
@@ -78,9 +102,8 @@ var Setting = function Setting(_ref) {
     }
     return list;
   }, [allCiSet, ciType, search]);
-  function onSearch(value) {
-    // console.log('search', search);
-    setSearch(value);
+  function onSearch(searchValue) {
+    setSearch(searchValue);
   }
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].layout
@@ -90,18 +113,29 @@ var Setting = function Setting(_ref) {
     type: "notice"
   }, props.label + "\u6570\u636E\uFF1A\u9009\u62E9\u7684\u6307\u6807\u548C\u5C5E\u6027\u5C06\u4F1A\u663E\u793A\u5728" + props.poslabel + "\uFF0C\u6700\u591A\u652F\u6301\u52FE\u9009 " + limit + " \u9879\u3002")), /*#__PURE__*/_react["default"].createElement(_grid["default"].Row, {
     className: _indexModule["default"].content
-  }, props.showTree && /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
+  }, /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
     span: 8,
-    className: _indexModule["default"]["tree-wrap"]
-  }, /*#__PURE__*/_react["default"].createElement(_componentActionTree["default"], {
-    dataSource: utils.treeDs(allCiSet),
+    className: _indexModule["default"]['tree-wrap']
+  }, dataSource.length && /*#__PURE__*/_react["default"].createElement(_componentActionTree["default"], {
+    dataSource: dataSource,
     onSelect: onTreeSelect,
     draggable: false,
     treeProps: {
-      selectedKeys: [ciType]
+      selectedKeys: [ciType],
+      defaultExpandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      expandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      defaultExpandAll: true
     }
   })), /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
-    className: _indexModule["default"]["table-wrap"]
+    className: _indexModule["default"]['table-wrap']
   }, /*#__PURE__*/_react["default"].createElement(_componentTableLayout["default"], {
     filterItems: /*#__PURE__*/_react["default"].createElement("div", {
       className: _indexModule["default"].filter