From cfbb9d49f1c8dd3812cc94bca4caf748fa893cd8 Mon Sep 17 00:00:00 2001
From: tengge1 <930372551@qq.com>
Date: Mon, 7 Oct 2019 20:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AA=97=E5=8F=A3=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/AuthorityManagementWindow.jsx      |  5 +--
 .../src/editor/system/LoginWindow.jsx         | 13 +++----
 .../src/editor/system/RegisterWindow.jsx      | 17 +++++-----
 .../src/editor/system/RoleManageWindow.jsx    | 32 +++++++++--------
 .../src/editor/system/UserManageWindow.jsx    | 34 ++++++++++---------
 5 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/ShadowEditor.Web/src/editor/system/AuthorityManagementWindow.jsx b/ShadowEditor.Web/src/editor/system/AuthorityManagementWindow.jsx
index 50b20fb3..704a33fc 100644
--- a/ShadowEditor.Web/src/editor/system/AuthorityManagementWindow.jsx
+++ b/ShadowEditor.Web/src/editor/system/AuthorityManagementWindow.jsx
@@ -14,7 +14,7 @@ class AuthorityManagementWindow extends React.Component {
             data: [],
             selected: null,
             keyword: '',
-            mask: false
+            mask: true
         };
 
         this.update = this.update.bind(this);
