Browse Source

chore: 使用eslint格式化项目代码

lanjianrong 4 years ago
parent
commit
d80592bfb9

+ 3 - 3
package.json

@@ -13,14 +13,14 @@
     "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx ./src && npm run lint:style",
     "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx ./src",
     "lint:prettier": "prettier --check \"src/**/*\" --end-of-line auto",
-    "lint:style": "stylelint --fix \"src/**/*.scss\" --syntax scss",
+    "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
     "precommit": "lint-staged",
     "prettier": "prettier -c --write \"src/**/*\""
   },
   "lint-staged": {
-    "**/*.scss": "stylelint --syntax scss",
+    "**/*.less": "stylelint --syntax less",
     "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
-    "**/*.{js,jsx,tsx,ts,scss,md,json}": [
+    "**/*.{js,jsx,tsx,ts,less,md,json}": [
       "prettier --write"
     ]
   },

+ 0 - 2
src/components/Authorization/index.tsx

@@ -1,6 +1,4 @@
 import { tenderStore } from '@/store/mobx'
-import history from '@/utils/history'
-import { storage } from '@/utils/util'
 import { observer } from 'mobx-react'
 import React, { useEffect } from 'react'
 interface Authorization {

+ 9 - 9
src/pages/Login/index.tsx

@@ -80,7 +80,7 @@ class NormalLoginForm extends Component<iLoginProps, iState> {
         </Form.Item>
         {/* <div className={styles.textRight}>
           <span onClick={this.handleForgetPsw}>忘记密码?</span>
-        </div> */}
+        </div>
         <RetrieveForm visible={this.state.visible} setVisible={this.setVisible} />
       </Form>
     )
@@ -99,14 +99,14 @@ const RetrieveForm: React.FC<iRetrieveFormProps> = ({ visible, setVisible }) =>
   }
   return (
     <Modal
-      title="找回密码"
-      visible={visible}
-      onOk={handleOk}
-      onCancel={handleCancel}
-      cancelText="取消"
-      closable={false}
-      okText="重置密码"
-    />
+          title="找回密码"
+          visible={visible}
+          onOk={handleOk}
+          onCancel={handleCancel}
+          cancelText="取消"
+          closable={false}
+          okText="重置密码"
+         />
   )
 }
 

+ 29 - 34
src/pages/Management/Tender/List/index.tsx

