From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/timeline/normal-timeline/index.jsx |   65 +++++++++++++++++++++++++-------
 1 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
index c4a13c7..1dbcafe 100644
--- a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
+++ b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
@@ -15,7 +15,6 @@
 
 class NormalTimeline extends Component {
   static propTpyes = {
-    BID: PropTypes.any,              // 鐖剁骇Id
     data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
     config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
     mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
@@ -28,7 +27,8 @@
     sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
     data: null,                // 鏁版嵁
     BData: '',
-    card: null
+    card: null,
+    description: false
   }
 
   /**
@@ -36,13 +36,25 @@
    * 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
    */
   UNSAFE_componentWillMount () {
-    const { data, initdata, BID, BData } = this.props
+    const { data, initdata } = this.props
     let _config = fromJS(this.props.config).toJS()
     let _cols = new Map()
 
     let _data = null
     let card = null
     let _sync = _config.setting.sync === 'true'
+
+    let BID = ''
+    let BData = ''
+
+    if (_config.setting.supModule) {
+      BData = window.GLOB.CacheData.get(_config.setting.supModule)
+    } else {
+      BData = window.GLOB.CacheData.get(_config.$pageId)
+    }
+    if (BData) {
+      BID = BData.$BID || ''
+    }
 
     if (_config.setting.sync === 'true' && data) {
       _data = data[_config.dataName] || []
@@ -190,7 +202,7 @@
    /**
    * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
    */
-  queryModuleParam = (menuId, btnId) => {
+  queryModuleParam = (menuId, callback) => {
     const { mainSearch } = this.props
     const { arr_field, config } = this.state
 
@@ -206,7 +218,7 @@
       })
     }
 
-    MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+    callback({
       arr_field: arr_field,
       orderBy: config.setting.order || '',
       search: searches,
@@ -217,11 +229,16 @@
   async loadData () {
     const { mainSearch } = this.props
     const { config, arr_field, BID, BData } = this.state
-
+    
     if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
       this.setState({
         data: [],
       })
+      return
+    }
+
+    if (config.setting.interType === 'inner' && config.setting.innerFunc === 'z_mk_express') {
+      this.getExpress()
       return
     }
 
@@ -239,11 +256,6 @@
     if (requireFields.length > 0) {
       return
     }
-
-    // if (config.setting.interType === 'inner' && config.setting.innerFunc === 'z_mk_express') {
-    //   this.getExpress()
-    //   return
-    // }
 
     this.setState({
       loading: true
@@ -278,16 +290,41 @@
   }
 
   getExpress = () => {
+    const { BData } = this.state
+
+    let code = ''
+    let order = ''
+    if (BData) {
+      Object.keys(BData).forEach(key => {
+        if (key.toLowerCase() === 'expresscode') {
+          code = BData[key]
+        } else if (key.toLowerCase() === 'expressno') {
+          order = BData[key]
+        }
+      })
+    }
+
+    if (!code || !order) {
+      notification.warning({
+        top: 92,
+        message: '鏈幏鍙栧埌蹇��' + (!code ? '鍏徃缂栫爜銆�' : '鍗曞彿銆�'),
+        duration: 5
+      })
+      return
+    }
+
     this.setState({
       loading: true
     })
-    Api.wxNginxRequest(`express/yuantong/YT6590674317601`, 'get').then(res => {
+    Api.wxNginxRequest(`express/${code}/${order}`, 'get').then(res => {
       if (!res || typeof(res) !== 'string') {
         notification.error({
           top: 92,
           message: '鏈幏鍙栧埌蹇�掍俊鎭�',
           duration: 10
         })
+      } else if (/鏌ヨ鏃犵粨鏋�/.test(res)) {
+        this.setState({description: res, data: [], loading: false})
       } else {
         let data = res.split(/\n/).filter(Boolean)
 
@@ -395,7 +432,7 @@
   }
 
   render() {
-    const { config, loading, data } = this.state
+    const { config, loading, data, description } = this.state
 
     return (
       <div className="normal-timeline-box" id={'anchor' + config.uuid} style={{...config.style}}>
@@ -413,7 +450,7 @@
           {data.map(item => this.getMknodes(item))}
         </div> : null}
         {data && data.length === 0 ? <div className="card-row-list" style={{height: config.wrap.contentHeight}}>
-          <Empty description={false}/>
+          <Empty description={description}/>
         </div> : null}
       </div>
     )

--
Gitblit v1.8.0