@@ -68,9 +68,6 @@ class AuthorityManagementWindow extends React.Component {
     }
 
     componentDidMount() {
-        this.setState({
-            mask: true
-        });
         fetch(`${app.options.server}/api/Role/List?pageSize=10000`).then(response => {
             response.json().then(json => {
                 this.setState({
diff --git a/ShadowEditor.Web/src/editor/system/LoginWindow.jsx b/ShadowEditor.Web/src/editor/system/LoginWindow.jsx
index c25af143..9ff1edc8 100644
--- a/ShadowEditor.Web/src/editor/system/LoginWindow.jsx
+++ b/ShadowEditor.Web/src/editor/system/LoginWindow.jsx
@@ -12,7 +12,7 @@ class LoginWindow extends React.Component {
 
         this.state = {
             username: '',
-            password: '',
+            password: ''
         };
 
         this.handleChange = this.handleChange.bind(this);
@@ -28,16 +28,17 @@ class LoginWindow extends React.Component {
             title={_t('Login')}
             style={{ width: '320px', height: '200px' }}
             mask={false}
-            onClose={this.handleClose}>
+            onClose={this.handleClose}
+               >
             <Content>
                 <Form>
                     <FormControl>
                         <Label>{_t('Username')}</Label>
-                        <Input name={'username'} value={username} onChange={this.handleChange}></Input>
+                        <Input name={'username'} value={username} onChange={this.handleChange} />
                     </FormControl>
                     <FormControl>
                         <Label>{_t('Password')}</Label>
-                        <Input name={'password'} type={'password'} value={password} onChange={this.handleChange}></Input>
+                        <Input name={'password'} type={'password'} value={password} onChange={this.handleChange} />
                     </FormControl>
                 </Form>
             </Content>
@@ -50,7 +51,7 @@ class LoginWindow extends React.Component {
 
     handleChange(value, name) {
         this.setState({
-            [name]: value,
+            [name]: value
         });
     }
 
@@ -60,7 +61,7 @@ class LoginWindow extends React.Component {
         fetch(`/api/Login/Login`, {
             method: 'POST',
             headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
+                'Content-Type': 'application/x-www-form-urlencoded'
             },
             body: `Username=${username}&Password=${password}`
         }).then(response => {
diff --git a/ShadowEditor.Web/src/editor/system/RegisterWindow.jsx b/ShadowEditor.Web/src/editor/system/RegisterWindow.jsx
index a905ac4f..ac69b48c 100644
--- a/ShadowEditor.Web/src/editor/system/RegisterWindow.jsx
+++ b/ShadowEditor.Web/src/editor/system/RegisterWindow.jsx
@@ -14,7 +14,7 @@ class RegisterWindow extends React.Component {
             username: '',
             password: '',
             confirmPassword: '',
-            name: '',
+            name: ''
         };
 
         this.handleChange = this.handleChange.bind(this);
@@ -30,24 +30,25 @@ class RegisterWindow extends React.Component {
             title={_t('Register')}
             style={{ width: '400px', height: '240px' }}
             mask={false}
-            onClose={this.handleClose}>
+            onClose={this.handleClose}
+               >
             <Content>
                 <Form>
                     <FormControl>
                         <Label>{_t('Username')}</Label>
-                        <Input name={'username'} value={username} onChange={this.handleChange}></Input>
+                        <Input name={'username'} value={username} onChange={this.handleChange} />
                     </FormControl>
                     <FormControl>
                         <Label>{_t('Password')}</Label>
-                        <Input name={'password'} type={'password'} value={password} onChange={this.handleChange}></Input>
+                        <Input name={'password'} type={'password'} value={password} onChange={this.handleChange} />
                     </FormControl>
                     <FormControl>
                         <Label>{_t('Confirm Password')}</Label>
-                        <Input name={'confirmPassword'} type={'password'} value={confirmPassword} onChange={this.handleChange}></Input>
+                        <Input name={'confirmPassword'} type={'password'} value={confirmPassword} onChange={this.handleChange} />
                     </FormControl>
                     <FormControl>
                         <Label>{_t('Name')}</Label>
-                        <Input name={'name'} onChange={this.handleChange} onChange={this.handleChange}></Input>
+                        <Input name={'name'} onChange={this.handleChange} onChange={this.handleChange} />
                     </FormControl>
                 </Form>
             </Content>
@@ -60,7 +61,7 @@ class RegisterWindow extends React.Component {
 
     handleChange(value, name) {
         this.setState({
-            [name]: value,
+            [name]: value
         });
     }
 
@@ -70,7 +71,7 @@ class RegisterWindow extends React.Component {
         fetch(`/api/Login/Login`, {
             method: 'POST',
             headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
+                'Content-Type': 'application/x-www-form-urlencoded'
             },
             body: `Username=${username}&Password=${password}`
         }).then(response => {
diff --git a/ShadowEditor.Web/src/editor/system/RoleManageWindow.jsx b/ShadowEditor.Web/src/editor/system/RoleManageWindow.jsx
index 8cf4464c..27c5e1f9 100644
--- a/ShadowEditor.Web/src/editor/system/RoleManageWindow.jsx
+++ b/ShadowEditor.Web/src/editor/system/RoleManageWindow.jsx
@@ -17,7 +17,7 @@ class RoleManageWindow extends React.Component {
             total: 0,
             selected: null,
             keyword: '',
-            mask: false,
+            mask: false
         };
 
         this.update = this.update.bind(this);
@@ -47,17 +47,18 @@ class RoleManageWindow extends React.Component {
             title={_t('Role Management')}
             style={{ width: '600px', height: '400px' }}
             mask={false}
-            onClose={this.handleClose}>
+            onClose={this.handleClose}
+               >
             <Content>
                 <Toolbar>
                     <Button onClick={this.handleAdd}>{_t('Create')}</Button>
                     <Button onClick={this.handleEdit}>{_t('Edit')}</Button>
                     <Button onClick={this.handleDelete}>{_t('Delete')}</Button>
-                    <ToolbarFiller></ToolbarFiller>
-                    <SearchField placeholder={_t('Search Content')} onInput={this.handleSearch}></SearchField>
+                    <ToolbarFiller />
+                    <SearchField placeholder={_t('Search Content')} onInput={this.handleSearch} />
                 </Toolbar>
                 <DataGrid data={data}
-                    pages={true}
+                    pages
                     pageSize={pageSize}
                     pageNum={pageNum}
                     total={total}
@@ -70,12 +71,13 @@ class RoleManageWindow extends React.Component {
                     onNextPage={this.handleNextPage}
                     onLastPage={this.handleLastPage}
                     onRefresh={this.handleRefresh}
-                    keyField={'ID'}>
-                    <Column type={'number'} title={'#'}></Column>
-                    <Column field={'Name'} title={_t('Name')}></Column>
-                    <Column field={'CreateTime'} title={_t('Create Date')} width={120} align={'center'} renderer={this.renderDate}></Column>
-                    <Column field={'UpdateTime'} title={_t('Update Date')} width={120} align={'center'} renderer={this.renderDate}></Column>
-                    <Column field={'Status'} title={_t('Status')} width={80} align={'center'} renderer={this.renderStatus}></Column>
+                    keyField={'ID'}
+                >
+                    <Column type={'number'} title={'#'} />
+                    <Column field={'Name'} title={_t('Name')} />
+                    <Column field={'CreateTime'} title={_t('Create Date')} width={120} align={'center'} renderer={this.renderDate} />
+                    <Column field={'UpdateTime'} title={_t('Update Date')} width={120} align={'center'} renderer={this.renderDate} />
+                    <Column field={'Status'} title={_t('Status')} width={80} align={'center'} renderer={this.renderStatus} />
                 </DataGrid>
             </Content>
         </Window>;
@@ -87,7 +89,7 @@ class RoleManageWindow extends React.Component {
 
     update(pageSize, pageNum, keyword = '') {
         this.setState({
-            mask: true,
+            mask: true
         });
         fetch(`${app.options.server}/api/Role/List?pageSize=${pageSize}&pageNum=${pageNum}&keyword=${keyword}`).then(response => {
             response.json().then(json => {
@@ -98,7 +100,7 @@ class RoleManageWindow extends React.Component {
                     total: json.Data.total,
                     data: json.Data.rows,
                     keyword: keyword,
-                    mask: false,
+                    mask: false
                 });
             });
         });
@@ -106,7 +108,7 @@ class RoleManageWindow extends React.Component {
 
     handleAdd() {
         const win = app.createElement(EditRoleWindow, {
-            callback: this.handleRefresh,
+            callback: this.handleRefresh
         });
         app.addElement(win);
     }
@@ -177,7 +179,7 @@ class RoleManageWindow extends React.Component {
 
     handleSelect(selected) {
         this.setState({
-            selected: selected.ID,
+            selected: selected.ID
         });
     }
 
diff --git a/ShadowEditor.Web/src/editor/system/UserManageWindow.jsx b/ShadowEditor.Web/src/editor/system/UserManageWindow.jsx
index b16ff6b8..5a45947e 100644
--- a/ShadowEditor.Web/src/editor/system/UserManageWindow.jsx
+++ b/ShadowEditor.Web/src/editor/system/UserManageWindow.jsx
@@ -17,7 +17,7 @@ class UserManageWindow extends React.Component {
             total: 0,
             selected: null,
             keyword: '',
-            mask: false,
+            mask: false
         };
 
         this.update = this.update.bind(this);
@@ -47,17 +47,18 @@ class UserManageWindow extends React.Component {
             title={_t('User Management')}
             style={{ width: '600px', height: '400px' }}
             mask={false}
-            onClose={this.handleClose}>
+            onClose={this.handleClose}
+               >
             <Content>
                 <Toolbar>
                     <Button onClick={this.handleAdd}>{_t('Create')}</Button>
                     <Button onClick={this.handleEdit}>{_t('Edit')}</Button>
                     <Button onClick={this.handleDelete}>{_t('Delete')}</Button>
-                    <ToolbarFiller></ToolbarFiller>
-                    <SearchField placeholder={_t('Search Content')} onInput={this.handleSearch}></SearchField>
+                    <ToolbarFiller />
+                    <SearchField placeholder={_t('Search Content')} onInput={this.handleSearch} />
                 </Toolbar>
                 <DataGrid data={data}
-                    pages={true}
+                    pages
                     pageSize={pageSize}
                     pageNum={pageNum}
                     total={total}
@@ -70,13 +71,14 @@ class UserManageWindow extends React.Component {
                     onNextPage={this.handleNextPage}
                     onLastPage={this.handleLastPage}
                     onRefresh={this.handleRefresh}
-                    keyField={'ID'}>
-                    <Column type={'number'} title={'#'}></Column>
-                    <Column field={'Username'} title={_t('Username')}></Column>
-                    <Column field={'Name'} title={_t('Name')}></Column>
-                    <Column field={'CreateTime'} title={_t('Create Date')} width={120} align={'center'} renderer={this.renderDate}></Column>
-                    <Column field={'UpdateTime'} title={_t('Update Date')} width={120} align={'center'} renderer={this.renderDate}></Column>
-                    <Column field={'Status'} title={_t('Status')} width={80} align={'center'} renderer={this.renderStatus}></Column>
+                    keyField={'ID'}
+                >
+                    <Column type={'number'} title={'#'} />
+                    <Column field={'Username'} title={_t('Username')} />
+                    <Column field={'Name'} title={_t('Name')} />
+                    <Column field={'CreateTime'} title={_t('Create Date')} width={120} align={'center'} renderer={this.renderDate} />
+                    <Column field={'UpdateTime'} title={_t('Update Date')} width={120} align={'center'} renderer={this.renderDate} />
+                    <Column field={'Status'} title={_t('Status')} width={80} align={'center'} renderer={this.renderStatus} />
                 </DataGrid>
             </Content>
         </Window>;
@@ -88,7 +90,7 @@ class UserManageWindow extends React.Component {
 
     update(pageSize, pageNum, keyword = '') {
         this.setState({
-            mask: true,
+            mask: true
         });
         fetch(`${app.options.server}/api/User/List?pageSize=${pageSize}&pageNum=${pageNum}&keyword=${keyword}`).then(response => {
             response.json().then(json => {
@@ -99,7 +101,7 @@ class UserManageWindow extends React.Component {
                     total: json.Data.total,
                     data: json.Data.rows,
                     keyword: keyword,
-                    mask: false,
+                    mask: false
                 });
             });
         });
@@ -107,7 +109,7 @@ class UserManageWindow extends React.Component {
 
     handleAdd() {
         const win = app.createElement(EditUserWindow, {
-            callback: this.handleRefresh,
+            callback: this.handleRefresh
         });
         app.addElement(win);
     }
@@ -179,7 +181,7 @@ class UserManageWindow extends React.Component {
 
     handleSelect(selected) {
         this.setState({
-            selected: selected.ID,
+            selected: selected.ID
         });
     }