Home Explore Help
Register Sign In
usoft
/
uas-office-integration
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

wuyx 6 years ago
parent
ae00e60200 0a99aea0ae
commit
455a376773
16 changed files with 316 additions and 234 deletions
Split View Show Diff Stats
  1. BIN
      uas-office-web/wxuasapproval/node_modules.tgz
  2. 1 1
      uas-office-web/wxuasapproval/package.json
  3. 4 2
      uas-office-web/wxuasapproval/public/index.html
  4. 35 0
      uas-office-web/wxuasapproval/src/components/PageLoading.jsx
  5. 15 10
      uas-office-web/wxuasapproval/src/configs/router.config.js
  6. 62 63
      uas-office-web/wxuasapproval/src/index.js
  7. 35 15
      uas-office-web/wxuasapproval/src/pages/approval/Approval.jsx
  8. 8 3
      uas-office-web/wxuasapproval/src/pages/approval/ApprovalAdd.jsx
  9. 2 2
      uas-office-web/wxuasapproval/src/pages/approval/ApprovalHome.jsx
  10. 106 106
      uas-office-web/wxuasapproval/src/redux/actions/homeState.js
  11. 2 2
      uas-office-web/wxuasapproval/src/redux/reducers/redHomeState.js
  12. 1 1
      uas-office-web/wxuasapproval/src/redux/reducers/redSearchState.js
  13. 22 0
      uas-office-web/wxuasapproval/src/utils/PageLoadable.js
  14. 0 0
      uas-office-web/wxuasapproval/src/utils/browser-polyfill.min.js
  15. 1 0
      uas-office-web/wxuasapproval/src/utils/browser.min.js
  16. 22 29
      uas-office-web/wxuasapproval/yarn.lock

BIN
uas-office-web/wxuasapproval/node_modules.tgz
View File


+ 1 - 1
uas-office-web/wxuasapproval/package.json
View File 

@@ -6,7 +6,6 @@
 
   "dependencies": {

     "@antv/data-set": "^0.11.1",

     "antd-mobile": "^2.3.1",

-    "babel-polyfill": "^6.26.0",

     "bizcharts": "^3.5.7",

     "js-cookie": "^2.2.1",

     "moment": "^2.22.2",

@@ -15,6 +14,7 @@
 
     "react-dom": "^16.12.0",

     "react-file-viewer": "^1.2.1",

     "react-infinite-scroller": "^1.2.4",

+    "react-loadable": "^5.5.0",

     "react-redux": "^7.2.0",

     "react-router-dom": "^5.1.2",

     "react-scripts": "3.4.0",

+ 4 - 2
uas-office-web/wxuasapproval/public/index.html
View File 

@@ -19,7 +19,9 @@
 
       work correctly both with client-side routing and a non-root public URL.
 
       Learn how to configure a non-root public URL by running `npm run build`.
 
     -->
 
-    <script src = "https://cdn.polyfill.io/v2/polyfill.min.js"></script>
 
+    <!--    <script type="text/javascript" src ="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>-->
 
+    <!--    <script type="text/javascript" src="../src/utils/browser-polyfill.min.js"/>-->
 
+    <!--    <script type="text/javascript" src="../src/utils/browser.min.js"/>-->
 
     <script type="text/javascript">
 
       function GetQueryString (name) {
 
         let reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
 
@@ -40,7 +42,7 @@
 
         }
 
       }
 
     </script>
 
-    <title>优软科技</title>
 
+    <title>U审批</title>
 
 </head>
 
 <body>
 
 <noscript>

+ 35 - 0
uas-office-web/wxuasapproval/src/components/PageLoading.jsx
View File 

@@ -0,0 +1,35 @@
 
+/**

+ * Created by RaoMeng on 2020/3/4

+ * Desc: 页面加载组件

+ */

+

+import React, { Component } from 'react'

+import { ActivityIndicator } from 'antd-mobile'

+

