fix issues

spug_api/apps/host/group.py

@@ -25,12 +25,12 @@ def merge_children(data, prefix, childes):
         if item['children']:
             merge_children(data, name, item['children'])
         else:
-            data.append({'id': item['key'], 'name': name})
+            data[item['key']] = name
 
 
 class GroupView(View):
     def get(self, request):
-        data, data2 = dict(), []
+        data, data2 = dict(), dict()
         for item in Group.objects.filter(parent_id=0):
             data[item.id] = item.to_view()
         fetch_children(data)

spug_web/src/index.js

@@ -13,9 +13,10 @@ import App from './App';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import * as serviceWorker from './serviceWorker';
-import { history } from 'libs';
+import { history, updatePermissions } from 'libs';
 
 moment.locale('zh-cn');
+updatePermissions();
 
 ReactDOM.render(
   <Router history={history}>

spug_web/src/libs/functools.js

@@ -22,7 +22,6 @@ export function updatePermissions() {
 
 // 前端页面的权限判断(仅作为前端功能展示的控制，具体权限控制应在后端实现)
 export function hasPermission(strCode) {
-  if (!Permission.isReady) updatePermissions();
   const {isSuper, permissions} = Permission;
   if (!strCode || isSuper) return true;
   for (let or_item of strCode.split('|')) {

spug_web/src/pages/host/Detail.js

@@ -5,6 +5,7 @@ import store from './store';
 
 export default observer(function () {
   const host = store.record;
+  const group_ids = host.group_ids || [];
   return (
     <Drawer
       width={500}
@@ -20,9 +21,9 @@ export default observer(function () {
         <Descriptions.Item label="描述信息">{host.desc}</Descriptions.Item>
         <Descriptions.Item label="所属分组">
           <List >
-            <List.Item>腾讯云/华北区</List.Item>
+            {group_ids.map(g_id => (
-            <List.Item>腾讯云/测试环境/电商商城系统</List.Item>
+              <List.Item style={{padding: '6px 0'}}>{store.groups[g_id]}</List.Item>
-            <List.Item>腾讯云/测试环境/订单后台系统</List.Item>
+            ))}
           </List>
         </Descriptions.Item>
       </Descriptions>

spug_web/src/pages/host/store.js

@@ -11,7 +11,7 @@ class Store {
   counter = {};
   @observable records = [];
   @observable treeData = [];
-  @observable groups = [];
+  @observable groups = {};
   @observable group = {};
   @observable record = {};
   @observable idMap = {};