@@ -91,7 +91,7 @@ const Tender: React.FC<{}> = () => {
         return <Dropdown overlay={() => {
           return (
             <Menu>
-              <Menu.Item key="0"><div className="menu-item" onClick={() => treeBtnClick({ type: 'rename', id: record.id })}><SvgIcon type="xxh-edit" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">重命名</span></div></Menu.Item>
+              <Menu.Item key="0"><div className="menu-item"  onClick={() => treeBtnClick({ type: 'rename', id: record.id })}><SvgIcon type="xxh-edit" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">重命名</span></div></Menu.Item>
               <Menu.Item key="1"><div className="menu-item" onClick={() => treeBtnClick({ type: 'move', id: record.id, isFolder: Boolean(record.isfolder) })}><SvgIcon type="xxh-exchange-alt" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">移动</span></div></Menu.Item>
               {
                 record.children?.length ?
@@ -102,40 +102,40 @@ const Tender: React.FC<{}> = () => {
                       </div>
                     </Tooltip>
                   </Menu.Item>
-                  :
-                  <Menu.Item key="2"><div className="menu-item" onClick={() => treeBtnClick({ type: record.isfolder ? 'delFolder' : 'delTender', id: record.id, name: record.name })}><SvgIcon type="xxh-times" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">删除</span></div></Menu.Item>
+                :
+                <Menu.Item key="2"><div className="menu-item" onClick={() => treeBtnClick({ type : record.isfolder ? 'delFolder' : 'delTender', id: record.id, name: record.name })}><SvgIcon type="xxh-times" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">删除</span></div></Menu.Item>
               }
               {
                 record.isfolder ? <Menu.Divider /> : ''
               }
               {
                 record.isfolder ? (!record.hasFolder) ?
-                  <Menu.Item key="3"><div className="menu-item" onClick={() => treeBtnClick({ type: 'tender', id: record.id })}><SvgIcon type="xxh-plus" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">新建标段</span></div></Menu.Item>
-                  :
-                  <Menu.Item key="3">
-                    <Tooltip placement="left" title="标段无法与文件夹同层">
-                      <div className="menu-item text-muted"><SvgIcon type="xxh-plus" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">新建标段</span></div>
-                    </Tooltip></Menu.Item>
-                  : ''
+                <Menu.Item key="3"><div className= "menu-item" onClick={() => treeBtnClick({ type: 'tender', id: record.id })}><SvgIcon type="xxh-plus" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">新建标段</span></div></Menu.Item>
+                :
+                <Menu.Item key="3">
+                  <Tooltip placement="left" title="标段无法与文件夹同层">
+                    <div className= "menu-item text-muted"><SvgIcon type="xxh-plus" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">新建标段</span></div>
+                  </Tooltip></Menu.Item>
+                : ''
               }
               {
                 record.isfolder ? !record.isBid ?
-                  <Menu.Item key="4"><div className="menu-item" onClick={() => treeBtnClick({ type: 'folder', id: record.id })}><SvgIcon type="xxh-folders" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">新建子文件夹</span></div></Menu.Item>
-                  :
-                  <Menu.Item key="4">
-                    <Tooltip placement="left" title="文件夹无法与标段同层">
-                      <div className="menu-item text-muted"><SvgIcon type="xxh-folders" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">新建子文件夹</span></div>
-                    </Tooltip>
-                  </Menu.Item>
-                  : ''
+                <Menu.Item key="4"><div className="menu-item" onClick={() => treeBtnClick({ type : 'folder', id: record.id })}><SvgIcon type="xxh-folders" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">新建子文件夹</span></div></Menu.Item>
+                :
+                <Menu.Item key="4">
+                  <Tooltip placement="left" title="文件夹无法与标段同层">
+                    <div className="menu-item text-muted"><SvgIcon type="xxh-folders" style={{ fontSize: 12 }} /><span className="pi-mg-left-5">新建子文件夹</span></div>
+                  </Tooltip>
+                </Menu.Item>
+                : ''
               }
 
             </Menu>
           )
         }} trigger={[ 'click' ]}>
           <span>
-            <SvgIcon type="xxh-align-justify" style={{ fontSize: 12, color: "#007bff" }} />
-            <CaretDownOutlined style={{ fontSize: "12px", color: "#007bff" }} />
+          <SvgIcon type="xxh-align-justify" style={{ fontSize: 12, color: "#007bff" }} />
+            <CaretDownOutlined style={{ fontSize: "12px", color: "#007bff" }}/>
           </span>
         </Dropdown>
       }
@@ -178,24 +178,19 @@ const Tender: React.FC<{}> = () => {
           <h3>没有标段数据</h3>
         </div> */}
         <div className={styles.tableContent}>
-          {
-            tree.children?.length ?
-            <Table<TenderTree>
-              columns={columns}
-              dataSource={tree.children}
-              pagination={false}
-              rowKey={record => record.id}
-              indentSize={20}
-              expandable={{ defaultExpandAllRows: true }}
-              bordered
-            />
-            : null
-          }
+          <Table<TenderTree>
+            columns={columns}
+            dataSource={tree.children}
+            pagination={false}
+            rowKey={record => record.id}
+            indentSize={20}
+            bordered
+             />
         </div>
         <ModalForm modalObj={modal} treeObj={tree} onCreate={onCreate} onCancel={() => setModal({
           ...modal,
           visible: false
-        })} />
+        })}  />
       </div>
     </div>
   )

+ 0 - 1
src/utils/common/customHooks.ts

@@ -2,7 +2,6 @@
 import { useState, useEffect } from 'react'
 import { ContractTree } from '@/types/contract'
 import { ListModal } from '@/types/safe'
-import consts from '../consts'
 
 /** 合同树的自定义hook */
 export const useContractTree = (): [ContractTree, (newTree: ContractTree) => void] => {