+export default class PageLoading extends Component {

+

+  constructor () {

+    super()

+

+    this.state = {}

+  }

+

+  componentDidMount () {

+  }

+

+  render () {

+    return (

+      <div style={{

+        width: '100%',

+        height: '100%',

+        display: 'flex',

+        flexDirection: 'column',

+        alignItems: 'center',

+        justifyContent: 'center',

+      }}>

+        <ActivityIndicator size="large"/>

+        <span style={{ marginTop: 8 }}>页面加载中</span>

+      </div>

+    )

+  }

+}

+ 15 - 10
uas-office-web/wxuasapproval/src/configs/router.config.js
View File 

@@ -5,19 +5,22 @@ import {
 
   Redirect,
 
   Switch,
 
 } from 'react-router-dom'
 
-// import {browserHistory} from 'react-router'
 
 import BindPhone from '../pages/bindPhone/BindPhone'
 
-import Approval from '../pages/approval/Approval'
 
 import BindResult from '../pages/bindPhone/BindResult'
 
 import RedirectPage from '../pages/RedirectPage'
 
-import ApprovalHome from '../pages/approval/ApprovalHome'
 
 import UseStatus from '../pages/useStatus/UseStatus'
 
 import WorkSummary from '../pages/workSummary/WorkSummary'
 
-import ApprovalAdd from '../pages/approval/ApprovalAdd'
 
-import UasApproval from '../pages/approval/UasApproval'
 
 import DemoTrigger from '../pages/demoTrigger/DemoTrigger'
 
