From 31ec63f0419895876cbaba99637a884a32d33d0d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 01 九月 2021 10:31:45 +0800 Subject: [PATCH] 2021-09-01 --- src/templates/zshare/modalform/index.jsx | 4 src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx | 4 src/menu/components/share/markcomponent/index.jsx | 2 src/mob/components/tabs/antv-tabs/options.jsx | 2 src/menu/components/card/balcony/options.jsx | 2 src/tabviews/zshare/settingcomponent/index.jsx | 2 src/menu/components/share/actioncomponent/dragaction/index.jsx | 2 src/templates/sharecomponent/tablecomponent/index.jsx | 4 src/menu/components/chart/antv-dashboard/chartcompile/formconfig.jsx | 2 src/pc/components/login/wrapsetting/settingform/index.jsx | 4 src/tabviews/commontable/index.jsx | 2 src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx | 2 src/menu/components/form/formaction/formconfig.jsx | 4 src/tabviews/custom/components/card/cardcellList/index.jsx | 12 src/tabviews/custom/components/card/prop-card/index.jsx | 2 src/menu/components/share/searchcomponent/dragsearch/index.jsx | 2 src/templates/formtabconfig/settingform/index.jsx | 4 src/menu/components/carousel/data-card/options.jsx | 2 src/menu/components/card/cardcellcomponent/index.jsx | 4 src/menu/components/card/data-card/options.jsx | 2 src/components/editor/index.jsx | 4 src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 2 src/tabviews/custom/components/table/normal-table/index.jsx | 2 src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx | 2 src/mob/searchconfig/searchdragelement/card.jsx | 2 src/menu/components/group/groupsetting/settingform/index.jsx | 2 src/menu/components/search/main-search/dragsearch/card.jsx | 2 src/menu/components/tabs/antv-tabs/options.jsx | 2 src/mob/components/menubar/normal-menubar/menucomponent/options.jsx | 2 src/tabviews/custom/components/chart/antv-pie/index.jsx | 2 src/tabviews/custom/components/share/braftContent/index.jsx | 4 src/tabviews/zshare/mutilform/index.jsx | 7 src/menu/components/share/actioncomponent/actionform/index.jsx | 2 src/pc/components/navbar/normal-navbar/wrapsetting/settingform/index.jsx | 2 src/tabviews/zshare/mutilform/mkTextArea/index.jsx | 4 src/menu/components/table/normal-table/wrapsetting/settingform/index.jsx | 2 src/tabviews/zshare/cardcomponent/index.jsx | 4 src/templates/zshare/modalform/modaleditable/index.jsx | 6 src/views/login/loginform.jsx | 2 src/views/printTemplate/index.jsx | 2 src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 2 src/menu/components/card/cardcellcomponent/dragaction/index.jsx | 2 src/templates/comtableconfig/index.jsx | 2 src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 2 src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 2 src/menu/components/card/cardsimplecomponent/options.jsx | 4 src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx | 2 src/tabviews/tabmanage/mutilform/index.jsx | 2 src/api/index.js | 2 src/tabviews/subtable/index.jsx | 2 src/menu/sysinterface/index.jsx | 2 src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx | 4 src/menu/sysinterface/settingform/baseform/index.jsx | 2 src/views/interface/workspace/request/index.jsx | 4 src/views/pcdesign/index.jsx | 2 src/pc/quotecomponent/settingform/index.jsx | 2 src/menu/datasource/verifycard/settingform/index.jsx | 2 src/templates/sharecomponent/tabscomponent/tabform/index.jsx | 2 src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 2 src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx | 2 src/menu/components/share/actioncomponent/index.jsx | 4 src/templates/sharecomponent/actioncomponent/dragaction/index.jsx | 2 src/menu/components/share/copycomponent/index.jsx | 2 src/menu/components/tabs/tabsetting/settingform/index.jsx | 2 src/pc/createview/settingform/index.jsx | 2 src/views/login/index.jsx | 6 src/menu/picturecontroller/index.jsx | 2 src/tabviews/custom/components/code/sand-box/index.jsx | 2 src/templates/zshare/editTable/index.jsx | 2 src/menu/components/editor/braft-editor/options.jsx | 2 src/menu/components/search/main-search/wrapsetting/settingform/index.jsx | 2 src/tabviews/zshare/normalTable/index.jsx | 20 +- src/menu/components/tree/antd-tree/wrapsetting/settingform/index.jsx | 2 public/options.json | 12 src/menu/components/share/searchcomponent/dragsearch/card.jsx | 2 src/menu/components/table/normal-table/columns/editColumn/index.jsx | 2 src/menu/components/form/formaction/index.jsx | 2 src/views/billprint/index.jsx | 2 src/templates/formtabconfig/dragelement/card.jsx | 2 src/menu/components/code/sandbox/options.jsx | 2 src/views/mobdesign/index.jsx | 2 src/views/interface/history/index.jsx | 6 src/views/menudesign/index.jsx | 2 src/tabviews/custom/components/card/data-card/index.jsx | 4 src/mob/colorsketch/index.jsx | 30 ++- src/tabviews/zshare/calendar/index.jsx | 2 src/menu/components/code/sandbox/codecontent/index.jsx | 4 src/menu/components/share/actioncomponent/formconfig.jsx | 2 src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 2 src/templates/zshare/pasteform/index.jsx | 2 src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx | 2 src/router/index.js | 2 src/mob/searchconfig/settingform/index.jsx | 2 src/tabviews/custom/components/carousel/prop-card/index.jsx | 2 src/menu/components/form/normal-form/options.jsx | 2 src/menu/components/card/cardcomponent/options.jsx | 4 src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 2 src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 4 src/menu/components/share/sourcecomponent/inputform/index.jsx | 6 src/components/header/index.jsx | 2 src/templates/formtabconfig/index.jsx | 2 src/tabviews/zshare/chartcomponent/index.jsx | 2 src/mob/components/topbar/normal-navbar/options.jsx | 2 src/views/rolemanage/index.jsx | 4 src/tabviews/custom/components/carousel/data-card/index.jsx | 2 src/tabviews/zshare/mutilform/mkSelect/index.jsx | 16 + src/templates/sharecomponent/columncomponent/colspanform/index.jsx | 2 src/tabviews/custom/components/share/normalTable/index.jsx | 14 src/menu/urlfieldcomponent/settingform/index.jsx | 2 src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx | 2 src/utils/utils.js | 4 src/index.js | 4 src/views/sso/index.jsx | 6 src/menu/components/search/main-search/dragsearch/index.jsx | 2 src/templates/zshare/formconfig.jsx | 8 src/templates/formtabconfig/actionform/index.jsx | 2 src/tabviews/zshare/actionList/printbutton/index.jsx | 4 src/menu/components/card/cardcellcomponent/formconfig.jsx | 2 src/templates/sharecomponent/actioncomponent/index.jsx | 8 src/tabviews/tabmanage/index.jsx | 2 src/tabviews/zshare/fileupload/index.jsx | 2 src/components/barcode/index.jsx | 2 src/templates/sharecomponent/columncomponent/columnform/index.jsx | 2 123 files changed, 220 insertions(+), 201 deletions(-) diff --git a/public/options.json b/public/options.json index f6bbbcb..7ca016a 100644 --- a/public/options.json +++ b/public/options.json @@ -1,16 +1,16 @@ { - "appId": "20200603163557423A7A4FF7915AC4F2D90DE", - "appkey": "202006011452123805E10CF76EC964C4C9C42", + "appId": "201912040924165801464FF1788654BC5AC73", + "appkey": "20191106103859640976D6E924E464D029CF0", "mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars", "systemType": "", - "externalDatabase": "", + "externalDatabase": "false", "lineColor": "", "filter": "false", "defaultApp": "", "defaultLang": "zh-CN", "WXAppID": "", "debugger": false, - "licenseKey": "", - "host": "http://demo.mk9h.cn", - "service": "qm_owt/" + "licenseKey": "E1A8FE", + "host": "http://qingqiumarket.cn", + "service": "mkwms/" } \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index eca6130..88876da 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -792,7 +792,7 @@ } resolve() } - } catch { + } catch (e) { resolve({ ErrCode: 'E', ErrMesg: '鏂囦欢瑙f瀽閿欒', diff --git a/src/components/barcode/index.jsx b/src/components/barcode/index.jsx index 001e63e..488ed7a 100644 --- a/src/components/barcode/index.jsx +++ b/src/components/barcode/index.jsx @@ -44,7 +44,7 @@ lineColor: style.color || '#000000' }) this.setState({error: false}) - } catch { + } catch (e) { this.setState({error: true}) } diff --git a/src/components/editor/index.jsx b/src/components/editor/index.jsx index 3cfc203..e18f2b8 100644 --- a/src/components/editor/index.jsx +++ b/src/components/editor/index.jsx @@ -48,7 +48,7 @@ if (initVal) { try { initVal = window.decodeURIComponent(window.atob(initVal)) - } catch { + } catch (e) { initVal = this.props['data-__meta'].initialValue || null } } @@ -72,7 +72,7 @@ if (encryption === 'true') { try { val = window.btoa(window.encodeURIComponent(val)) - } catch { + } catch (e) { val = editorState.toHTML() } } diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx index 9ba0be0..1485833 100644 --- a/src/components/header/index.jsx +++ b/src/components/header/index.jsx @@ -341,7 +341,7 @@ _param.Full_Name = sessionStorage.getItem('Full_Name') trdItem.src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch { + } catch (e) { console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') } } diff --git a/src/index.js b/src/index.js index 33c70d3..d6c0ef7 100644 --- a/src/index.js +++ b/src/index.js @@ -50,7 +50,7 @@ let res = JSON.parse(sessionStorage.getItem('loginError')) console.info(res.request) console.info(res.response) - } catch {} + } catch (e) {} } sessionStorage.removeItem('isEditState') sessionStorage.removeItem('loginError') @@ -154,7 +154,7 @@ if (GLOB.style && styles[GLOB.style]) { document.body.className = styles[GLOB.style] + ' ' + (GLOB.showline === 'false' ? 'hidden-split-line' : '') } - } catch { + } catch (e) { console.warn('Parse Failure') } } diff --git a/src/menu/components/card/balcony/options.jsx b/src/menu/components/card/balcony/options.jsx index 06e8c95..5adf31f 100644 --- a/src/menu/components/card/balcony/options.jsx +++ b/src/menu/components/card/balcony/options.jsx @@ -13,7 +13,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx index 64bb8d9..bc62df0 100644 --- a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx +++ b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx @@ -52,7 +52,7 @@ try { _val = window.btoa(window.encodeURIComponent(JSON.stringify(_val))) - } catch { + } catch (e) { console.warn('Stringify Failure') _val = '' } diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx index 92ccfc4..16a2ff6 100644 --- a/src/menu/components/card/cardcellcomponent/formconfig.jsx +++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx @@ -35,7 +35,7 @@ if (appMenus) { try { appMenus = JSON.parse(appMenus) - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx index 7287712..5a141d1 100644 --- a/src/menu/components/card/cardcellcomponent/index.jsx +++ b/src/menu/components/card/cardcellcomponent/index.jsx @@ -267,7 +267,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { @@ -283,7 +283,7 @@ if (menulist) { try { menulist = JSON.parse(menulist) - } catch { + } catch (e) { menulist = [] } } else { diff --git a/src/menu/components/card/cardcomponent/options.jsx b/src/menu/components/card/cardcomponent/options.jsx index 431e2be..ec3a3ce 100644 --- a/src/menu/components/card/cardcomponent/options.jsx +++ b/src/menu/components/card/cardcomponent/options.jsx @@ -12,7 +12,7 @@ if (appmenulist) { try { appmenulist = JSON.parse(appmenulist) - } catch { + } catch (e) { appmenulist = [] } } else { @@ -23,7 +23,7 @@ if (menulist) { try { menulist = JSON.parse(menulist) - } catch { + } catch (e) { menulist = [] } } else { diff --git a/src/menu/components/card/cardsimplecomponent/options.jsx b/src/menu/components/card/cardsimplecomponent/options.jsx index bb414a4..3337cc2 100644 --- a/src/menu/components/card/cardsimplecomponent/options.jsx +++ b/src/menu/components/card/cardsimplecomponent/options.jsx @@ -70,7 +70,7 @@ if (appmenulist) { try { appmenulist = JSON.parse(appmenulist) - } catch { + } catch (e) { appmenulist = [] } } else { @@ -81,7 +81,7 @@ if (menulist) { try { menulist = JSON.parse(menulist) - } catch { + } catch (e) { menulist = [] } } else { diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx index c02de20..6f8db7b 100644 --- a/src/menu/components/card/data-card/options.jsx +++ b/src/menu/components/card/data-card/options.jsx @@ -14,7 +14,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/carousel/data-card/options.jsx b/src/menu/components/carousel/data-card/options.jsx index 76bef49..6aa1852 100644 --- a/src/menu/components/carousel/data-card/options.jsx +++ b/src/menu/components/carousel/data-card/options.jsx @@ -8,7 +8,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx index 42099ee..f6a8420 100644 --- a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx +++ b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx @@ -30,7 +30,7 @@ // return item // }) // } - // } catch { + // } catch (e) { // menulist = [] // } // } else { @@ -41,7 +41,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/chart/antv-dashboard/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-dashboard/chartcompile/formconfig.jsx index 335df94..121440f 100644 --- a/src/menu/components/chart/antv-dashboard/chartcompile/formconfig.jsx +++ b/src/menu/components/chart/antv-dashboard/chartcompile/formconfig.jsx @@ -12,7 +12,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx index 20a3b61..1d23172 100644 --- a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx +++ b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx @@ -28,7 +28,7 @@ return item }) } - } catch { + } catch (e) { menulist = [] } } else { @@ -39,7 +39,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx index 20b0331..f63fa94 100644 --- a/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx +++ b/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx @@ -7,7 +7,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/code/sandbox/codecontent/index.jsx b/src/menu/components/code/sandbox/codecontent/index.jsx index c178772..306fd59 100644 --- a/src/menu/components/code/sandbox/codecontent/index.jsx +++ b/src/menu/components/code/sandbox/codecontent/index.jsx @@ -40,7 +40,7 @@ try { // eslint-disable-next-line no-eval eval(js) - } catch { + } catch (e) { message.warning(name + 'JS 鎵ц澶辫触锛�') } } @@ -66,7 +66,7 @@ try { // eslint-disable-next-line no-eval eval(nextProps.js) - } catch { + } catch (e) { message.warning(nextProps.name + 'JS 鎵ц澶辫触锛�') } } diff --git a/src/menu/components/code/sandbox/options.jsx b/src/menu/components/code/sandbox/options.jsx index 31f5585..3576742 100644 --- a/src/menu/components/code/sandbox/options.jsx +++ b/src/menu/components/code/sandbox/options.jsx @@ -8,7 +8,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/editor/braft-editor/options.jsx b/src/menu/components/editor/braft-editor/options.jsx index ec4e0fe..b5054fc 100644 --- a/src/menu/components/editor/braft-editor/options.jsx +++ b/src/menu/components/editor/braft-editor/options.jsx @@ -8,7 +8,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx index 808208b..f6e1da1 100644 --- a/src/menu/components/form/formaction/formconfig.jsx +++ b/src/menu/components/form/formaction/formconfig.jsx @@ -25,7 +25,7 @@ try { menulist = JSON.parse(menulist) menulist = menulist.map(item => ({value: item.MenuID, text: item.MenuName})) - } catch { + } catch (e) { menulist = [] } } else { @@ -37,7 +37,7 @@ if (menulist) { try { menulist = JSON.parse(menulist) - } catch { + } catch (e) { menulist = [] } } else { diff --git a/src/menu/components/form/formaction/index.jsx b/src/menu/components/form/formaction/index.jsx index a1819fd..ee7376e 100644 --- a/src/menu/components/form/formaction/index.jsx +++ b/src/menu/components/form/formaction/index.jsx @@ -88,7 +88,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { diff --git a/src/menu/components/form/normal-form/options.jsx b/src/menu/components/form/normal-form/options.jsx index 1d8278c..93a7c7a 100644 --- a/src/menu/components/form/normal-form/options.jsx +++ b/src/menu/components/form/normal-form/options.jsx @@ -9,7 +9,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/group/groupsetting/settingform/index.jsx b/src/menu/components/group/groupsetting/settingform/index.jsx index bfbacf7..e706af1 100644 --- a/src/menu/components/group/groupsetting/settingform/index.jsx +++ b/src/menu/components/group/groupsetting/settingform/index.jsx @@ -22,7 +22,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/search/main-search/dragsearch/card.jsx b/src/menu/components/search/main-search/dragsearch/card.jsx index 9a93ae5..788cdbd 100644 --- a/src/menu/components/search/main-search/dragsearch/card.jsx +++ b/src/menu/components/search/main-search/dragsearch/card.jsx @@ -53,7 +53,7 @@ try { let _initval = JSON.parse(card.initval) _defaultValue = [moment().subtract(_initval[0], 'days'), moment().subtract(_initval[1], 'days')] - } catch { + } catch (e) { _defaultValue = [null, null] } } diff --git a/src/menu/components/search/main-search/dragsearch/index.jsx b/src/menu/components/search/main-search/dragsearch/index.jsx index ae6179e..ad3fb82 100644 --- a/src/menu/components/search/main-search/dragsearch/index.jsx +++ b/src/menu/components/search/main-search/dragsearch/index.jsx @@ -52,7 +52,7 @@ try { _val.uuid = Utils.getuuid() _val = window.btoa(window.encodeURIComponent(JSON.stringify(_val))) - } catch { + } catch (e) { console.warn('Stringify Failure') _val = '' } diff --git a/src/menu/components/search/main-search/wrapsetting/settingform/index.jsx b/src/menu/components/search/main-search/wrapsetting/settingform/index.jsx index 1789480..7e8715c 100644 --- a/src/menu/components/search/main-search/wrapsetting/settingform/index.jsx +++ b/src/menu/components/search/main-search/wrapsetting/settingform/index.jsx @@ -21,7 +21,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx index 58d7a25..c5ebebb 100644 --- a/src/menu/components/share/actioncomponent/actionform/index.jsx +++ b/src/menu/components/share/actioncomponent/actionform/index.jsx @@ -215,7 +215,7 @@ try { let _form = document.getElementById('label') _form && _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/menu/components/share/actioncomponent/dragaction/index.jsx b/src/menu/components/share/actioncomponent/dragaction/index.jsx index afa3b70..b2fdd05 100644 --- a/src/menu/components/share/actioncomponent/dragaction/index.jsx +++ b/src/menu/components/share/actioncomponent/dragaction/index.jsx @@ -68,7 +68,7 @@ try { _val = window.btoa(window.encodeURIComponent(JSON.stringify(_val))) - } catch { + } catch (e) { console.warn('Stringify Failure') _val = '' } diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx index acdf56d..04945f0 100644 --- a/src/menu/components/share/actioncomponent/formconfig.jsx +++ b/src/menu/components/share/actioncomponent/formconfig.jsx @@ -75,7 +75,7 @@ if (appMenus) { try { appMenus = JSON.parse(appMenus) - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx index 189990a..948d70d 100644 --- a/src/menu/components/share/actioncomponent/index.jsx +++ b/src/menu/components/share/actioncomponent/index.jsx @@ -160,7 +160,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { @@ -176,7 +176,7 @@ if (menulist) { try { menulist = JSON.parse(menulist) - } catch { + } catch (e) { menulist = [] } } else { diff --git a/src/menu/components/share/copycomponent/index.jsx b/src/menu/components/share/copycomponent/index.jsx index a4c90ed..8c34118 100644 --- a/src/menu/components/share/copycomponent/index.jsx +++ b/src/menu/components/share/copycomponent/index.jsx @@ -19,7 +19,7 @@ try { _val = window.btoa(window.encodeURIComponent(JSON.stringify(copycard))) - } catch { + } catch (e) { message.warning('澶嶅埗澶辫触锛岃閲嶈瘯锛�') _val = '' } diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx index 4518ab6..2a736fe 100644 --- a/src/menu/components/share/markcomponent/index.jsx +++ b/src/menu/components/share/markcomponent/index.jsx @@ -299,7 +299,7 @@ } else { item.fontColor = '' } - } catch { + } catch (e) { item.fontColor = '' } } diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx index d0d41c2..a484993 100644 --- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx +++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx @@ -50,7 +50,7 @@ try { let _initval = JSON.parse(card.initval) _defaultValue = [moment().subtract(_initval[0], 'days'), moment().subtract(_initval[1], 'days')] - } catch { + } catch (e) { _defaultValue = [null, null] } } diff --git a/src/menu/components/share/searchcomponent/dragsearch/index.jsx b/src/menu/components/share/searchcomponent/dragsearch/index.jsx index 3164a2b..36d7603 100644 --- a/src/menu/components/share/searchcomponent/dragsearch/index.jsx +++ b/src/menu/components/share/searchcomponent/dragsearch/index.jsx @@ -46,7 +46,7 @@ try { _val.uuid = Utils.getuuid() _val = window.btoa(window.encodeURIComponent(JSON.stringify(_val))) - } catch { + } catch (e) { console.warn('Stringify Failure') _val = '' } diff --git a/src/menu/components/share/sourcecomponent/inputform/index.jsx b/src/menu/components/share/sourcecomponent/inputform/index.jsx index cb5888a..7518cf2 100644 --- a/src/menu/components/share/sourcecomponent/inputform/index.jsx +++ b/src/menu/components/share/sourcecomponent/inputform/index.jsx @@ -48,7 +48,7 @@ if (_form && _form.focus) { _form.focus() } - } catch {} + } catch (e) {} } shouldComponentUpdate (nextProps, nextState) { @@ -63,14 +63,14 @@ let videos = sessionStorage.getItem('app_videos') try { originlist = JSON.parse(videos) - } catch { + } catch (e) { originlist = [] } } else { let pictures = sessionStorage.getItem('app_pictures') try { originlist = JSON.parse(pictures) - } catch { + } catch (e) { originlist = [] } } diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx index c362bd8..e2b4ae1 100644 --- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx +++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx @@ -13,7 +13,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { @@ -31,7 +31,7 @@ if (menulist) { try { menulist = JSON.parse(menulist) - } catch { + } catch (e) { menulist = [] } } else { diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx index d5450d3..3f7bee9 100644 --- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx +++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx @@ -65,7 +65,7 @@ try { let _form = document.getElementById('label') _form && _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/menu/components/table/normal-table/wrapsetting/settingform/index.jsx b/src/menu/components/table/normal-table/wrapsetting/settingform/index.jsx index f42f1a5..049e55c 100644 --- a/src/menu/components/table/normal-table/wrapsetting/settingform/index.jsx +++ b/src/menu/components/table/normal-table/wrapsetting/settingform/index.jsx @@ -23,7 +23,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/tabs/antv-tabs/options.jsx b/src/menu/components/tabs/antv-tabs/options.jsx index c18ca35..db65e1c 100644 --- a/src/menu/components/tabs/antv-tabs/options.jsx +++ b/src/menu/components/tabs/antv-tabs/options.jsx @@ -8,7 +8,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/tabs/tabsetting/settingform/index.jsx b/src/menu/components/tabs/tabsetting/settingform/index.jsx index a8190c2..95b3f8b 100644 --- a/src/menu/components/tabs/tabsetting/settingform/index.jsx +++ b/src/menu/components/tabs/tabsetting/settingform/index.jsx @@ -22,7 +22,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/components/tree/antd-tree/wrapsetting/settingform/index.jsx b/src/menu/components/tree/antd-tree/wrapsetting/settingform/index.jsx index d1a1479..08958d3 100644 --- a/src/menu/components/tree/antd-tree/wrapsetting/settingform/index.jsx +++ b/src/menu/components/tree/antd-tree/wrapsetting/settingform/index.jsx @@ -21,7 +21,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx index a460ba1..f5b54bd 100644 --- a/src/menu/datasource/verifycard/settingform/index.jsx +++ b/src/menu/datasource/verifycard/settingform/index.jsx @@ -47,7 +47,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { diff --git a/src/menu/picturecontroller/index.jsx b/src/menu/picturecontroller/index.jsx index 638ef3d..ca809f7 100644 --- a/src/menu/picturecontroller/index.jsx +++ b/src/menu/picturecontroller/index.jsx @@ -42,7 +42,7 @@ pictures = JSON.parse(pictures) videos = JSON.parse(videos) colorlist = JSON.parse(colorlist) - } catch { + } catch (e) { pictures = [] videos = [] colorlist = [] diff --git a/src/menu/sysinterface/index.jsx b/src/menu/sysinterface/index.jsx index 0232ce8..0837130 100644 --- a/src/menu/sysinterface/index.jsx +++ b/src/menu/sysinterface/index.jsx @@ -75,7 +75,7 @@ try { msg = window.btoa(window.encodeURIComponent(JSON.stringify(msg))) - } catch { + } catch (e) { console.warn('Stringify Failure') msg = '' } diff --git a/src/menu/sysinterface/settingform/baseform/index.jsx b/src/menu/sysinterface/settingform/baseform/index.jsx index 431a905..8364ae0 100644 --- a/src/menu/sysinterface/settingform/baseform/index.jsx +++ b/src/menu/sysinterface/settingform/baseform/index.jsx @@ -27,7 +27,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { diff --git a/src/menu/urlfieldcomponent/settingform/index.jsx b/src/menu/urlfieldcomponent/settingform/index.jsx index 6dd6c93..4d2bfa1 100644 --- a/src/menu/urlfieldcomponent/settingform/index.jsx +++ b/src/menu/urlfieldcomponent/settingform/index.jsx @@ -36,7 +36,7 @@ if (_input.focus) { _input.focus() } - } catch { + } catch (e) { console.warn('focus error锛�') } } diff --git a/src/mob/colorsketch/index.jsx b/src/mob/colorsketch/index.jsx index 6070b13..afa975a 100644 --- a/src/mob/colorsketch/index.jsx +++ b/src/mob/colorsketch/index.jsx @@ -36,19 +36,25 @@ initVal = value } - let _colors = sessionStorage.getItem('app_colors') || [] - try { - _colors = JSON.parse(_colors) - } catch { - _colors = [] - } - - let colors = presetColors.map((item, i) => { - if (_colors[i] && _colors[i].linkurl && !presetColors.includes(_colors[i].linkurl)) { - return _colors[i].linkurl + let _colors = sessionStorage.getItem('app_colors') + let colors = presetColors + + if (_colors && _colors !== '[]') { + try { + _colors = JSON.parse(_colors) + } catch (e) { + _colors = null } - return item - }) + + if (_colors) { + colors = presetColors.map((item, i) => { + if (_colors[i] && _colors[i].linkurl && !presetColors.includes(_colors[i].linkurl)) { + return _colors[i].linkurl + } + return item + }) + } + } this.setState({color: initVal, allowClear: allowClear === true, colors}) } diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx index a035065..f69c651 100644 --- a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx +++ b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx @@ -7,7 +7,7 @@ if (menulist) { try { menulist = JSON.parse(menulist) - } catch { + } catch (e) { menulist = [] } } else { diff --git a/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx b/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx index 2c1173d..ebc060f 100644 --- a/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx +++ b/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx @@ -25,7 +25,7 @@ if (appMenus) { try { appMenus = JSON.parse(appMenus) - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/mob/components/tabs/antv-tabs/options.jsx b/src/mob/components/tabs/antv-tabs/options.jsx index c18ca35..db65e1c 100644 --- a/src/mob/components/tabs/antv-tabs/options.jsx +++ b/src/mob/components/tabs/antv-tabs/options.jsx @@ -8,7 +8,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/mob/components/topbar/normal-navbar/options.jsx b/src/mob/components/topbar/normal-navbar/options.jsx index d32a47c..5fdef0b 100644 --- a/src/mob/components/topbar/normal-navbar/options.jsx +++ b/src/mob/components/topbar/normal-navbar/options.jsx @@ -7,7 +7,7 @@ if (menulist) { try { menulist = JSON.parse(menulist) - } catch { + } catch (e) { menulist = [] } } else { diff --git a/src/mob/searchconfig/searchdragelement/card.jsx b/src/mob/searchconfig/searchdragelement/card.jsx index 5a4b632..97e27f9 100644 --- a/src/mob/searchconfig/searchdragelement/card.jsx +++ b/src/mob/searchconfig/searchdragelement/card.jsx @@ -86,7 +86,7 @@ try { let _initval = JSON.parse(card.initval) value = [moment().subtract(_initval[0], 'days').format('YYYY-MM-DD'), moment().subtract(_initval[1], 'days').format('YYYY-MM-DD')].join(' ~ ') - } catch { + } catch (e) { value = '璇烽�夋嫨' } } diff --git a/src/mob/searchconfig/settingform/index.jsx b/src/mob/searchconfig/settingform/index.jsx index 8949a75..619d7b3 100644 --- a/src/mob/searchconfig/settingform/index.jsx +++ b/src/mob/searchconfig/settingform/index.jsx @@ -21,7 +21,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/pc/components/login/wrapsetting/settingform/index.jsx b/src/pc/components/login/wrapsetting/settingform/index.jsx index cf36b2f..a5eeeda 100644 --- a/src/pc/components/login/wrapsetting/settingform/index.jsx +++ b/src/pc/components/login/wrapsetting/settingform/index.jsx @@ -24,7 +24,7 @@ if (msgTemps) { try { msgTemps = JSON.parse(msgTemps) - } catch { + } catch (e) { msgTemps = [] } } else { @@ -35,7 +35,7 @@ if (appMenus) { try { appMenus = JSON.parse(appMenus) - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx b/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx index 1a29300..77f1387 100644 --- a/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx +++ b/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx @@ -22,7 +22,7 @@ if (appMenus) { try { appMenus = JSON.parse(appMenus) - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx index 2206100..9e71f6e 100644 --- a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx +++ b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx @@ -22,7 +22,7 @@ if (appMenus) { try { appMenus = JSON.parse(appMenus) - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/pc/components/navbar/normal-navbar/wrapsetting/settingform/index.jsx b/src/pc/components/navbar/normal-navbar/wrapsetting/settingform/index.jsx index 3d066a8..61d30f0 100644 --- a/src/pc/components/navbar/normal-navbar/wrapsetting/settingform/index.jsx +++ b/src/pc/components/navbar/normal-navbar/wrapsetting/settingform/index.jsx @@ -26,7 +26,7 @@ if (appMenus) { try { appMenus = JSON.parse(appMenus) - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/pc/createview/settingform/index.jsx b/src/pc/createview/settingform/index.jsx index 87ee449..f0be993 100644 --- a/src/pc/createview/settingform/index.jsx +++ b/src/pc/createview/settingform/index.jsx @@ -18,7 +18,7 @@ if (appMenus) { try { appMenus = JSON.parse(appMenus) - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/pc/quotecomponent/settingform/index.jsx b/src/pc/quotecomponent/settingform/index.jsx index afadc00..e575e0d 100644 --- a/src/pc/quotecomponent/settingform/index.jsx +++ b/src/pc/quotecomponent/settingform/index.jsx @@ -19,7 +19,7 @@ try { appMenus = JSON.parse(appMenus) appMenus = appMenus.filter(item => item.keys_type !== 'index') - } catch { + } catch (e) { appMenus = [] } } else { diff --git a/src/router/index.js b/src/router/index.js index 9220007..65d856c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -71,7 +71,7 @@ document.body.className = styles[_param.mstyle] } } - } catch { + } catch (e) { console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') } diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx index 4e49783..a4658c6 100644 --- a/src/tabviews/commontable/index.jsx +++ b/src/tabviews/commontable/index.jsx @@ -757,7 +757,7 @@ } return item }) - } catch { + } catch (e) { console.warn('鏁版嵁鏌ヨ閿欒') } } diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx index 57972fe..0230708 100644 --- a/src/tabviews/custom/components/card/cardcellList/index.jsx +++ b/src/tabviews/custom/components/card/cardcellList/index.jsx @@ -162,7 +162,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -173,7 +173,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -236,7 +236,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -247,7 +247,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -583,7 +583,7 @@ try { // eslint-disable-next-line _val = eval(_val) - } catch { + } catch (e) { _val = 0 } @@ -599,7 +599,7 @@ try { // eslint-disable-next-line _val = eval(_val) - } catch { + } catch (e) { _val = 0 } diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx index 943a158..5ec9396 100644 --- a/src/tabviews/custom/components/card/data-card/index.jsx +++ b/src/tabviews/custom/components/card/data-card/index.jsx @@ -429,7 +429,7 @@ return item } }) - } catch { + } catch (e) { console.warn('鏁版嵁鏌ヨ閿欒') } } @@ -598,7 +598,7 @@ _param.User_Name = sessionStorage.getItem('User_Name') _param.param = { BID: item.$$uuid } src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch { + } catch (e) { console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') } } else if (card.setting.joint === 'true') { diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx index d00a06d..c5d6183 100644 --- a/src/tabviews/custom/components/card/prop-card/index.jsx +++ b/src/tabviews/custom/components/card/prop-card/index.jsx @@ -388,7 +388,7 @@ _param.User_Name = sessionStorage.getItem('User_Name') _param.param = { BID: item.setting.primaryId } src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch { + } catch (e) { console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') } } else if (item.setting.joint === 'true') { diff --git a/src/tabviews/custom/components/carousel/data-card/index.jsx b/src/tabviews/custom/components/carousel/data-card/index.jsx index 8e744fc..1999138 100644 --- a/src/tabviews/custom/components/carousel/data-card/index.jsx +++ b/src/tabviews/custom/components/carousel/data-card/index.jsx @@ -298,7 +298,7 @@ _param.User_Name = sessionStorage.getItem('User_Name') _param.param = { BID: item.$$uuid } src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch { + } catch (e) { console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') } } else if (card.setting.joint === 'true') { diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx index 392ac7a..73c44cb 100644 --- a/src/tabviews/custom/components/carousel/prop-card/index.jsx +++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx @@ -295,7 +295,7 @@ _param.User_Name = sessionStorage.getItem('User_Name') _param.param = { BID: item.setting.primaryId } src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch { + } catch (e) { console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') } } else if (item.setting.joint === 'true') { diff --git a/src/tabviews/custom/components/chart/antv-pie/index.jsx b/src/tabviews/custom/components/chart/antv-pie/index.jsx index 145efac..1132d75 100644 --- a/src/tabviews/custom/components/chart/antv-pie/index.jsx +++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx @@ -984,7 +984,7 @@ tabs.push(newtab) this.props.modifyTabview(tabs) }) - } catch { + } catch (e) { console.warn('鑿滃崟鎵撳紑澶辫触锛�') } }) diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx index 1fd9fa9..508932b 100644 --- a/src/tabviews/custom/components/code/sand-box/index.jsx +++ b/src/tabviews/custom/components/code/sand-box/index.jsx @@ -195,7 +195,7 @@ try { // eslint-disable-next-line no-eval eval(js) - } catch { + } catch (e) { console.warn('JS 鎵ц澶辫触锛�') } } diff --git a/src/tabviews/custom/components/share/braftContent/index.jsx b/src/tabviews/custom/components/share/braftContent/index.jsx index ccf8cc9..527e61f 100644 --- a/src/tabviews/custom/components/share/braftContent/index.jsx +++ b/src/tabviews/custom/components/share/braftContent/index.jsx @@ -21,7 +21,7 @@ if (encryption === 'true' && html) { try { html = window.decodeURIComponent(window.atob(html)) - } catch { + } catch (e) { html = value } } @@ -37,7 +37,7 @@ if (encryption === 'true' && html) { try { html = window.decodeURIComponent(window.atob(html)) - } catch { + } catch (e) { html = value } } diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx index 9cabfa1..80ee2da 100644 --- a/src/tabviews/custom/components/share/normalTable/index.jsx +++ b/src/tabviews/custom/components/share/normalTable/index.jsx @@ -51,7 +51,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -62,7 +62,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -120,7 +120,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -131,7 +131,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -223,7 +223,7 @@ if (isNaN(content)) { content = '' } - } catch { + } catch (e) { content = '' } @@ -332,7 +332,7 @@ try { _param = window.btoa(_quary) - } catch { + } catch (e) { _param = window.btoa(window.encodeURIComponent(_quary)) } @@ -594,7 +594,7 @@ _param.User_Name = sessionStorage.getItem('User_Name') _param.param = __param src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch { + } catch (e) { console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') } } else { diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx index cd57cff..8494aee 100644 --- a/src/tabviews/custom/components/table/normal-table/index.jsx +++ b/src/tabviews/custom/components/table/normal-table/index.jsx @@ -263,7 +263,7 @@ } return item }) - } catch { + } catch (e) { console.warn('鏁版嵁鏌ヨ閿欒') } } diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx index 0a0b845..929b19f 100644 --- a/src/tabviews/subtable/index.jsx +++ b/src/tabviews/subtable/index.jsx @@ -695,7 +695,7 @@ } return item }) - } catch { + } catch (e) { console.warn('鏁版嵁鏌ヨ閿欒') } } diff --git a/src/tabviews/tabmanage/index.jsx b/src/tabviews/tabmanage/index.jsx index 5d37c1d..5274ea9 100644 --- a/src/tabviews/tabmanage/index.jsx +++ b/src/tabviews/tabmanage/index.jsx @@ -282,7 +282,7 @@ btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp) _LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_LongParam))) - } catch { + } catch (e) { console.warn('Stringify Failure') _LongParam = '' } diff --git a/src/tabviews/tabmanage/mutilform/index.jsx b/src/tabviews/tabmanage/mutilform/index.jsx index e3b4434..962ffb7 100644 --- a/src/tabviews/tabmanage/mutilform/index.jsx +++ b/src/tabviews/tabmanage/mutilform/index.jsx @@ -19,7 +19,7 @@ if (_form && _form.select) { _form.select() } - } catch { + } catch (e) { console.warn('focus error锛�') } } diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx index c151133..0143fc7 100644 --- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx +++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx @@ -525,7 +525,7 @@ this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'}) } } - } catch { + } catch (e) { this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'}) } } diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx index ac9fa04..2902392 100644 --- a/src/tabviews/zshare/actionList/printbutton/index.jsx +++ b/src/tabviews/zshare/actionList/printbutton/index.jsx @@ -504,7 +504,7 @@ // if (event.data) { // try { // data = JSON.parse(event.data) - // } catch { + // } catch (e) { // notification.warning({ // top: 92, // message: event.data, @@ -1129,7 +1129,7 @@ if (event.data) { try { data = JSON.parse(event.data) - } catch { + } catch (e) { this.execError({ ErrCode: 'N', message: event.data, diff --git a/src/tabviews/zshare/calendar/index.jsx b/src/tabviews/zshare/calendar/index.jsx index fa32a93..eb5899f 100644 --- a/src/tabviews/zshare/calendar/index.jsx +++ b/src/tabviews/zshare/calendar/index.jsx @@ -164,7 +164,7 @@ if ((colors[0] * 0.299 + colors[1] * 0.578 + colors[2] * 0.114) * colors[3] < 192) { style.color = '#ffffff' } - } catch {} + } catch (e) {} } return style diff --git a/src/tabviews/zshare/cardcomponent/index.jsx b/src/tabviews/zshare/cardcomponent/index.jsx index ecd2146..a689085 100644 --- a/src/tabviews/zshare/cardcomponent/index.jsx +++ b/src/tabviews/zshare/cardcomponent/index.jsx @@ -244,7 +244,7 @@ if (isNaN(originVal) || isNaN(contrastVal)) { originVal = '' } - } catch { + } catch (e) { originVal = '' } } @@ -331,7 +331,7 @@ if (isNaN(content)) { content = '' } - } catch { + } catch (e) { content = '' } } diff --git a/src/tabviews/zshare/chartcomponent/index.jsx b/src/tabviews/zshare/chartcomponent/index.jsx index 83628bc..231654d 100644 --- a/src/tabviews/zshare/chartcomponent/index.jsx +++ b/src/tabviews/zshare/chartcomponent/index.jsx @@ -78,7 +78,7 @@ percentFields.push(_column.label) } }) - } catch { + } catch (e) { console.warn('Incorrect percentage setting') } } diff --git a/src/tabviews/zshare/fileupload/index.jsx b/src/tabviews/zshare/fileupload/index.jsx index 32ecbc4..8ae0028 100644 --- a/src/tabviews/zshare/fileupload/index.jsx +++ b/src/tabviews/zshare/fileupload/index.jsx @@ -48,7 +48,7 @@ origin: true } }) - } catch { + } catch (e) { filelist = [] } } diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx index 758ade1..fd2798c 100644 --- a/src/tabviews/zshare/mutilform/index.jsx +++ b/src/tabviews/zshare/mutilform/index.jsx @@ -324,7 +324,7 @@ } // 涓嬬骇琛ㄥ崟鎺у埗-瀛楁鍐欏叆 - if ((['select', 'radio'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true')) && item.linkSubField) { + if ((['select', 'radio', 'link'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true')) && item.linkSubField) { item.subFields = [] item.linkSubField.forEach(m => { let n = fieldMap.get(m) @@ -549,9 +549,10 @@ if (item.type === 'link') { _cell.ParentID = cell[item.linkField] === undefined ? '' : cell[item.linkField] - } else if (item.subFields) { + } + if (item.subFields) { item.subFields.forEach(m => { - _cell[m.field] = (cell[m.field] || cell[m.field] === 0) ? cell[m.field] : '' + _cell[m.field] = cell[m.field] === undefined ? '' : cell[m.field] }) } diff --git a/src/tabviews/zshare/mutilform/mkSelect/index.jsx b/src/tabviews/zshare/mutilform/mkSelect/index.jsx index d754520..6a0b59d 100644 --- a/src/tabviews/zshare/mutilform/mkSelect/index.jsx +++ b/src/tabviews/zshare/mutilform/mkSelect/index.jsx @@ -79,14 +79,26 @@ const { config } = this.state let options = config.oriOptions.filter(option => option.ParentID === parentId || option.value === '') - let val = options[0] ? options[0].value : '' + let _option = options[0] || null + let val = _option ? _option.value : '' this.setState({ options, value: val }) - this.props.onChange(val) + let other = {} + + if (config.subFields && _option) { + config.subFields.forEach((n, i) => { + other[n.field] = _option[n.field] + setTimeout(() => { + MKEmitter.emit('mkFC', 'input', n.uuid, _option[n.field]) + }, i * 5) + }) + } + + this.props.onChange(val, other) if (level < 7 && config.linkFields) { config.linkFields.forEach((m, i) => { diff --git a/src/tabviews/zshare/mutilform/mkTextArea/index.jsx b/src/tabviews/zshare/mutilform/mkTextArea/index.jsx index 48429fc..04886c9 100644 --- a/src/tabviews/zshare/mutilform/mkTextArea/index.jsx +++ b/src/tabviews/zshare/mutilform/mkTextArea/index.jsx @@ -30,7 +30,7 @@ if (_value) { try { _value = window.decodeURIComponent(window.atob(_value)) - } catch { + } catch (e) { _value = config.initval } } @@ -73,7 +73,7 @@ if (encryption === 'true') { try { _val = window.btoa(window.encodeURIComponent(_val)) - } catch { + } catch (e) { _val = val } } diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx index 21feaa5..3f2291d 100644 --- a/src/tabviews/zshare/normalTable/index.jsx +++ b/src/tabviews/zshare/normalTable/index.jsx @@ -261,7 +261,7 @@ _param.User_Name = sessionStorage.getItem('User_Name') _param.param = __param src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch { + } catch (e) { console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') } } else { @@ -310,7 +310,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -321,7 +321,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -452,7 +452,7 @@ if (isNaN(content)) { content = '' } - } catch { + } catch (e) { content = '' } } @@ -605,7 +605,7 @@ try { _param = window.btoa(_quary) - } catch { + } catch (e) { _param = window.btoa(window.encodeURIComponent(_quary)) } @@ -691,7 +691,7 @@ if (isNaN(content)) { content = '' } - } catch { + } catch (e) { content = '' } @@ -735,7 +735,7 @@ try { photos = record[col.field] + '' photos = photos.split(',').filter(Boolean) - } catch { + } catch (e) { photos = [] } @@ -790,7 +790,7 @@ try { _param = window.btoa(_quary) - } catch { + } catch (e) { _param = window.btoa(window.encodeURIComponent(_quary)) } @@ -1181,7 +1181,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } @@ -1192,7 +1192,7 @@ try { originVal = parseFloat(originVal) contrastVal = parseFloat(contrastVal) - } catch { + } catch (e) { originVal = NaN } diff --git a/src/tabviews/zshare/settingcomponent/index.jsx b/src/tabviews/zshare/settingcomponent/index.jsx index ecb0097..c877b05 100644 --- a/src/tabviews/zshare/settingcomponent/index.jsx +++ b/src/tabviews/zshare/settingcomponent/index.jsx @@ -329,7 +329,7 @@ let data = '' try { data = JSON.parse(event.data) - } catch { + } catch (e) { data = '' } diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx index cdb8a60..93f8c2d 100644 --- a/src/templates/comtableconfig/index.jsx +++ b/src/templates/comtableconfig/index.jsx @@ -682,7 +682,7 @@ }) }) _subconfig = window.btoa(window.encodeURIComponent(JSON.stringify(_subconfig))) - } catch { + } catch (e) { console.warn('Stringify Failure') _subconfig = '' } diff --git a/src/templates/formtabconfig/actionform/index.jsx b/src/templates/formtabconfig/actionform/index.jsx index db149bb..6fd1b18 100644 --- a/src/templates/formtabconfig/actionform/index.jsx +++ b/src/templates/formtabconfig/actionform/index.jsx @@ -110,7 +110,7 @@ try { let _form = document.getElementById('label') _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/templates/formtabconfig/dragelement/card.jsx b/src/templates/formtabconfig/dragelement/card.jsx index 859bf26..d2817df 100644 --- a/src/templates/formtabconfig/dragelement/card.jsx +++ b/src/templates/formtabconfig/dragelement/card.jsx @@ -67,7 +67,7 @@ try { let _initval = JSON.parse(card.initval) _defaultValue = [moment().subtract(_initval[0], 'days'), moment().subtract(_initval[1], 'days')] - } catch { + } catch (e) { _defaultValue = [null, null] } } diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx index c5bca12..e2aacac 100644 --- a/src/templates/formtabconfig/index.jsx +++ b/src/templates/formtabconfig/index.jsx @@ -498,7 +498,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { diff --git a/src/templates/formtabconfig/settingform/index.jsx b/src/templates/formtabconfig/settingform/index.jsx index 54c7b3a..1c1cdfe 100644 --- a/src/templates/formtabconfig/settingform/index.jsx +++ b/src/templates/formtabconfig/settingform/index.jsx @@ -43,7 +43,7 @@ return true } }) - } catch { + } catch (e) { notification.warning({ top: 92, message: '鑿滃崟淇℃伅閿欒锛�', @@ -55,7 +55,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx index ce565b1..dd10e46 100644 --- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx +++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx @@ -169,7 +169,7 @@ try { let _form = document.getElementById('label') _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/templates/sharecomponent/actioncomponent/dragaction/index.jsx b/src/templates/sharecomponent/actioncomponent/dragaction/index.jsx index df81400..36fdccb 100644 --- a/src/templates/sharecomponent/actioncomponent/dragaction/index.jsx +++ b/src/templates/sharecomponent/actioncomponent/dragaction/index.jsx @@ -66,7 +66,7 @@ try { _val.uuid = Utils.getuuid() _val = window.btoa(window.encodeURIComponent(JSON.stringify(_val))) - } catch { + } catch (e) { console.warn('Stringify Failure') _val = '' } diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx index f2e4b06..50cdb74 100644 --- a/src/templates/sharecomponent/actioncomponent/index.jsx +++ b/src/templates/sharecomponent/actioncomponent/index.jsx @@ -144,7 +144,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { @@ -308,7 +308,7 @@ _LongParam.setting.title = btn.label _LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_LongParam))) _temp = 'Modal' - } catch { + } catch (e) { console.warn('Stringify Failure') _temp = '' } @@ -328,7 +328,7 @@ }) _LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_LongParam))) _temp = 'FormTab' - } catch { + } catch (e) { console.warn('Stringify Failure') _temp = '' } @@ -522,7 +522,7 @@ btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp) _LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_tab))) - } catch { + } catch (e) { console.warn('Stringify Failure') _LongParam = '' _resolve('save') diff --git a/src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx b/src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx index 35b8a6a..86b99e9 100644 --- a/src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx +++ b/src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx @@ -237,7 +237,7 @@ try { let _form = document.getElementById('title') _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx index 653a136..029ee98 100644 --- a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx +++ b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx @@ -19,7 +19,7 @@ if (_form && _form.select) { _form.select() } - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/templates/sharecomponent/columncomponent/columnform/index.jsx b/src/templates/sharecomponent/columncomponent/columnform/index.jsx index 5932983..eaf0a25 100644 --- a/src/templates/sharecomponent/columncomponent/columnform/index.jsx +++ b/src/templates/sharecomponent/columncomponent/columnform/index.jsx @@ -64,7 +64,7 @@ try { let _form = document.getElementById('label') _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx index c0d3aa2..416646d 100644 --- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx +++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx @@ -53,7 +53,7 @@ try { let _initval = JSON.parse(card.initval) _defaultValue = [moment().subtract(_initval[0], 'days'), moment().subtract(_initval[1], 'days')] - } catch { + } catch (e) { _defaultValue = [null, null] } } diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx index d65fdec..0a4383f 100644 --- a/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx +++ b/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx @@ -52,7 +52,7 @@ try { _val.uuid = Utils.getuuid() _val = window.btoa(window.encodeURIComponent(JSON.stringify(_val))) - } catch { + } catch (e) { console.warn('Stringify Failure') _val = '' } diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx index 96c3459..377235b 100644 --- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx +++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx @@ -197,7 +197,7 @@ try { let _form = document.getElementById('label') _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx index d2ace67..0c63b49 100644 --- a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx +++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx @@ -28,7 +28,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx index 4c4b17a..8069d17 100644 --- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx +++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx @@ -37,7 +37,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx index 0ff4bcf..8c8f4b4 100644 --- a/src/templates/sharecomponent/tablecomponent/index.jsx +++ b/src/templates/sharecomponent/tablecomponent/index.jsx @@ -112,7 +112,7 @@ if (/^nvarchar/.test(_type)) { try { // 瀛樺湪max _length = +_type.match(/\d+/)[0] || 50 - } catch { + } catch (e) { _length = 2048 } _type = 'text' @@ -185,7 +185,7 @@ if (/^nvarchar/.test(_type)) { try { // 瀛樺湪max _length = +_type.match(/\d+/)[0] || 50 - } catch { + } catch (e) { _length = 2048 } _type = 'text' diff --git a/src/templates/sharecomponent/tabscomponent/tabform/index.jsx b/src/templates/sharecomponent/tabscomponent/tabform/index.jsx index 8f2cd9f..ba87b46 100644 --- a/src/templates/sharecomponent/tabscomponent/tabform/index.jsx +++ b/src/templates/sharecomponent/tabscomponent/tabform/index.jsx @@ -54,7 +54,7 @@ try { let _form = document.getElementById('label') _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx index caadc2b..208815c 100644 --- a/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx +++ b/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx @@ -33,7 +33,7 @@ if (usefulFields) { try { usefulFields = JSON.parse(usefulFields) - } catch { + } catch (e) { usefulFields = [] } } else { diff --git a/src/templates/zshare/editTable/index.jsx b/src/templates/zshare/editTable/index.jsx index b431aca..2d487c4 100644 --- a/src/templates/zshare/editTable/index.jsx +++ b/src/templates/zshare/editTable/index.jsx @@ -307,7 +307,7 @@ try { msg = window.btoa(window.encodeURIComponent(JSON.stringify(msg))) - } catch { + } catch (e) { console.warn('Stringify Failure') msg = '' } diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx index e260fa9..df6b386 100644 --- a/src/templates/zshare/formconfig.jsx +++ b/src/templates/zshare/formconfig.jsx @@ -292,7 +292,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { @@ -1394,7 +1394,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { @@ -1713,7 +1713,7 @@ if (roleList) { try { roleList = JSON.parse(roleList) - } catch { + } catch (e) { roleList = [] } } else { @@ -2175,7 +2175,7 @@ label: role.text } }) - } catch { + } catch (e) { roleList = [] } } else { diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx index c9b59d6..41c81ab 100644 --- a/src/templates/zshare/modalform/index.jsx +++ b/src/templates/zshare/modalform/index.jsx @@ -23,7 +23,7 @@ radio: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'setAll', 'emptyText', 'splitline', 'arrange'], checkcard: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'linkSubField', 'fieldlength', 'span', 'labelwidth', 'display', 'tooltip', 'extra', 'width', 'multiple', 'borderColor', 'splitline'], multiselect: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra'], - link: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'setAll', 'linkField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline'], + link: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'setAll', 'linkField', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline'], fileupload: ['readonly', 'required', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'tooltip', 'extra', 'compress', 'splitline'], switch: ['initval', 'openVal', 'closeVal', 'openText', 'closeText', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline'], date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline'], @@ -144,7 +144,7 @@ try { let _form = document.getElementById('label') _form.select() - } catch { + } catch (e) { console.warn('琛ㄥ崟focus澶辫触锛�') } } diff --git a/src/templates/zshare/modalform/modaleditable/index.jsx b/src/templates/zshare/modalform/modaleditable/index.jsx index 5b5a0a2..7944d0c 100644 --- a/src/templates/zshare/modalform/modaleditable/index.jsx +++ b/src/templates/zshare/modalform/modaleditable/index.jsx @@ -134,7 +134,7 @@ let fields = [] let dataItem = data[0] || '' - if (type === 'select' || type === 'radio') { + if (type === 'select' || type === 'radio' || type === 'link') { fields = linkSubFields.map(cell => { return { title: cell.label, @@ -233,7 +233,7 @@ if (isNaN(val)) { val = '' } - } catch { + } catch (e) { val = '' } } else { @@ -349,7 +349,7 @@ let dataItem = dataSource ? dataSource[0] : '' - if (type === 'select' || type === 'radio') { + if (type === 'select' || type === 'radio' || type === 'link') { fields = linkSubFields.map(field => { return { title: field.label, diff --git a/src/templates/zshare/pasteform/index.jsx b/src/templates/zshare/pasteform/index.jsx index 016a03f..b6c1af9 100644 --- a/src/templates/zshare/pasteform/index.jsx +++ b/src/templates/zshare/pasteform/index.jsx @@ -16,7 +16,7 @@ if (_form && _form.select) { _form.select() } - } catch { + } catch (e) { console.warn('Form focusing error锛�') } } diff --git a/src/utils/utils.js b/src/utils/utils.js index d3948e4..da742ae 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -261,7 +261,7 @@ let _initval = JSON.parse(item.initval) let _vals = [moment().subtract(_initval[0], 'days').format('YYYY-MM-DD'), moment().subtract(_initval[1], 'days').format('YYYY-MM-DD')] item.initval = _vals.join(',') - } catch { + } catch (e) { item.initval = '' } } @@ -309,7 +309,7 @@ } else if (_type === 'customized') { try { _val = JSON.parse(_val) - } catch { + } catch (e) { _val = [0, 0] } _dateRange = [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'), diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx index 38c9f1e..09bc613 100644 --- a/src/views/billprint/index.jsx +++ b/src/views/billprint/index.jsx @@ -48,7 +48,7 @@ }, () => { this.getMenuParam() }) - } catch { + } catch (e) { notification.warning({ top: 92, message: '鑿滃崟淇℃伅瑙f瀽閿欒锛�', diff --git a/src/views/interface/history/index.jsx b/src/views/interface/history/index.jsx index 9b0952c..96ab292 100644 --- a/src/views/interface/history/index.jsx +++ b/src/views/interface/history/index.jsx @@ -38,7 +38,7 @@ if (m.params) { try { m.params = JSON.parse(m.params) - } catch { + } catch (e) { m.params = [] } } else { @@ -48,7 +48,7 @@ if (m.headers) { try { m.headers = JSON.parse(m.headers) - } catch { + } catch (e) { m.headers = [] } } else { @@ -58,7 +58,7 @@ if (m.formData) { try { m.formData = JSON.parse(m.formData) - } catch { + } catch (e) { m.formData = [] } } else { diff --git a/src/views/interface/workspace/request/index.jsx b/src/views/interface/workspace/request/index.jsx index 90672df..5c2536c 100644 --- a/src/views/interface/workspace/request/index.jsx +++ b/src/views/interface/workspace/request/index.jsx @@ -96,7 +96,7 @@ if (config.raw) { try { raws = JSON.parse(config.raw) - } catch { + } catch (e) { Modal.error({ title: '鍙傛暟鏍煎紡閿欒锛屽繀椤讳负JSON鏍煎紡锛�' }) @@ -183,7 +183,7 @@ body = body.replace(/\n/ig, '<br/>') body = body.replace(/\s/ig, ' ') - } catch { + } catch (e) { body = null } } diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx index 6959bc1..8469483 100644 --- a/src/views/login/index.jsx +++ b/src/views/login/index.jsx @@ -450,7 +450,7 @@ try { localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify(systemMsg)))) - } catch { + } catch (e) { localStorage.removeItem(_url) } @@ -481,7 +481,7 @@ try { localStorage.setItem(_loginurl, window.btoa(window.encodeURIComponent(JSON.stringify(login_ways)))) - } catch { + } catch (e) { localStorage.removeItem(_loginurl) } @@ -553,7 +553,7 @@ if (loginWays) { try { loginWays = JSON.parse(window.decodeURIComponent(window.atob(loginWays))) - } catch { + } catch (e) { loginWays = null } diff --git a/src/views/login/loginform.jsx b/src/views/login/loginform.jsx index 4a5edd9..1813e99 100644 --- a/src/views/login/loginform.jsx +++ b/src/views/login/loginform.jsx @@ -194,7 +194,7 @@ if (_user) { try { _user = JSON.parse(window.decodeURIComponent(window.atob(_user))) - } catch { + } catch (e) { console.warn('Parse Failure') _user = '' } diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx index 65f4720..a058167 100644 --- a/src/views/menudesign/index.jsx +++ b/src/views/menudesign/index.jsx @@ -86,7 +86,7 @@ }, () => { this.getMenuParam() }) - } catch { + } catch (e) { notification.warning({ top: 92, message: '鑿滃崟淇℃伅瑙f瀽閿欒锛�', diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx index 843fbb0..36f4c49 100644 --- a/src/views/mobdesign/index.jsx +++ b/src/views/mobdesign/index.jsx @@ -108,7 +108,7 @@ this.getMenuParam(param) }) } - } catch { + } catch (e) { notification.warning({ top: 92, message: '鑿滃崟淇℃伅瑙f瀽閿欒锛�', diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx index 4550f57..3b64363 100644 --- a/src/views/pcdesign/index.jsx +++ b/src/views/pcdesign/index.jsx @@ -99,7 +99,7 @@ this.getMenuParam(param) }) } - } catch { + } catch (e) { notification.warning({ top: 92, message: '鑿滃崟淇℃伅瑙f瀽閿欒锛�', diff --git a/src/views/printTemplate/index.jsx b/src/views/printTemplate/index.jsx index af5cce2..8be5e6e 100644 --- a/src/views/printTemplate/index.jsx +++ b/src/views/printTemplate/index.jsx @@ -749,7 +749,7 @@ try { _config = window.btoa(window.encodeURIComponent(JSON.stringify(config))) - } catch { + } catch (e) { notification.warning({ top: 92, message: '缂栬瘧閿欒!', diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx index e9164c3..459e949 100644 --- a/src/views/rolemanage/index.jsx +++ b/src/views/rolemanage/index.jsx @@ -100,7 +100,7 @@ if (pageParam.type === 'navbar') { item.type = 'navbar' } - } catch { + } catch (e) { item.nodes = '' } } @@ -417,7 +417,7 @@ if (pageParam.type === 'navbar') { item.type = 'navbar' } - } catch { + } catch (e) { item.nodes = '' } } diff --git a/src/views/sso/index.jsx b/src/views/sso/index.jsx index 7af3a65..ee0c674 100644 --- a/src/views/sso/index.jsx +++ b/src/views/sso/index.jsx @@ -30,7 +30,7 @@ this.props.history.replace('/login') } this.getMessage() - } catch { + } catch (e) { this.props.history.replace('/login') } } @@ -67,7 +67,7 @@ try { localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify(systemMsg)))) - } catch { + } catch (e) { localStorage.removeItem(_url) } @@ -98,7 +98,7 @@ try { localStorage.setItem(_loginurl, window.btoa(window.encodeURIComponent(JSON.stringify(login_ways)))) - } catch { + } catch (e) { localStorage.removeItem(_loginurl) } -- Gitblit v1.8.0