fix

xpioneer · xpioneer · commit 2f5730805cfa · 2021-08-12T01:22:24.000+08:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -45,6 +45,7 @@ module.exports = {
     'default-case': 2,
     'no-spaced-func': 2,
     'no-case-declarations': 0,
+    'no-sparse-arrays': 0,
     // react jsx
     'react/display-name': 0,
     'react/jsx-filename-extension': 'off',
@@ -61,15 +62,14 @@ module.exports = {
     '@typescript-eslint/no-use-before-define': 0,
     '@typescript-eslint/member-delimiter-style': 0,
     '@typescript-eslint/no-unused-vars': 0,
-    '@typescript-eslint/no-use-before-define': 0,
     '@typescript-eslint/no-explicit-any': 0,
     '@typescript-eslint/explicit-member-accessibility': 0,
     '@typescript-eslint/no-angle-bracket-type-assertion': 0,
     '@typescript-eslint/interface-name-prefix': 0,
     '@typescript-eslint/no-empty-function': 1,
     '@typescript-eslint/semi': 0,
     '@typescript-eslint/no-inferrable-types': 0,
-    '@typescript-eslint/no-empty-interface': 1,
+    '@typescript-eslint/no-empty-interface': 0,
     '@typescript-eslint/class-name-casing': 0,
   }
 };
diff --git a/build/donePlugin.js b/build/donePlugin.js
@@ -0,0 +1,11 @@
+
+class DonePlugin {
+  apply(compiler) {
+    compiler.hooks.done.tap('DonePlugin', (stats) => {
+      console.log('编译完成....')
+      // console.log(stats)
+    })
+  }
+}
+
+module.exports = DonePlugin
diff --git a/build/px2rem-loader.js b/build/px2rem-loader.js
@@ -1,6 +1,6 @@
 const loaderUtils = require('loader-utils')
 