-export class Routes extends React.Component {
 
+import PageLoadable from '../utils/PageLoadable'
 
+import PageLoading from '../components/PageLoading'
 
+
 
+const UasApprovalPage = PageLoadable(import('@/pages/approval/UasApproval'),
 
+  PageLoading)
 
+const ApprovalHomePage = PageLoadable(import('@/pages/approval/ApprovalHome'))
 
+const ApprovalAddPage = PageLoadable(import('@/pages/approval/ApprovalAdd'))
 
+const ApprovalPage = PageLoadable(import('@/pages/approval/Approval'))
 
 
+export class Routes extends React.Component {
 
   componentWillUnmount () {
 
     let storage = window.localStorage
 
     storage.removeItem('paramJson')
 
@@ -29,14 +32,16 @@ export class Routes extends React.Component {
 
       <div style={{ width: '100%', height: '100%' }}>
 
         <Switch>
 
           {/*U审批过渡页面（入口页面）*/}
 
-          <Route path='/uasApproval/:master/:type?' component={UasApproval}/>
 
+          <Route path='/uasApproval/:master/:type?'
 
+                 component={UasApprovalPage}/>
 
           {/*U审批首页*/}
 
-          <Route path='/approvalHome/:master/:type?' component={ApprovalHome}/>
 
+          <Route path='/approvalHome/:master/:type?'
 
+                 component={ApprovalHomePage}/>
 
           {/*U审批详情页*/}
 
-          <Route path='/approval/:paramsStr?' component={Approval}/>
 
+          <Route path='/approval/:paramsStr?' component={ApprovalPage}/>
 
           {/*U审批新增页面*/}
 
           <Route path='/approvalAdd/:caller/:master/:id?'
 
-                 component={ApprovalAdd}/>
 
+                 component={ApprovalAddPage}/>
 
           <Route path='/redirect/:paramsStr?' component={RedirectPage}/>
 
 
           {/*<Route exact path='/bindPhone' component={BindPhone}/>*/}

+ 62 - 63
uas-office-web/wxuasapproval/src/index.js
View File 

@@ -1,63 +1,62 @@
 
-import React from 'react'
 
-import ReactDOM from 'react-dom'
 
-import './index.css'
 
-import * as serviceWorker from './serviceWorker'
 
-import { Provider } from 'react-redux'
 
-import store from './redux/store/store'
 
-import { persistor } from './redux/store/store'
 
-import { PersistGate } from 'redux-persist/lib/integration/react'
 
-import { Routes } from './configs/router.config'
 
-import zh_CN from 'antd/lib/locale-provider/zh_CN'
 
-import { ConfigProvider } from 'antd'
 
-import { LocaleProvider as MoLocaleProvider } from 'antd-mobile'
 
-import moment from 'moment'
 
-import 'moment/locale/zh-cn'
 
-import Promise from 'babel-polyfill'
 
-
 
-moment.locale('zh-cn')
 
-
 
-//解决在某些内核版本较低的浏览器上会出现的Object.assign is not a function错误
 
-if (typeof Object.assign != 'function') {
 
-  // Must be writable: true, enumerable: false, configurable: true
 
-  Object.defineProperty(Object, 'assign', {
 
-    value: function assign (target, varArgs) { // .length of function is 2
 
-      'use strict'
 
-      if (target == null) { // TypeError if undefined or null
 
-        throw new TypeError('Cannot convert undefined or null to object')
 
-      }
 
-
 
-      var to = Object(target)
 
-
 
-      for (var index = 1; index < arguments.length; index++) {
 
-        var nextSource = arguments[index]
 
-
 
-        if (nextSource != null) { // Skip over if undefined or null
 
-          for (var nextKey in nextSource) {
 
-            // Avoid bugs when hasOwnProperty is shadowed
 
-            if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
 
-              to[nextKey] = nextSource[nextKey]
 
-            }
 
-          }
 
-        }
 
-      }
 
-      return to
 
-    },
 
-    writable: true,
 
-    configurable: true,
 
-  })
 
-}
 
-
 
-ReactDOM.render(
 
-  <ConfigProvider locale={zh_CN}>
 
-    <Provider store={store}>
 
-      <PersistGate loading={null} persistor={persistor}>
 
-        <Routes/>
 
-      </PersistGate>
 
-    </Provider>
 
-  </ConfigProvider>
 
-  , document.getElementById('root'))
 
-
 
-// If you want your app to work offline and load faster, you can change
 
-// unregister() to register() below. Note this comes with some pitfalls.
 
-// Learn more about service workers: http://bit.ly/CRA-PWA
 
-serviceWorker.unregister()
 
+import React from 'react'

+import ReactDOM from 'react-dom'

+import './index.css'

+import * as serviceWorker from './serviceWorker'

+import { Provider } from 'react-redux'

+import store from './redux/store/store'

+import { persistor } from './redux/store/store'

+import { PersistGate } from 'redux-persist/lib/integration/react'

+import { Routes } from './configs/router.config'

+import zh_CN from 'antd/lib/locale-provider/zh_CN'

+import { ConfigProvider } from 'antd'

+import { LocaleProvider as MoLocaleProvider } from 'antd-mobile'

+import moment from 'moment'

+import 'moment/locale/zh-cn'

+

+moment.locale('zh-cn')

+

+//解决在某些内核版本较低的浏览器上会出现的Object.assign is not a function错误

+if (typeof Object.assign != 'function') {

+  // Must be writable: true, enumerable: false, configurable: true

+  Object.defineProperty(Object, 'assign', {

+    value: function assign (target, varArgs) { // .length of function is 2

+      'use strict'

+      if (target == null) { // TypeError if undefined or null

+        throw new TypeError('Cannot convert undefined or null to object')

+      }

+

+      var to = Object(target)

+

+      for (var index = 1; index < arguments.length; index++) {

+        var nextSource = arguments[index]

+

+        if (nextSource != null) { // Skip over if undefined or null

+          for (var nextKey in nextSource) {

+            // Avoid bugs when hasOwnProperty is shadowed

+            if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {

+              to[nextKey] = nextSource[nextKey]

+            }

+          }

+        }

+      }

+      return to

+    },

+    writable: true,

+    configurable: true,

+  })

+}

+

+ReactDOM.render(

+  <ConfigProvider locale={zh_CN}>

+    <Provider store={store}>

+      <PersistGate loading={null} persistor={persistor}>

+        <Routes/>

+      </PersistGate>

+    </Provider>

+  </ConfigProvider>

+  , document.getElementById('root'))

+

+// If you want your app to work offline and load faster, you can change

+// unregister() to register() below. Note this comes with some pitfalls.

+// Learn more about service workers: http://bit.ly/CRA-PWA

+serviceWorker.unregister()

+ 35 - 15
uas-office-web/wxuasapproval/src/pages/approval/Approval.jsx
View File 

@@ -31,6 +31,7 @@ import EnclosureItem from '../../components/enclosureItem/EnclosureItem'
 
 import { saveReceiveState } from '../../redux/actions/homeState'

 import EmployeeItem from '../../components/employeeItem/EmployeeItem'

 

+const operation = Modal.operation

 //==============================================================================================

 let mMaster, mSessionId, mEmcode, mNodeId, mType, mCachePoints

 let mApprovalRecord = new ApprovalRecordBean()

@@ -145,6 +146,7 @@ class Approval extends Component {
 
 

   componentWillUnmount () {

     Toast.hide()

+    this.moreOperation && this.moreOperation.close()

   }

 

   initData = () => {

@@ -425,34 +427,38 @@ class Approval extends Component {
 
                      height: '24px',

                    }}></div>

 

-              <div className={(approvalStatus === 0 && !takeoverAble)

-                ? 'menuItem'

-                : 'displayNone'}

-                   onClick={this.approvalChange}>变更

+              <div className={agreeAble ? 'menuItem' : 'displayNone'}

+                   onClick={this.approvalAgree}>同意

               </div>

-              <div className={(approvalStatus === 0 && !takeoverAble)

-                ? ''

-                : 'displayNone'}

+              <div className={agreeAble ? '' : 'displayNone'}

                    style={{

                      background: '#cccccc',

                      width: '1px',

                      height: '24px',

                    }}></div>

 

-              <div className={agreeAble ? 'menuItem' : 'displayNone'}

-                   onClick={this.approvalAgree}>同意

+              <div className={disagreeAble ? 'menuItem' : 'displayNone'}

+                   onClick={this.approvalDisagree}>不同意

               </div>

-              <div className={agreeAble ? '' : 'displayNone'}

+              <div className={disagreeAble ? '' : 'displayNone'}

                    style={{

                      background: '#cccccc',

                      width: '1px',

                      height: '24px',

                    }}></div>

 

-              <div className={disagreeAble ? 'menuItem' : 'displayNone'}

-                   onClick={this.approvalDisagree}>不同意

+              <div className={approvalStatus === 0 ? 'menuItem' : 'displayNone'}

+                   onClick={this.moreMenu}>更多

+              </div>

+

+              {/*<div className={(approvalStatus === 0 && !takeoverAble)

+                ? 'menuItem'

+                : 'displayNone'}

+                   onClick={this.approvalChange}>变更

               </div>

-              {/*<div className={disagreeAble ? '' : 'displayNone'}

+              <div className={(approvalStatus === 0 && !takeoverAble)

+                ? ''

+                : 'displayNone'}

                    style={{

                      background: '#cccccc',

                      width: '1px',

@@ -471,6 +477,20 @@ class Approval extends Component {
 
     </div>

   }

 

+  /**

+   * 弹出【更多】操作弹框

+   */

+  moreMenu = () => {

+    const { takeoverAble } = this.state

+    let actions = []

+

+    if (!takeoverAble) {

+      actions.push({ text: '变更处理人', onPress: this.approvalChange })

+    }

+    actions.push({ text: '下一条', onPress: this.loadNextProcess })

+    this.moreOperation = operation(actions)

+  }

+

   getChangeModal () {

     const {

       changeModalOpen,//变更处理人弹框是否显示

@@ -526,12 +546,12 @@ class Approval extends Component {
 
               mEmployeeList),

           })

         }}

-        onCancel={() => {

+        /*onCancel={value => {

           this.setState({

             changeDataSource: changeDataSource.cloneWithRows(

               mEmployeeList),

           })

-        }}

+        }}*/

       />

       <ListView

         dataSource={this.state.changeDataSource}

+ 8 - 3
uas-office-web/wxuasapproval/src/pages/approval/ApprovalAdd.jsx
View File 

@@ -55,7 +55,7 @@ let mShowBillModels, mFormBillModels, mUpdateBillModels, mAllBillModels
 
 

 let mBaseUrl = window.location.origin

   + (process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')

-// && 'http://yrkj.usoftchina.com:9443/uas'

+  // && 'http://yrkj.usoftchina.com:9443/uas'

 // && 'http://erp.yitoa.com:8888/ERP'

 // && 'http://29226oq576.qicp.vip/erp'

 

@@ -214,6 +214,10 @@ export default class ApprovalAdd extends Component {
 
                     strContain(item.value, value)

                     || strContain(item.display, value)

                     || strContain(item.name, value)

+                    || strContain(item.EM_CODE, value)

+                    || strContain(item.EM_NAME, value)

+                    || strContain(item.EM_POSITION, value)

+                    || strContain(item.EM_DEFAULTORNAME, value)

                   )) {

                   searchList.push(item)

                 }

@@ -231,12 +235,12 @@ export default class ApprovalAdd extends Component {
 
               mModalList),

           })

         }}

-        onCancel={() => {

+        /*onCancel={() => {

           this.setState({

             modalDataSource: modalDataSource.cloneWithRows(

               mModalList),

           })

-        }}

+        }}*/

       />

       <ListView

         dataSource={modalDataSource}

@@ -846,6 +850,7 @@ export default class ApprovalAdd extends Component {
 
 

             candidateList.push(candidate)

           })

+          mModalList = candidateList

           this.setState({

             modalDataSource: this.state.modalDataSource.cloneWithRows(

               candidateList),

+ 2 - 2
uas-office-web/wxuasapproval/src/pages/approval/ApprovalHome.jsx
View File 

@@ -240,13 +240,13 @@ class ApprovalHome extends Component {
 
   }

 

   /**

-   * 【我审批的】

+   * 【我的审批】

    * @returns {*}

    */

   getReceiveTab = () => {

     return (

       <TabBar.Item

-        title="我审批的"

+        title="我的审批"

         key="Receive"

         icon={<CustomIcon type='icon-receive'/>}

         selectedIcon={<CustomIcon type="icon-receive-selected"/>}

+ 106 - 106
uas-office-web/wxuasapproval/src/redux/actions/homeState.js
View File 

@@ -1,106 +1,106 @@
 
-/**
 
- * Created by RaoMeng on 2018/12/10
 
- * Desc: 列表数据缓存
 
- */
 
-
 
-import {
 
-  CLEAR_HOME_STATE,
 
-  CLEAR_NEW_STATE,
 
-  CLEAR_RECEIVE_STATE,
 
-  CLEAR_SEND_STATE,
 
-  FRESH_HOME_STATE,
 
-  NEW_TAB_STATE,
 
-  RECEIVE_TAB_STATE,
 
-  SEND_TAB_STATE,
 
-} from '../constants/actionTypes'
 
-import store from '../store/store'
 
-
 
-/**
 
- * 更新【新建】页面菜单数据
 
- * @param data
 
- * @returns {Function}
 
- */
 
-export const saveNewState = (data) => {
 
-  return () => {
 
-    store.dispatch({
 
-      type: NEW_TAB_STATE,
 
-      ...data,
 
-    })
 
-  }
 
-}
 
-
 
-/**
 
- * 更新【我审批的】页面菜单数据
 
- * @param data
 
- * @returns {Function}
 
- */
 
-export const saveReceiveState = (data) => {
 
-  return () => {
 
-    store.dispatch({
 
-      type: RECEIVE_TAB_STATE,
 
-      ...data,
 
-    })
 
-  }
 
-}
 
-
 
-/**
 
- * 更新【我发起的】页面菜单数据
 
- * @param data
 
- * @returns {Function}
 
- */
 
-export const saveSendState = (data) => {
 
-  return () => {
 
-    store.dispatch({
 
-      type: SEND_TAB_STATE,
 
-      ...data,
 
-    })
 
-  }
 
-}
 
-
 
-export const clearNewState = (data) => {
 
-  return () => {
 
-    store.dispatch({
 
-      type: CLEAR_NEW_STATE,
 
-      ...data,
 
-    })
 
-  }
 
-}
 
-
 
-export const clearReceiveState = (data) => {
 
-  return () => {
 
-    store.dispatch({
 
-      type: CLEAR_RECEIVE_STATE,
 
-      ...data,
 
-    })
 
-  }
 
-}
 
-
 
-export const clearSendState = (data) => {
 
-  return () => {
 
-    store.dispatch({
 
-      type: CLEAR_SEND_STATE,
 
-      ...data,
 
-    })
 
-  }
 
-}
 
-
 
-export const freshHomeState = (data) => {
 
-  return () => {
 
-    store.dispatch({
 
-      type: FRESH_HOME_STATE,
 
-      ...data,
 
-    })
 
-  }
 
-}
 
-
 
-/**
 
- * 清除列表状态
 
- * @returns {Function}
 
- */
 
-export const clearHomeState = () => {
 
-  return () => {
 
-    store.dispatch({
 
-      type: CLEAR_HOME_STATE,
 
-    })
 
-  }
 
-}
 
+/**

+ * Created by RaoMeng on 2018/12/10

+ * Desc: 列表数据缓存

+ */

+

+import {

+  CLEAR_HOME_STATE,

+  CLEAR_NEW_STATE,

+  CLEAR_RECEIVE_STATE,

+  CLEAR_SEND_STATE,

+  FRESH_HOME_STATE,

+  NEW_TAB_STATE,

+  RECEIVE_TAB_STATE,

+  SEND_TAB_STATE,

+} from '../constants/actionTypes'

+import store from '../store/store'

+

+/**

+ * 更新【新建】页面菜单数据

+ * @param data

+ * @returns {Function}

+ */

+export const saveNewState = (data) => {

+  return () => {

+    store.dispatch({

+      type: NEW_TAB_STATE,

+      ...data,

+    })

+  }

+}

+

+/**

+ * 更新【我的审批】页面菜单数据

+ * @param data

+ * @returns {Function}

+ */

+export const saveReceiveState = (data) => {

+  return () => {

+    store.dispatch({

+      type: RECEIVE_TAB_STATE,

+      ...data,

+    })

+  }

+}

+

+/**

+ * 更新【我发起的】页面菜单数据

+ * @param data

+ * @returns {Function}

+ */

+export const saveSendState = (data) => {

+  return () => {

+    store.dispatch({

+      type: SEND_TAB_STATE,

+      ...data,

+    })

+  }

+}

+

+export const clearNewState = (data) => {

+  return () => {

+    store.dispatch({

+      type: CLEAR_NEW_STATE,

+      ...data,

+    })

+  }

+}

+

+export const clearReceiveState = (data) => {

+  return () => {

+    store.dispatch({

+      type: CLEAR_RECEIVE_STATE,

+      ...data,

+    })

+  }

+}

+

+export const clearSendState = (data) => {

+  return () => {

+    store.dispatch({

+      type: CLEAR_SEND_STATE,

+      ...data,

+    })

+  }

+}

+

+export const freshHomeState = (data) => {

+  return () => {

+    store.dispatch({

+      type: FRESH_HOME_STATE,

+      ...data,

+    })

+  }

+}

+

+/**

+ * 清除列表状态

+ * @returns {Function}

+ */

+export const clearHomeState = () => {

+  return () => {

+    store.dispatch({

+      type: CLEAR_HOME_STATE,

+    })

+  }

+}

+ 2 - 2
uas-office-web/wxuasapproval/src/redux/reducers/redHomeState.js
View File 

@@ -60,7 +60,7 @@ const redHomeState = (state = initListState, action) => {
 
         },

       }

     case RECEIVE_TAB_STATE:

-      //更新【我审批的】数据

+      //更新【我的审批】数据

       return {

         ...state,

         receiveState: {

@@ -87,7 +87,7 @@ const redHomeState = (state = initListState, action) => {
 
         },

       }

     case CLEAR_RECEIVE_STATE:

-      //清除[我审批的]数据

+      //清除[我的审批]数据

       return {

         ...state,

         receiveState: {

+ 1 - 1
uas-office-web/wxuasapproval/src/redux/reducers/redSearchState.js
View File 

@@ -41,7 +41,7 @@ const redSearchState = (state = initSearchState, action) => {
 
 

   switch (action.type) {

     case RECEIVE_TAB_STATE:

-      //更新【我审批的】搜索数据

+      //更新【我的审批】搜索数据

       return {

         ...state,

         receiveState: {

+ 22 - 0
uas-office-web/wxuasapproval/src/utils/PageLoadable.js
View File 

@@ -0,0 +1,22 @@
 
+/**

+ * Created by RaoMeng on 2020/3/4

+ * Desc: react-loadable方式加载页面，加快页面渲染速度

+ */

+

+import React from 'react'

+import Loadable from 'react-loadable'

+

+const defaultLoading = () => {

+  return (

+    <div></div>

+  )

+}

+

+export default (loadPage, loading = defaultLoading) => {

+  return Loadable({

+    loader: () => {

+      return loadPage

+    },

+    loading,

+  })

+}

File diff suppressed because it is too large
+ 0 - 0
uas-office-web/wxuasapproval/src/utils/browser-polyfill.min.js


File diff suppressed because it is too large
+ 1 - 0
uas-office-web/wxuasapproval/src/utils/browser.min.js


+ 22 - 29
uas-office-web/wxuasapproval/yarn.lock
View File 

@@ -2408,15 +2408,6 @@ babel-plugin-transform-react-remove-prop-types@0.4.24:
 
   resolved "https://registry.npm.taobao.org/babel-plugin-transform-react-remove-prop-types/download/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"

   integrity sha1-8u2vm0xqX75cHWeL+1MQeMFVXzo=

 

-babel-polyfill@^6.26.0:

-  version "6.26.0"

-  resolved "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"

-  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=

-  dependencies:

-    babel-runtime "^6.26.0"

-    core-js "^2.5.0"

-    regenerator-runtime "^0.10.5"

-

 babel-preset-jest@^24.9.0:

   version "24.9.0"

   resolved "https://registry.npm.taobao.org/babel-preset-jest/download/babel-preset-jest-24.9.0.tgz?cache=0&sync_timestamp=1579655020730&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-preset-jest%2Fdownload%2Fbabel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"

@@ -3497,7 +3488,7 @@ core-js@^1.0.0:
 
   resolved "https://registry.npm.taobao.org/core-js/download/core-js-1.2.7.tgz?cache=0&sync_timestamp=1578957006406&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"

   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=

 

-core-js@^2.4.0, core-js@^2.5.0:

+core-js@^2.4.0:

   version "2.6.11"

   resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.11.tgz?cache=0&sync_timestamp=1578957006406&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"

   integrity sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw=

@@ -10253,7 +10244,7 @@ promzard@^0.3.0:
 
   dependencies:

     read "1"

 

-prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:

+prop-types@15.x, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:

   version "15.7.2"

   resolved "https://registry.npm.taobao.org/prop-types/download/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"

   integrity sha1-UsQedbjIfnK52TYOAga5ncv/psU=

@@ -10997,15 +10988,15 @@ react-dev-utils@^10.2.0:
 
     strip-ansi "6.0.0"

     text-table "0.2.0"

 

-react-dom@^16.5.2:

-  version "16.12.0"

-  resolved "https://registry.npm.taobao.org/react-dom/download/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"

-  integrity sha1-DaS3FLjRPCA4yTlrVKkrrqYz/hE=

+react-dom@^16.12.0:

+  version "16.13.0"

+  resolved "https://registry.npm.taobao.org/react-dom/download/react-dom-16.13.0.tgz?cache=0&sync_timestamp=1583281678644&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-dom%2Fdownload%2Freact-dom-16.13.0.tgz#cdde54b48eb9e8a0ca1b3dc9943d9bb409b81866"

+  integrity sha1-zd5UtI656KDKGz3JlD2btAm4GGY=

   dependencies:

     loose-envify "^1.1.0"

     object-assign "^4.1.1"

     prop-types "^15.6.2"

-    scheduler "^0.18.0"

+    scheduler "^0.19.0"

 

 react-error-overlay@^6.0.6:

   version "6.0.6"

@@ -11053,6 +11044,13 @@ react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
 
   resolved "https://registry.npm.taobao.org/react-lifecycles-compat/download/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"

   integrity sha1-TxonOv38jzSIqMUWv9p4+HI1I2I=

 

+react-loadable@^5.5.0:

+  version "5.5.0"

+  resolved "https://registry.npm.taobao.org/react-loadable/download/react-loadable-5.5.0.tgz#582251679d3da86c32aae2c8e689c59f1196d8c4"

+  integrity sha1-WCJRZ509qGwyquLI5onFnxGW2MQ=

+  dependencies:

+    prop-types "^15.5.0"

+

 react-native-swipeout@^2.2.2:

   version "2.3.6"

   resolved "https://registry.npm.taobao.org/react-native-swipeout/download/react-native-swipeout-2.3.6.tgz#47dac8a835825cf3f2eef9e495574a3d9ab6d3fa"

@@ -11201,10 +11199,10 @@ react-visibility-sensor@^5.0.2:
 
   dependencies:

     prop-types "^15.7.2"

 

-react@^16.5.2:

-  version "16.12.0"

-  resolved "https://registry.npm.taobao.org/react/download/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"

-  integrity sha1-DAqcahQkKeNhSDTVp3jhiqeKC4M=

+react@^16.12.0:

+  version "16.13.0"

+  resolved "https://registry.npm.taobao.org/react/download/react-16.13.0.tgz?cache=0&sync_timestamp=1583281666405&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact%2Fdownload%2Freact-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7"

+  integrity sha1-0EbqvN9k5Fe77tHnkuI14bmTTPc=

   dependencies:

     loose-envify "^1.1.0"

     object-assign "^4.1.1"

@@ -11402,11 +11400,6 @@ regenerate@^1.4.0:
 
   resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"

   integrity sha1-SoVuxLVuQHfFV1icroXnpMiGmhE=

 

-regenerator-runtime@^0.10.5:

-  version "0.10.5"

-  resolved "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"

-  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=

-

 regenerator-runtime@^0.11.0:

   version "0.11.1"

   resolved "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"

@@ -12010,10 +12003,10 @@ saxes@^3.1.9:
 
   dependencies:

     xmlchars "^2.1.1"

 

-scheduler@^0.18.0:

-  version "0.18.0"

-  resolved "https://registry.npm.taobao.org/scheduler/download/scheduler-0.18.0.tgz?cache=0&sync_timestamp=1582245752231&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fscheduler%2Fdownload%2Fscheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"

-  integrity sha1-WQGtZlm8HY8/2vNut6Z7DWdGscQ=

+scheduler@^0.19.0:

+  version "0.19.0"

+  resolved "https://registry.npm.taobao.org/scheduler/download/scheduler-0.19.0.tgz#a715d56302de403df742f4a9be11975b32f5698d"

+  integrity sha1-pxXVYwLeQD33QvSpvhGXWzL1aY0=

   dependencies:

     loose-envify "^1.1.0"

     object-assign "^4.1.1"

Some files were not shown because too many files changed in this diff