bugfix (#207)

Meituan-Dianping · Aug 15, 2019 · 3a77194 · 3a77194
1 parent 0838a7a
commit 3a77194
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/frontend/src/views/datamanager/DataList.vue b/frontend/src/views/datamanager/DataList.vue
@@ -1,11 +1,23 @@
 <template>
   <div>
     <Row class="button-bar">
-      <Col span="24">
+      <Col span="23">
         <b style="padding-left:5px">Mock Data Tree</b>
       </Col>
+      <Col span="1">
+        <Dropdown v-show="false">
+          <a href="javascript:void(0)">
+            <Icon type="ios-more-outline" />
+          </a>
+          <DropdownMenu slot="list">
+            <DropdownItem>Import...</DropdownItem>
+            <DropdownItem>Export...</DropdownItem>
+            <DropdownItem>Reload</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+      </Col>
     </Row>
-    <DocumentTree :treeData="treeData" class="data-list"/>
+    <DocumentTree :treeData="treeData" class="data-list" />
   </div>
 </template>
 
@@ -16,7 +28,7 @@ export default {
     DocumentTree
   },
   computed: {
-    treeData() {
+    treeData () {
       return this.$store.state.dataManager.groupList
     }
   }
@@ -50,4 +62,7 @@ export default {
   padding: 5px 0px 5px 10px;
   cursor: pointer;
 }
+.button-bar-btn img {
+  width: 18px;
+}
 </style>
diff --git a/lyrebird/mock/dm.py b/lyrebird/mock/dm.py
@@ -196,7 +196,7 @@ def add_data(self, parent_id, data):
         else:
             _data_name = data.get('name')
             _data_rule = {'request.url': '(?=.*YOUR-REQUEST-PATH)(?=.*PARAMS)'}
-        
+
         if 'response' in data:
             if 'data' in data['response']:
                 data['response']['data'] = self._flow_data_2_str(data['response']['data'])
@@ -223,12 +223,11 @@ def add_data(self, parent_id, data):
             self.id_map[data_id] = data_node
         self._save_prop()
         return data_id
-    
+
     def _flow_data_2_str(self, data):
         if isinstance(data, str):
             return data
-        return json.dumps(data)
-
+        return json.dumps(data, ensure_ascii=False)
 
     def add_group(self, parent_id, name):
         if parent_id == None:
@@ -257,11 +256,6 @@ def add_group(self, parent_id, name):
         return group_id
 
     def delete(self, _id):
-        self._delete(_id)
-        # Save prop
-        self._save_prop()
-
-    def _delete(self, _id):
         target_node = self.id_map.get(_id)
         if not target_node:
             raise IDNotFound(_id)
@@ -272,7 +266,14 @@ def _delete(self, _id):
             parent['children'].remove(target_node)
         else:
             self.root['children'].remove(target_node)
-        # Delete children
+        self._delete(_id)
+        # Save prop
+        self._save_prop()
+
+    def _delete(self, _id):
+        target_node = self.id_map.get(_id)
+        if not target_node:
+            raise IDNotFound(_id)
         if 'children' in target_node and len(target_node['children']) > 0:
             for child in target_node['children']:
                 self._delete(child['id'])
@@ -351,7 +352,7 @@ def _save_prop(self):
         # Save prop
         prop_file = self.root_path / PROP_FILE_NAME
         with codecs.open(prop_file, 'w') as f:
-            json.dump(self.root, f, ensure_ascii=False)
+            json.dump(self.root, f, ensure_ascii=False, indent=4)
 
     """
     Conflict checker