centaline-data-driven-v3 0.0.89 → 0.0.91

package/src/main.js

@@ -30,10 +30,10 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: false,//是否app端
+    flagApp: true,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
-    showRequestErrorMessage: true,
+    showRequestErrorMessage: false,
     language: 'HK',
     handler: {
         // 打开tab页
@@ -68,7 +68,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
-                authObject: '{EmpID:"Token_2053032d-9248-494b-9295-12c2ddf81d22",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_2053032d-9248-494b-9295-12c2ddf81d22",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_19b970bd-bd37-4ded-853c-c0c001270a60",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_19b970bd-bd37-4ded-853c-c0c001270a60",Platform:"IOS"}',
             };
         },
         getToken() {

package/src/utils/common.js

@@ -285,7 +285,10 @@ const common = {
         showDialog({ title: '提示', message: message, closeOnClickOverlay: true, confirmButtonText: this.LocalizedString('确定', '確認'), className: 'showDialogMessage' });
       }
       else {
-        showToast(message);
+        showToast({
+          message: message,
+          duration: 3000,
+        });
       }
 
     }

package/src/utils/mixins.js

@@ -144,7 +144,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                         //action有值，提交到后台
                         if (field.action) {
                             if (common.flagApp()) {
-                                showLoadingToast({ message: '正在处理', forbidClick: true, duration: 100000 });
+                                showLoadingToast({ message:common.LocalizedString('正在处理', '正在處理') , forbidClick: true, duration: 100000 });
                             }
                             field.disabled = true;//提交按钮禁用
                             model.pageDisabled = true;
@@ -164,9 +164,6 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                         progressKey: res.content.key,
                                                         progressType: field.isExport ? 'export' : 'import',
                                                         onFinished(data) {
-                                                            if (common.flagApp()) {
-                                                                closeToast()
-                                                            }
                                                             field.disabled = false;
                                                             model.pageDisabled = false;
                                                             common.closeDialog(dialogOption);
@@ -197,9 +194,6 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                             model.$vue.emit('submit', { formData: model, responseData: data });
                                                         },
                                                         onError(data) {
-                                                            if (common.flagApp()) {
-                                                                closeToast()
-                                                            }
                                                             field.disabled = false;
                                                             model.pageDisabled = false;
                                                             common.closeDialog(dialogOption);
@@ -231,9 +225,6 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                                     progressKey: res202.content.key,
                                                                     progressType: field.isExport ? 'export' : 'import',
                                                                     onFinished(data) {
-                                                                        if (common.flagApp()) {
-                                                                            closeToast()
-                                                                        }
                                                                         field.disabled = false;
                                                                         model.pageDisabled = false;
                                                                         common.closeDialog(dialogOption);
@@ -264,9 +255,6 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                                         model.$vue.emit('submit', { formData: model, responseData: data });
                                                                     },
                                                                     onError(data) {
-                                                                        if (common.flagApp()) {
-                                                                            closeToast()
-                                                                        }
                                                                         field.disabled = false;
                                                                         model.pageDisabled = false;
                                                                         common.closeDialog(dialogOption);
@@ -280,9 +268,6 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                 }
                                             });
                                         }).catch(() => {
-                                            if (common.flagApp()) {
-                                                closeToast()
-                                            }
                                             field.disabled = false;
                                             model.pageDisabled = false;
                                         });
@@ -291,9 +276,6 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             }
                             else {
                                 field.doAction(model.$vue.getFormObj(), (data) => {
-                                    if (common.flagApp()) {
-                                        closeToast()
-                                    }
                                     field.disabled = false;
                                     model.pageDisabled = false;
                                     if (data.rtnCode === Enum.ReturnCode.Successful) {
@@ -442,12 +424,22 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
                 }
                 else if (field.isOpenUrlInBrowse) {// 浏览器打开
-                    window.open(submitData[field.submitFormField], "_blank");
+                    if(common.getDataDrivenOpts().handler.openUrlInBrowse){
+                        common.getDataDrivenOpts().handler.openUrlInBrowse(submitData[field.submitFormField]);
+                    }
+                    else{
+                        window.open(submitData[field.submitFormField], "_blank");
+                    }
                 }
                 else if (field.isBrowserNewTab) {// 浏览器打开
                     submitData = field.getActionPara(submitData).para;
                     let query = common.objectToQueryStr(submitData);
-                    window.open(action + query, "_blank");
+                    if(common.getDataDrivenOpts().handler.openUrlInBrowse){
+                        common.getDataDrivenOpts().handler.openUrlInBrowse(action + query);
+                    }
+                    else{
+                        window.open(action + query, "_blank");
+                    }
                 }
                 else if (field.isUrlInSystemTab) {//外部框架tab页打开URl
                     submitData = field.getActionPara(submitData).para;

package/src/utils/request.js

@@ -1,6 +1,7 @@
 import Axios from 'axios';
 import Enum from './Enum';
 import common from './common';
+import {  closeToast } from "vant";
 
 
 Axios.defaults.headers.post['Content-Type'] = 'application/json';
@@ -15,7 +16,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
+      url = url + (url == '' || url.substr(-1) == '/' ? '' : '/') + (params.action.charAt(0) == '/' ? params.action.substr(1) : params.action);
       params = params.para;
     }
     return Axios.get(url, params, {
@@ -34,7 +35,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
+      url = url + (url == '' || url.substr(-1) == '/' ? '' : '/') + (params.action.charAt(0) == '/' ? params.action.substr(1) : params.action);
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -48,6 +49,10 @@ const request = {
     );
   },
   postThenHandler: function (response, scripts) {
+    //移动端请求完 关闭正在处理弹层
+    if (common.flagApp()) {
+      closeToast()
+    }
     var data = response.data;
     if (typeof common.getDataDrivenOpts().handler.requestComplete === 'function') {
       common.getDataDrivenOpts().handler.requestComplete(response);
@@ -127,7 +132,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
+      url = url + (url == '' || url.substr(-1) == '/' ? '' : '/') + (params.action.charAt(0) == '/' ? params.action.substr(1) : params.action);
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -150,7 +155,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url == '' || url.substr(-1) == '/' ? '' : '/') + (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
+      url = url + (url == '' || url.substr(-1) == '/' ? '' : '/') + (params.action.charAt(0) == '/' ? params.action.substr(1) : params.action);
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -175,7 +180,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
+      url = url + (url == '' || url.substr(-1) == '/' ? '' : '/') + (params.action.charAt(0) == '/' ? params.action.substr(1) : params.action);
       params = params.para;
     }
     return Axios.post(url, params, {

package/src/views/SearchList.vue

@@ -1,15 +1,15 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
-       :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
+       :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
 
-       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
+       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist> -->
 
       
-      <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"
-      :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModelForMy'"></ct-searchlist> -->
+      <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/AttendanceClassList/getLayoutOfSearch'"
+      :searchDataApi="'/AttendanceClassList/getListOfSearchModel'"></ct-searchlist> -->
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>