-const pxReg = /\b(\d+(\.\d+)?)PX\b/g
+const pxReg = /\b(\d+(\.\d+)?)px\b/g
 
 module.exports = function(content) {
 
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -6,6 +6,7 @@ const path = require('path'),
   ManifestPlugin = require('webpack-manifest-plugin'),
   SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
 
+const DonePlugin = require('./donePlugin')
 const _PROD_ = process.env.NODE_ENV === 'production';
 
 const resolve = (dir) => {
@@ -42,14 +43,14 @@ module.exports = {
       //     transpileOnly: true
       //   }
       // },
-      {
-        test: /\.(j|t)sx?$/,
-        loader: 'px2rem-loader',
-        options: {
-          remRoot: 40,
-          fixed: 6
-        }
-      },
+      // {
+      //   test: /\.(j|t)sx?$/,
+      //   loader: 'px2rem-loader',
+      //   options: {
+      //     remRoot: 40,
+      //     fixed: 6
+      //   }
+      // },
       {
         test: /\.(j|t)sx?$/,
         include: [
@@ -67,7 +68,7 @@ module.exports = {
               exclude: ['transform-typeof-symbol'],
             }],
             ["@babel/preset-react", {
-              "targets": "last 2 versions, ie 11", "modules": false
+              targets: "last 2 versions, ie 11", modules: false
             }],
             ["@babel/preset-typescript"]
           ],
@@ -181,6 +182,8 @@ module.exports = {
   },
 
   plugins: [
+    // new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /zh-cn/),
+    new DonePlugin(),
     // new webpack.DefinePlugin({
     //   "process.env": {
     //     NODE_ENV: JSON.stringify(_PROD_ ? "development" : "production")
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
@@ -21,7 +21,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     new UglifyJsPlugin({
       uglifyOptions: {
         compress: {
-          warnings: false,
+          // warnings: false,
           drop_console: _PROD_ ? true : false,
         },
         output: {
diff --git a/package.json b/package.json
@@ -25,7 +25,8 @@
     "echarts": "^4.2.0-rc.2",
     "mobx": "^5.15.0",
     "mobx-react": "^6.1.4",
-    "quill": "^1.3.6",
+    "quill": "^1.3.7",
+    "quill-image-resize-module": "^3.0.0",
     "react": "^16.11.0",
     "react-dom": "^16.11.0",
     "react-router-dom": "^5.1.2"
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
@@ -1,10 +1,10 @@
 import { MessageApi } from 'antd/lib/message'
 import { NotificationApi } from 'antd/lib/notification'
 import { RouteComponentProps } from 'react-router-dom'
-import { AxiosInstance } from 'axios'
+import { AxiosStatic } from 'axios'
+
 
 declare global {
-  export const $http: AxiosInstance
   
   export const $msg: MessageApi
   
@@ -13,4 +13,31 @@ declare global {
   export interface IProps extends RouteComponentProps {
     [key: string]: any
   }
+
+  interface IResponseData<T = any> {
+    data: T
+    msg: string
+    status: number
+  }
+
+  interface IPageData<T = any> {
+    data: T[]
+    meta: {
+      count?: number
+      page: number
+      pageSize: number
+      total?: number
+      totalPage?: number
+      showTotal?: (total: number) => React.ReactNode
+    }
+    msg?: string
+    status?: number
+  }
+
+  type IPageParams = Pick<IPageData['meta'], 'page' | 'pageSize'>
+  
+  interface IOption<V = any, L = string> {
+    label: L
+    value: V
+  }
 }
diff --git a/src/components/editor/index.tsx b/src/components/editor/index.tsx
@@ -1,8 +1,16 @@
 import * as React from 'react'
 import { QuillOptionsStatic } from 'quill'
 import * as Q from 'quill'
+// const ImageResize = require('quill-image-resize-module/src/ImageResize.js');
+// console.log(ImageResize, 'imageresize')
+interface IQuillOptions extends QuillOptionsStatic {
+  // imageResize: {
+  //   displaySize: boolean
+  // }
+}
 
 const Quill: any = Q
+// Quill.register('modules/imageResize', ImageResize)
 
 const toolbarOptions = [
   ['bold', 'italic', 'underline', 'strike'],        // toggled buttons
@@ -37,8 +45,11 @@ export default class QuillEditorComponent extends React.Component<IEditor> {
   oldVal: string = ''
 
   quillEditor: any = null
-  quillOptions: QuillOptionsStatic = {
+  quillOptions: IQuillOptions = {
     // debug: false,
+    imageResize: {
+      displaySize: true // default false
+    },
     modules: {
       toolbar: toolbarOptions,
     },
diff --git a/src/pages/dashboard/dashboard.tsx b/src/pages/dashboard/dashboard.tsx
@@ -5,7 +5,7 @@ export default class Dashboard extends React.Component {
     return <div>
       <p>Welcome to Dashboard!</p>
       <div>GraphQL Application. </div>
-      <p style={{width: '400PX', height: 40, fontSize: '24px'}}>测试rem</p>
+      {/* <p style={{width: '400px', height: '40PX', fontSize: '24px'}}>测试rem</p> */}
       <div>66px</div>
     </div>
   }
diff --git a/src/pages/demo/demoRedux.tsx b/src/pages/demo/demoRedux.tsx
@@ -2,7 +2,6 @@ import * as React from 'react'
 import { Row, Col, Button, Badge, Icon, Form, Input, Select } from 'antd'
 import { ReduxProvider, connect } from '../../plugins/react-redux'
 import { store, countActions } from './reducer'
-import { HookButton } from './demoHooks'
 
 console.log(store.getState(), '---store')
 
@@ -62,7 +61,6 @@ class DemoRedux extends React.Component<any> {
             <Button onClick={ADD}>
               <Icon type="plus" />
             </Button>
-            <HookButton></HookButton>
           </Col>
         </Row>
       </section>
diff --git a/src/pages/home/components/sider.tsx b/src/pages/home/components/sider.tsx
@@ -44,16 +44,25 @@ const MenuList = [{
   },{
     key: '5-2', title: '统计图', path: '/home/lottery-chart', icon: 'bar-chart'
   }]
-},{
-  key:'99', title:'Demo', icon:'bulb',
-  children: [{
-    key: '99-0', title: '示例', path: '/home/demos', icon:'experiment'
-  },{
-    key: '99-1', title: '示例mobx', path: '/home/demo-mobx', icon:'experiment'
+},,{
+    key:'6', title:'Stocks', icon:'stock',
+    children: [{
+      key: '6-0', title: 'Stock', path: '/home/stocks', icon: 'dollar'
+    },{
+      key: '6-1', title: 'Stock History', path: '/home/stocks-history', icon: 'fund'
+    }]
   },{
-    key: '99-2', title: '示例redux', path: '/home/demo-redux', icon:'experiment'
+    key:'99', title:'Demo', icon:'bulb',
+    children: [{
+      key: '99-0', title: '示例', path: '/home/demos', icon:'experiment'
+    },{
+      key: '99-1', title: '示例mobx', path: '/home/demo-mobx', icon:'experiment'
+    },{
+      key: '99-2', title: '示例redux', path: '/home/demo-redux', icon:'experiment'
+    },{
+      key: '99-3', title: '示例hooks', path: '/home/demo-hooks', icon:'experiment'
+    }]
   }]
-}]
 
 class SiderComponent extends React.Component<ISiderProps> {
 
diff --git a/src/pages/stocks/history.tsx b/src/pages/stocks/history.tsx
@@ -0,0 +1,7 @@
+import React, { useState, useEffect } from 'react'
+
+const ShareHistories: React.FC = () => {
+  return <div></div>
+}
+
+export default ShareHistories
diff --git a/src/pages/stocks/index.tsx b/src/pages/stocks/index.tsx
@@ -0,0 +1,70 @@
+import React, { useState, useEffect } from 'react'
+import { Row, Col, Form, Table, Input, Button, Spin, Select } from 'antd'
+import { listColumns } from './util'
+import { stockPageList, IStockQuery } from '../../services/stock'
+import { data2PageData, pageData2Params } from '../../utils/tools'
+import { marketOpts, blockOpts } from '../../types/stock'
+
+const ShareList: React.FC = () => {
+
+  const [code, setCode] = useState('')
+  const [name, setName] = useState('')
+  const [loading, setLoading] = useState(false)
+  const [pageData, setPageData] = useState(data2PageData())
+
+  const onQuery = (params: Partial<IStockQuery> = pageData2Params(pageData.meta)) => {
+    setLoading(true)
+    stockPageList({...params, code, name}).then(res => {
+      const data = data2PageData(res)
+      setPageData(data)
+    }).finally(() => setLoading(false))
+  }
+
+  useEffect(() => {
+    onQuery()
+  }, [])
+
+
+  return <Spin spinning={loading}>
+    <Form>
+      <Row gutter={16}>
+        <Col span={6}>
+          <Form.Item>
+            <Input placeholder="代码" onChange={({target: {value}}) => setCode(value)}/>
+          </Form.Item>
+        </Col>
+        <Col span={6}>
+          <Form.Item>
+            <Input placeholder="名称" onChange={({target: {value}}) => setName(value)}/>
+          </Form.Item>
+        </Col>
+        <Col span={6}>
+          <Form.Item>
+            <Select placeholder="请选择市场"/>
+          </Form.Item>
+        </Col>
+        <Col span={6}>
+          <Form.Item>
+            <Select placeholder="请选择板块"/>
+          </Form.Item>
+        </Col>
+      </Row>
+      <Row>
+        <Col span={6} offset={18}>
+          <Button onClick={() => onQuery()}>查询</Button>
+        </Col>
+      </Row>
+    </Form>
+    <Table
+      columns={listColumns()}
+      dataSource={pageData.data}
+      pagination={{
+        ...pageData.meta,
+        onChange: (page, pageSize) => onQuery({page, pageSize})
+      }}
+    />
+  </Spin>
+}
+
+
+export default ShareList
diff --git a/src/pages/stocks/util.tsx b/src/pages/stocks/util.tsx
@@ -0,0 +1,31 @@
+import React, { useState, useEffect } from 'react'
+import { ColumnProps } from 'antd/lib/table'
+import { Stock, EMarket, EBlock } from '../../types/stock'
+import { Button } from 'antd'
+
+export const listColumns = (): ColumnProps<Stock>[] => {
+  return [{
+    title: 'ID',
+    dataIndex: 'id',
+  }, {
+    title: '名称',
+    dataIndex: 'name',
+    width: '120px',
+  }, {
+    title: '代码',
+    dataIndex: 'code'
+  }, {
+    title: '市场',
+    dataIndex: 'market',
+    render: (v, data) => EMarket[data.market]
+  }, {
+    title: '板块',
+    dataIndex: 'block',
+    render: (v, data) => EBlock[data.block]
+  }, {
+    title: '操作',
+    dataIndex: '',
+    width: '30px',
+    render: (v, data) => <Button type="link">查看</Button>
+  }]
+}
diff --git a/src/pages/user/userEditStore.ts b/src/pages/user/userEditStore.ts
@@ -2,7 +2,7 @@ import { observable, action, autorun, runInAction, computed } from 'mobx'
 import { GRAPHQL_API } from '@constants/index'
 
 const getUser = `
-query getUser($id: String!){
+{
   user(id: $id){
     id
     username
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
diff --git a/src/services/stock.ts b/src/services/stock.ts
diff --git a/src/types/stock.ts b/src/types/stock.ts
diff --git a/src/utils/http.ts b/src/utils/http.ts
diff --git a/src/utils/httpHelper.ts b/src/utils/httpHelper.ts
diff --git a/src/utils/tools.ts b/src/utils/tools.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export default class Dashboard extends React.Component {`
`5`	`5`	`return <div>`
`6`	`6`	`<p>Welcome to Dashboard!</p>`
`7`	`7`	`<div>GraphQL Application. </div>`
`8`		`- <p style={{width: '400PX', height: 40, fontSize: '24px'}}>测试rem</p>`
	`8`	`+ {/* <p style={{width: '400px', height: '40PX', fontSize: '24px'}}>测试rem</p> */}`
`9`	`9`	`<div>66px</div>`
`10`	`10`	`</div>`
`11`	`11`	`}`