Browse Source

解决数据源解析列报错可能导致页面崩溃的问题/解决用户组、用户选择器重复数据的问题/添加看板分发接口

zhuth 7 years ago
parent
commit
0eb4782c2f

+ 0 - 16
src/components/common/accessObjectBox/accessObjectBox.jsx

@@ -115,22 +115,6 @@ class AccessObjectBox extends React.Component {
             render: (v, r, i) => <Checkbox
                 dataKey={r.key}
                 checked={!!defaultSelectedUsers.find(g => g.code === r.code) || !!selectedUsers.find(g => g.code === r.code)}
-                onChange={(e) => {
-                    const target = e.target;
-                    const checked = target.checked;
-                    let { selectedUsers } = this.state;
-                    if(checked) {
-                        selectedUsers.push({
-                            code: r.code,
-                            name: r.fullName,
-                            isGroup: false
-                        });
-                    }else {
-                        let index = selectedUsers.findIndex(g => g.code === r.code);
-                        selectedUsers.splice(index, 1);
-                    }
-                    this.setState({ selectedUsers });
-                }}
             />,
             width: 50
         }, {

+ 1 - 1
src/components/user/layout.jsx

@@ -17,7 +17,7 @@ const Layout = () => {
             <TabPane tab='个人信息' key='userinfo'>
                 <UserInfo />
             </TabPane>
-            <TabPane tab='修改密码' key='modifypassword'>
+            <TabPane disabled tab='修改密码' key='modifypassword'>
                 <Password />
             </TabPane>
         </Tabs>

+ 4 - 4
src/components/user/userInfo.jsx

@@ -29,25 +29,25 @@ const UserInfo = ({ main }) => {
                 {...formItemLayout}
                 label="用户名"
             >
-                <Input id="userName" defaultValue={name} />
+                <Input id="userName" disabled defaultValue={name} />
             </FormItem>
             <FormItem
                 {...formItemLayout}
                 label="部门"
             >
-                <Input id="department" defaultValue={department} />
+                <Input id="department" disabled defaultValue={department} />
             </FormItem>
             <FormItem
                 {...formItemLayout}
                 label="岗位"
             >
-                <Input id="job" defaultValue={job} />
+                <Input id="job" disabled defaultValue={job} />
             </FormItem>
             <FormItem
                 {...formItemLayout}
                 label="角色"
             >
-                <Select defaultValue={role}>
+                <Select disabled defaultValue={role}>
                     <Select.Option value='admin'>管理员</Select.Option>
                     <Select.Option value='default'>普通用户</Select.Option>
                 </Select>

+ 3 - 1
src/constants/url.js

@@ -1,4 +1,4 @@
-const BASE_URL = 'http://192.168.253.189:8081/BI';
+const BASE_URL = 'http://192.168.253.189:81/BI';
 // const BASE_URL = 'http://192.168.253.129:8011';
 
 /**后台接口地址 */
@@ -162,6 +162,8 @@ const URLS = {
 
     DASHBOARD_UPDATE: BASE_URL + '/updateDashboards', // 更新看板
 
+    DASHBOARD_SHARE_LIST: BASE_URL + '/getDashOrder', // 获得看板分发列表
+
     DASHBOARD_SHARE: BASE_URL + '/addObject', // 看板分发
 
     DASHBOARD_TRANSFER: BASE_URL + '/changeDashOrder', // 看板移交

+ 1 - 1
src/models/dataSourceDetail.js

@@ -148,7 +148,7 @@ export default {
                 console.error(body, e)
                 yield put({ type: 'setFields', fields: [
                     { name: 'columns', value: [] },
-                    { name: 'notice', value: e }
+                    { name: 'notice', value: e.message + '' || e + '' }
                 ] });
                 message.error('请求列数据错误: ' + e);
             }