From 3f4ae0819d3694c621f3fd2e7940c956a056d44b Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Wed, 8 Jan 2020 20:45:16 +0800
Subject: [PATCH] F fix bug

---
 spug_api/apps/config/views.py             | 9 ++++-----
 spug_web/src/pages/config/setting/Form.js | 9 ++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/spug_api/apps/config/views.py b/spug_api/apps/config/views.py
index c0b8305..e710ebb 100644
--- a/spug_api/apps/config/views.py
+++ b/spug_api/apps/config/views.py
@@ -111,6 +111,7 @@ class ConfigView(View):
         form, error = JsonParser(
             Argument('id', type=int, help='缺少必要参数'),
             Argument('value', type=str, default=''),
+            Argument('is_public', type=bool, help='缺少必要参数'),
             Argument('desc', required=False)
         ).parse(request.body)
         if error is None:
@@ -118,20 +119,18 @@ class ConfigView(View):
             config = Config.objects.filter(pk=form.id).first()
             if not config:
                 return json_response(error='未找到指定对象')
+            config.desc = form.desc
+            config.is_public = form.is_public
             if config.value != form.value:
                 old_value = config.value
                 config.value = form.value
-                config.desc = form.desc
                 config.updated_at = human_datetime()
                 config.updated_by = request.user
-                config.save()
                 ConfigHistory.objects.create(
                     action='2',
                     old_value=old_value,
                     **config.to_dict(excludes=('id',)))
-            elif config.desc != form.desc:
-                config.desc = form.desc
-                config.save()
+            config.save()
         return json_response(error=error)
 
     def delete(self, request):
diff --git a/spug_web/src/pages/config/setting/Form.js b/spug_web/src/pages/config/setting/Form.js
index 938f6f3..c14c837 100644
--- a/spug_web/src/pages/config/setting/Form.js
+++ b/spug_web/src/pages/config/setting/Form.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { observer } from 'mobx-react';
-import { Modal, Form, Input, Checkbox, Switch, Row, Col, message } from 'antd';
+import {observer} from 'mobx-react';
+import {Modal, Form, Input, Checkbox, Switch, Row, Col, message} from 'antd';
 import http from 'libs/http';
 import store from './store';
 import envStore from '../environment/store'
@@ -80,7 +80,10 @@ class ComForm extends React.Component {
           </Form.Item>
           {store.type === 'app' && (
             <Form.Item label="类型">
-              {getFieldDecorator('is_public', {initialValue: info['is_public'] || true, valuePropName: 'checked'})(
+              {getFieldDecorator('is_public', {
+                initialValue: info['is_public'] === undefined || info['is_public'],
+                valuePropName: 'checked'
+              })(
                 <Switch checkedChildren="公共" unCheckedChildren="私有"/>
               )}
             </Form.Item>