ydb-components-material 0.1.15 → 0.1.16

package/lib/components/file-item/index.scss

@@ -1,295 +1,308 @@
-.file_item {
-  border-radius: 8px;
-  opacity: 1;
-  background: #F7F7F7;
-  padding: 12px;
-
-  .file {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+.file_main {
+  .file_name {
+    font-size: 14px;
+    font-weight: 500;
+    color: #323232;
+    margin-bottom: 8px;
+  }
+  .file_tip {
+    font-size: 12px;
+    color: #999999;
     margin-bottom: 12px;
+  }
+  .file_item {
+    border-radius: 8px;
+    opacity: 1;
+    background: #F7F7F7;
+    padding: 12px;
 
-    .file_img {
-      width: 80px;
-      height: 80px;
-      border-radius: 4px;
-      position: relative;
-      border-radius: 8px;
-      position: relative;
+    .file {
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       align-items: center;
-      background: #fff;
-      font-size: 12px;
-      color: #666666;
-      flex-direction: column;
+      margin-bottom: 12px;
 
-      .filed {
+      .file_img {
+        width: 80px;
+        height: 80px;
+        border-radius: 4px;
+        position: relative;
+        border-radius: 8px;
+        position: relative;
         display: flex;
         justify-content: center;
         align-items: center;
+        background: #fff;
+        font-size: 12px;
+        color: #666666;
         flex-direction: column;
-      }
 
-      .small_img {
-        width: 24px;
-        height: 24px;
+        .filed {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          flex-direction: column;
+        }
 
-      }
+        .small_img {
+          width: 24px;
+          height: 24px;
 
-      .add {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        .add_icon {
-          width: 14px;
-          margin-left: -5px;
         }
-        color: #1678FF;
-      }
 
-      .del {
-        position: absolute;
-        width: 16px;
-        height: 16px;
-        top: -6px;
-        right: -6px;
-        z-index: 9;
-      }
+        .add {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          .add_icon {
+            width: 14px;
+            margin-left: -5px;
+          }
+          color: #1678FF;
+        }
 
-      .error_msg {
-        position: absolute;
-        top: 30px;
-        right: 22px;
-      }
+        .del {
+          position: absolute;
+          width: 16px;
+          height: 16px;
+          top: -6px;
+          right: -6px;
+          z-index: 9;
+        }
 
-      .mask {
-        // display: none !important;
-        border-radius: 8px;
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        // opacity: 0.5;
-        background: #2222227d;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        color: #fff;
-        z-index: 8;
+        .error_msg {
+          position: absolute;
+          top: 30px;
+          right: 22px;
+        }
 
-        .checked {
+        .mask {
+          // display: none !important;
+          border-radius: 8px;
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          // opacity: 0.5;
+          background: #2222227d;
           display: flex;
+          justify-content: center;
           align-items: center;
+          color: #fff;
+          z-index: 8;
 
-          img {
-            width: 14px;
-            height: 14px;
-            margin-right: 3px;
+          .checked {
+            display: flex;
+            align-items: center;
+
+            img {
+              width: 14px;
+              height: 14px;
+              margin-right: 3px;
+            }
           }
         }
       }
-    }
 
-    .operation {
-      .btn {
-        display: flex;
-        flex-direction: row;
+      .operation {
+        .btn {
+          display: flex;
+          flex-direction: row;
+
+          .img_btn {
+            margin-left: 8px;
+            width: 68px;
+            height: 26px;
+            border-radius: 4px;
+            opacity: 1;
+            box-sizing: border-box;
+            border: 1px solid #1678FF;
+            color: #1678FF;
+            font-size: 13px;
+            line-height: 26px;
+            text-align: center;
+            cursor: pointer;
+          }
 
-        .img_btn {
+        }
+        .operation_btn {
+          cursor: pointer;
           margin-left: 8px;
           width: 68px;
           height: 26px;
           border-radius: 4px;
           opacity: 1;
           box-sizing: border-box;
-          border: 1px solid #1678FF;
-          color: #1678FF;
+          background: linear-gradient(90deg, #73AEFF 0%, #1678FF 100%);
+          color: #fff;
           font-size: 13px;
           line-height: 26px;
           text-align: center;
-          cursor: pointer;
         }
-
-      }
-      .operation_btn {
-        cursor: pointer;
-        margin-left: 8px;
-        width: 68px;
-        height: 26px;
-        border-radius: 4px;
-        opacity: 1;
-        box-sizing: border-box;
-        background: linear-gradient(90deg, #73AEFF 0%, #1678FF 100%);
-        color: #fff;
-        font-size: 13px;
-        line-height: 26px;
-        text-align: center;
       }
     }
-  }
-
-  .file_item_bottom {
-    border-top: 1px solid #EAEAEA;
-    display: flex;
-    display: flex;
-    justify-content: space-evenly;
-    align-items: center;
-    padding-top: 12px;
-
-    .line {
-      width: 1px;
-      height: 20px;
-      background-color: #EAEAEA;
-    }
 
-    .icon_text {
+    .file_item_bottom {
+      border-top: 1px solid #EAEAEA;
       display: flex;
+      display: flex;
+      justify-content: space-evenly;
       align-items: center;
-      font-size: 14px;
-      color: #1678FF;
+      padding-top: 12px;
+
+      .line {
+        width: 1px;
+        height: 20px;
+        background-color: #EAEAEA;
+      }
+
+      .icon_text {
+        display: flex;
+        align-items: center;
+        font-size: 14px;
+        color: #1678FF;
 
-      img {
-        width: 16px;
-        height: 11px;
-        margin-right: 5px;
+        img {
+          width: 16px;
+          height: 11px;
+          margin-right: 5px;
 
+        }
       }
     }
-  }
 
-  .img_view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.5);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .close {
-      width: 17px;
-      height: 17px;
-      color: #fff;
+    .img_view {
       position: absolute;
-      top: 40px;
-      right: 20px;
-    }
-
-    .view {
+      top: 0;
+      left: 0;
       width: 100%;
-      height: auto;
-    }
-  }
+      height: 100%;
+      background-color: rgba(0, 0, 0, 0.5);
+      display: flex;
+      justify-content: center;
+      align-items: center;
 
-  .material_lib {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    background-color: rgba(0, 0, 0, 0.5);
+      .close {
+        width: 17px;
+        height: 17px;
+        color: #fff;
+        position: absolute;
+        top: 40px;
+        right: 20px;
+      }
+
+      .view {
+        width: 100%;
+        height: auto;
+      }
+    }
 
-    .material_lib_content {
+    .material_lib {
       width: 100%;
+      height: 100%;
       position: absolute;
-      bottom: 0;
+      top: 0;
       left: 0;
-      background-color: #fff;
-      border-radius: 16px 16px 0px 0px;
-
-      .material_lib_title {
-        font-size: 16px;
-        color: #333333;
-        line-height: 54px;
-        text-align: center;
-      }
-
-      .tips {
-        padding: 12px;
-        background: #FFF6E8;
-        font-size: 14px;
-        line-height: 24px;
-        color: #F29655;
-        display: flex;
-        align-items: flex-start;
-
-        img {
-          width: 14px;
-          height: 14px;
-          margin-right: 8px;
-          margin-top: 5px;
-        }
-      }
+      z-index: 999;
+      background-color: rgba(0, 0, 0, 0.5);
 
-      .list {
-        padding: 12px 12px 0 12px;
+      .material_lib_content {
         width: 100%;
-        background-color: #F5F5F5;
-        margin-bottom: 64px;
-        max-height: 300px;
-        overflow: auto;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        border-radius: 16px 16px 0px 0px;
 
-        .item {
-          padding: 16px 12px;
-          border-radius: 8px;
-          background: #FFF;
-          display: flex;
-          align-items: center;
+        .material_lib_title {
+          font-size: 16px;
           color: #333333;
+          line-height: 54px;
+          text-align: center;
+        }
+
+        .tips {
+          padding: 12px;
+          background: #FFF6E8;
           font-size: 14px;
-          width: 100%;
-          margin-bottom: 12px;
+          line-height: 24px;
+          color: #F29655;
+          display: flex;
+          align-items: flex-start;
+
+          img {
+            width: 14px;
+            height: 14px;
+            margin-right: 8px;
+            margin-top: 5px;
+          }
+        }
 
-          .preview_icon {
-            margin-left: auto;
+        .list {
+          padding: 12px 12px 0 12px;
+          width: 100%;
+          background-color: #F5F5F5;
+          margin-bottom: 64px;
+          max-height: 300px;
+          overflow: auto;
+
+          .item {
+            padding: 16px 12px;
+            border-radius: 8px;
+            background: #FFF;
             display: flex;
             align-items: center;
-            color: #1678FF;
-
-            img {
-              width: 16px;
-              margin-right: 4px;
+            color: #333333;
+            font-size: 14px;
+            width: 100%;
+            margin-bottom: 12px;
+
+            .preview_icon {
+              margin-left: auto;
+              display: flex;
+              align-items: center;
+              color: #1678FF;
+
+              img {
+                width: 16px;
+                margin-right: 4px;
+              }
             }
           }
         }
-      }
-
-      .bottom_btn {
-        background-color: #fff;
-        height: 64px;
-        display: flex;
-        align-items: center;
-        justify-content: space-around;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-
-        .btn {
-          width: 169px;
-          height: 40px;
-          border-radius: 50px;
-          font-size: 16px;
-          line-height: 40px;
-          text-align: center;
-        }
 
-        .cancel {
+        .bottom_btn {
           background-color: #fff;
-          border: 1px solid #E7E7E7;
-          color: #333;
-        }
+          height: 64px;
+          display: flex;
+          align-items: center;
+          justify-content: space-around;
+          position: fixed;
+          bottom: 0;
+          left: 0;
+          right: 0;
+
+          .btn {
+            width: 169px;
+            height: 40px;
+            border-radius: 50px;
+            font-size: 16px;
+            line-height: 40px;
+            text-align: center;
+          }
 
-        .ok {
-          background: linear-gradient(90deg, #73AEFF 0%, #1678FF 100%);
-          color: #fff;
+          .cancel {
+            background-color: #fff;
+            border: 1px solid #E7E7E7;
+            color: #333;
+          }
+
+          .ok {
+            background: linear-gradient(90deg, #73AEFF 0%, #1678FF 100%);
+            color: #fff;
+          }
         }
       }
     }

package/lib/components/scene-tree/index.d.ts

@@ -5,6 +5,7 @@ export interface SceneTreeProps {
      */
     dataSource?: object;
     style?: object;
+    valChange?: (value: any) => void;
 }
 declare const SceneTree: React.FC<SceneTreeProps>;
 export default SceneTree;

package/lib/components/scene-tree/index.js

@@ -18,7 +18,8 @@ var RadioGroup = _radio["default"].Group;
 var SceneTree = function SceneTree(_ref) {
   var dataSource = _ref.dataSource,
     _ref$style = _ref.style,
-    style = _ref$style === void 0 ? {} : _ref$style;
+    style = _ref$style === void 0 ? {} : _ref$style,
+    valChange = _ref.valChange;
   var _useState = (0, _react.useState)(function () {
       console.log('---', dataSource);
       if (dataSource) {
@@ -122,19 +123,22 @@ var SceneTree = function SceneTree(_ref) {
   // }
 
   var onValChange = function onValChange(val, e) {
-    var targetId = +e.target.id;
+    console.log('====', e.target);
+    var targetId = e.target.id.split('+')[0];
+    var targetPId = e.target.id.split('+')[1];
+    console.log(targetId, targetPId);
 
-    // 根据ID查找节点的辅助函数
-    var _findNodeById = function findNodeById(currentNode, id) {
-      console.log('currentNode', currentNode, id);
-      if (currentNode.id === id) {
+    // 根据id和pid找到对应的题目节点
+    var _findNodeById = function findNodeById(currentNode, id, pid) {
+      console.log('currentNode', currentNode, id, pid);
+      if (String(currentNode.id) === id && String(currentNode.pid) === pid) {
         return currentNode;
       }
       if (currentNode.options) {
         for (var _iterator = _createForOfIteratorHelperLoose(currentNode.options), _step; !(_step = _iterator()).done;) {
           var child = _step.value;
           console.log('child', child);
-          var found = _findNodeById(child, id);
+          var found = _findNodeById(child, id, pid);
           console.log('found', found);
           if (found) return found;
         }
@@ -142,34 +146,33 @@ var SceneTree = function SceneTree(_ref) {
       if (currentNode.children) {
         for (var _iterator2 = _createForOfIteratorHelperLoose(currentNode.children), _step2; !(_step2 = _iterator2()).done;) {
           var _child = _step2.value;
-          var _found = _findNodeById(_child, id);
+          var _found = _findNodeById(_child, id, pid);
           if (_found) return _found;
         }
       }
       return null;
     };
     // 在源数据中找到对应的题目
-    var targetNodeOfOriginTree = _findNodeById(dataSource, targetId);
+    var targetNodeOfOriginTree = _findNodeById(dataSource, targetId, targetPId);
     console.log('targetNodeOfOriginTree', targetNodeOfOriginTree);
     // 找到题目下选中的那个选项
     var targetOption = targetNodeOfOriginTree.options.find(function (item) {
       return item.value === val;
     });
     // 拿到选中选项的子题目
-    var targetNodeChildList = targetOption.children.map(function (item) {
+    var targetNodeChildList = (targetOption.children || []).map(function (item) {
       delete item.children;
+      delete item.value;
       return item;
     });
     // 找到当前树中对应的那个题目
-    var targetNodeOfCurTree = _findNodeById(curTree, targetId);
+    var targetNodeOfCurTree = _findNodeById(curTree, targetId, targetPId);
     // 把子题目添加到当前树中
     targetNodeOfCurTree.children = targetNodeChildList;
     targetNodeOfCurTree.value = val;
-    console.log('targetNode', targetNodeOfOriginTree);
-    console.log('curTree', curTree);
+    targetNodeOfCurTree.optionName = targetOption.name;
     setCurTree((0, _extends2["default"])({}, curTree));
-    // console.log('target', findNodeById(dataSource, targetId))
-    console.log('val', val, e, targetId);
+    valChange(curTree);
   };
   var _TreeNode = function TreeNode(_ref2) {
     var node = _ref2.node;
@@ -178,7 +181,7 @@ var SceneTree = function SceneTree(_ref) {
       label: node.title,
       required: true,
       style: {
-        borderBottom: node.children ? '1px solid #EEEEEE' : '',
+        borderBottom: node.children && node.children.length ? '1px solid #EEEEEE' : '',
         paddingBottom: node.children ? '16px' : ''
       }
     }, /*#__PURE__*/React.createElement(RadioGroup, {
@@ -187,11 +190,13 @@ var SceneTree = function SceneTree(_ref) {
       "aria-labelledby": "groupId"
     }, node.options.map(function (option) {
       return /*#__PURE__*/React.createElement(_radio["default"], {
-        id: option.pid,
+        id: option.pid + "+" + node.pid,
+        key: option.id + node.pid + option.value,
         value: option.value
       }, option.name);
-    }))), node.children && node.children.map(function (item) {
+    }))), node.children && (node.children || []).map(function (item) {
       return /*#__PURE__*/React.createElement(_TreeNode, {
+        key: item.id + item.pid,
         node: item
       });
     }));
@@ -199,7 +204,7 @@ var SceneTree = function SceneTree(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "SceneTree",
     style: style
-  }, curTree && curTree.title ? /*#__PURE__*/React.createElement(_TreeNode, {
+  }, curTree ? /*#__PURE__*/React.createElement(_TreeNode, {
     node: curTree
   }) : null);
 };