From 7662665a4f88da0f8afa804bd4a34dfbefc1fb56 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 29 八月 2025 15:17:59 +0800
Subject: [PATCH] get_pre_page_subtable_next_row
---
pages/modal/3200.vue | 723 +++++++++++++++++++++----------------------------------
1 files changed, 275 insertions(+), 448 deletions(-)
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 543fc25..e01994e 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -69,6 +69,10 @@
} from '@/js/Base64.js';
import classUtils from "@/js/utils.js"
import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
+ import {
appGetInfo,
dictGetInfo
} from "@/api/mobox.js"
@@ -178,17 +182,21 @@
this.active_id = '';
this.activeItem = {};
//this.activelist = [];
+ const paramValue = options.paramValue ? JSON.parse(options.paramValue) : undefined
if (this.param.ListPage.ListItem_UIDef?.ui_type == "HTML椤甸潰") {
// HTML椤甸潰
//鑾峰彇鏁版嵁绫荤殑HTML椤甸潰
- await this.Html_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id, options
- .paramValue);
+ await this.Html_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id,
+ paramValue);
} else {
await this.Detail1_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);
- await this.initial(options.paramValue);
+ await this.initial(paramValue);
+ await this.loadInitialEvent();
+
}
+
// this.isFilter=true;
// if(this.param.ShowFilter)
// this.isFilter=false;
@@ -216,6 +224,16 @@
// console.log(this.param);
//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� // this.focusMateria=true;
+ },
+ computed: {
+
+ initialEvent() {
+ let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+ return {
+ id: event?.scrip_id || "",
+ name: event?.scrip_name || "",
+ };
+ },
},
methods: {
//
@@ -252,27 +270,7 @@
await this.Head_UIStyleGetInfo(this.param.DataCls.id, this.param.Query_Panel.id);
//浼犲叆鍙傛暟鍊� if (paramValue) {
- const attrs = paramValue.attrs || [];
- (this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
- if (ele.name != "Layout") {
- attrs.forEach(async (ele2, index2) => {
- if (ele.fieldId == ele2.name) {
- ele.value = ele2.value;
- }
- });
- } else {
- ele.setting.colList.forEach(async (col) => {
- if (col) {
- attrs.forEach(async (ele2,
- index2) => {
- if (col.fieldId == ele2.name) {
- col.value = ele2.value;
- }
- });
- }
- });
- }
- })
+ this.setFormValues(paramValue)
}
}
this.orderby = this.param.Order ? this.param.Order : 'T_CREATE Desc';
@@ -288,6 +286,16 @@
}
this.refreshing = false
+ },
+ async loadInitialEvent() {
+ try {
+ if (this.initialEvent.id) {
+ this.onChange(this.initialEvent)
+ }
+ } catch (ex) {
+ showError(ex, this.translateSys('error'))
+
+ }
},
//婊氬姩鍒板簳閮ㄥ悗鎳掑姞杞芥暟鎹� async scrolltolower(e) {
@@ -377,13 +385,7 @@
}
} catch (ex) {
// console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
- uni.showModal({
- title: this.translateSys("error") + "1.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 1.1")
}
},
@@ -408,13 +410,7 @@
$this.detail1_styledef.SelBut_Checked = false;
} catch (ex) {
// console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
- uni.showModal({
- title: this.translateSys("error") + "1.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 2.1")
}
@@ -443,13 +439,7 @@
$this.initial(paramValue);
} catch (ex) {
// console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
- uni.showModal({
- title: this.translateSys("error") + "1.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 2.1")
}
},
async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�@@ -485,12 +475,7 @@
}
} catch (ex) {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "3",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 3")
}
},
@@ -508,50 +493,39 @@
var result = await runCustomEvent(dataInfo)
// console.log(result);
- if (result.ret != 0&& result.ret != 1) {
- var tip = result.err_info ? typeof result.err_info == 'string' ? result
- .err_info : result.err_info.join('<br/>') : '';
+ if (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
if (pos > -1) tip = tip.substring(pos + 1);
}
- uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + result
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
var tip = result.info ? typeof result.info == 'string' ? result.info :
- result.info.join('<br/>') : '';
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -572,28 +546,14 @@
let actionList = (result.action || []).map(a => a.action_type).join(';')
let tip = typeof ex == 'string' ? ex : ex.message
tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- console.log(ex)
+ showError(tip, this.translateSys('tip'))
return
}
}
}
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "4.2",
- content: this.translate("execute_query_event_failed") + this.translateSys(
- "comma") +
- tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 4.1")
}
},
@@ -752,21 +712,10 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "5.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "5.1")
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "5.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "5.2")
}
},
@@ -815,14 +764,8 @@
input_param,
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys('error'))
+
}
}
}
@@ -903,12 +846,7 @@
if (btn.Edit_dlg.Model == "small") {
this.showAddSmallDialog(btn, style, enviroment);
} else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("unrealized"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys("unrealized"))
}
} else if (btn.FunCode == "Delete") {
this.DeleteObj(btn, style, enviroment);
@@ -923,21 +861,11 @@
// } else if (btn.FunCode == "TriggerEvent") {
// this.triggerEvent(btn, style, enviroment);
} else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("unrealized"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys("unrealized"))
+
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
}
},
//鏂板淇敼灏忕獥鍙ｆ暟鎹�@@ -998,24 +926,12 @@
.splice(index, 1);
}
});
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate(
- "delete_success"),
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showInfo(this.translate(
+ "delete_success"))
+
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "6",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "6.1")
});
} else if (res.cancel) {
@@ -1063,55 +979,49 @@
obj_attr: obj_attr,
}
var result = await runCustomEvent(dataInfo)
- if (result.ret != 0) {
- var tip = result.err_info ? typeof result.err_info ==
- 'string' ?
- result
- .err_info : result.err_info.join('<br/>') : '';
+ if (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
if (pos > -1) tip = tip.substring(pos + 1);
}
- uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result.info == 'string' ?
- result
- .info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(tip)
+ if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+ if (result.result_type == 2) {
+ } else if (typeof result.result == 'string') {
+ showInfo(result.result)
+
+ }
+ var actionList = result.action || []
+ actionList.forEach(item => {
+ if (item.action_type == "goback_to_pre_page") {
+ //杩斿洖涓婁竴椤�+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ }
+ })
+
+ }
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- this.showError(ex);
+ showError(ex, this.translateSys('error'))
}
},
//璺宠浆
@@ -1125,6 +1035,7 @@
defCode == "3037" ||
defCode == "3200" ||
defCode == "3201" ||
+ defCode == "3202" ||
defCode == "5600" ||
defCode == "5601" ||
defCode == "5602"
@@ -1136,7 +1047,7 @@
var json = {
app_id: [btn.Related_Function.ID],
};
- console.log("RelatedFunction2", json);
+
const result = await appGetInfo(json)
if ((result || []).length > 0) {
var app = result[0];
@@ -1152,24 +1063,35 @@
paramStr);
}
if (!param) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate(
- 'tip_no_app_param'),
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showInfo(this.translate("tip_no_app_param"))
+
return;
}
+ const attrValues = []
+ style.form.items.forEach(item => {
+ if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item.setting.colList.forEach(col => {
+ if (col != null) {
+ attrValues.push({
+ attr: col.fieldId,
+ value: col.value || ""
+ })
+ }
+
+ });
+ } else
+ attrValues.push({
+ attr: item.fieldId,
+ value: item.value || ""
+ })
+ });
uni.navigateTo({
url: '../modal/' + name + '?param=' +
param + "&titlename=" +
appName +
"&type=relatedFunction¶mValue=" +
- JSON.stringify(style
- .form),
+ JSON.stringify(attrValues),
events: {
relatedFunction: function(data) {
console.log(data);
@@ -1178,36 +1100,17 @@
}
});
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate(
- "function_not_exist"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("function_not_exist"))
+
}
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate("cannot_related_function"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("cannot_related_function"))
+
}
} catch (ex) {
- console.log(ex);
- let exStr = JSON.stringify(ex)
- if (exStr == "{}")
- exStr = ex
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
return undefined
}
},
@@ -1224,13 +1127,7 @@
});
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "7",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "7")
}
},
@@ -1353,66 +1250,44 @@
};
runCustomEvent(dataInfo).then(result => {
// console.log(result);
- if (result.ret != 0&& result.ret != 1) {
- var tip = result.err_info ? typeof result
- .err_info ==
- 'string' ?
+ if (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ?
+ result.err_info :
result
- .err_info : result.err_info.join(
- '<br/>') : '';
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(
- pos + 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this
- .translateSys('close')
- });
- } else uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip + ',' + this
- .translateSys('tip') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys(
+ 'tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result
- .info == 'string' ? result
+ var tip = result.info ? typeof result.info == 'string' ? result
.info :
- result.info.join('<br/>') : '';
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionlist = result.action || []
@@ -1424,23 +1299,36 @@
if (value) {
this.setFormValues(value)
}
- } else if (action_type == "set_subtable_page_content") {
- if (value.clear_confirm != false && value.clear == true &&
+ } else if (action_type ==
+ "set_subtable_page_content") {
+ if (value.clear_confirm != false && value
+ .clear == true &&
$this.detail1StyleDefList.length > 0
) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹� uni.showModal({
- title: this.translateSys('tip'),
+ title: this.translateSys(
+ 'tip'),
content: this.translate(
- "are_you_sure_clear_data"),
- cancelText: $this.translateSys('ok'),
- confirmText: $this.translateSys('cancel'),
+ "are_you_sure_clear_data"
+ ),
+ cancelText: $this.translateSys(
+ 'ok'),
+ confirmText: $this
+ .translateSys('cancel'),
success: function(res) {
if (res.cancel) {
- $this.detail1StyleDefList = [];
- $this.viewAceionContent(value);
- } else if (res.confirm) {
- $this.detail1StyleDefList = [];
- $this.viewAceionContent(value);
+ $this
+ .detail1StyleDefList = [];
+ $this
+ .viewAceionContent(
+ value);
+ } else if (res
+ .confirm) {
+ $this
+ .detail1StyleDefList = [];
+ $this
+ .viewAceionContent(
+ value);
}
}
});
@@ -1452,17 +1340,13 @@
}
} catch (ex) {
- let actionList = (result.action || []).map(a => a.action_type).join(
+ let actionList = (result.action || []).map(a => a
+ .action_type).join(
';')
let tip = typeof ex == 'string' ? ex : ex.message
- tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- console.log(ex)
+ tip =
+ `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1471,36 +1355,18 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "8.1")
});
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "8.2",
- content: this.translate(
- 'execute_after_change_event_failed') + this
- .translateSys(
- "comma") +
- this.translate('reason') + this.translateSys(
- "colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "8.2")
}
},
setFormValues(attrs) {
const head_styledef = this.head_styledef
- if (JSON.stringify(attrs) == '{}') {
- return;
+ if (!Array.isArray(attrs)) {
+ return
}
attrs.forEach(async (attr, key) => {
if (attr.choice_list) {
@@ -1525,9 +1391,11 @@
if (col) {
if (col.fieldId == attr.attr) {
if (col.useDict) {
- col.dict = dictItemList;
+ col.dict =
+ dictItemList;
} else {
- col.selections = dictItemList;
+ col.selections =
+ dictItemList;
}
}
}
@@ -1544,7 +1412,8 @@
ele.value = attr.value;
ele.oldvalue = attr.value;
if (ele.name == "Input") {
- if (attr.prompt) ele.placeholder = attr.prompt;
+ if (attr.prompt) ele.placeholder = attr
+ .prompt;
}
if (attr.enable !== undefined) {
if (attr.enable) ele.disabled = false;
@@ -1558,10 +1427,14 @@
col.value = attr.value;
col.oldvalue = attr.value;
if (col.name == "Input") {
- if (attr.prompt) col.placeholder = attr.prompt;
+ if (attr.prompt) col
+ .placeholder = attr
+ .prompt;
}
- if (attr.enable !== undefined) {
- if (attr.enable) col.disabled = false;
+ if (attr.enable !==
+ undefined) {
+ if (attr.enable) col
+ .disabled = false;
else col.disabled = true;
}
}
@@ -1622,19 +1495,27 @@
cont.attrs.forEach(attr => {
style.form.items.forEach(ele => {
if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr)
- ele.value = attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(
- col => {
- if (col) {
- if (col.fieldId ==
- attr
- .attr)
- col.value =
- attr.value;
- }
- });
+ if (ele.fieldId == attr
+ .attr)
+ ele.value = attr
+ .value;
+ } else if (ele.name ==
+ 'Layout') {
+ ele.setting.colList
+ .forEach(
+ col => {
+ if (col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ )
+ col
+ .value =
+ attr
+ .value;
+ }
+ });
}
});
});
@@ -1669,66 +1550,43 @@
var $this = this;
runCustomEvent(dataInfo).then(result => {
console.log(result);
-
- if (result.ret != 0&& result.ret != 1) {
- var tip = result.err_info ? typeof result
- .err_info ==
- 'string' ?
+ if (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ?
+ result.err_info :
result
- .err_info : result.err_info.join(
- '<br/>') : '';
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(
- pos + 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this
- .translateSys('close')
- });
- } else uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip + ',' + this
- .translateSys('tip') +
- ':' +
- result.ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys(
+ 'tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result
- .info == 'string' ? result
- .info : result
- .info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result
+ .info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -1736,7 +1594,7 @@
if (item.action_type ==
"goback_to_pre_page"
) { //杩斿洖涓婁竴椤�- var value = item.value;
+
uni.navigateBack({
delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
});
@@ -1781,45 +1639,31 @@
// });
} else {
- uni.showModal({
- title: this
- .translateSys(
- "tip"
- ),
- content: this
- .translateSys(
- "quotation_mark_left"
- ) +
- item
- .action_type +
- this
- .translateSys(
- "quotation_mark_right"
- ) +
- this
- .translate(
- "tip_action_unprocessed"
- ),
- showCancel: false,
- confirmText: this
- .translateSys(
- 'close'
- )
- });
+ showInfo(this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ item
+ .action_type +
+ this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ this
+ .translate(
+ "tip_action_unprocessed"
+ ))
+
}
});
} catch (ex) {
- let actionList = (result.action || []).map(a => a.action_type).join(';')
+ let actionList = (result.action || []).map(a => a
+ .action_type).join(';')
let tip = typeof ex == 'string' ? ex : ex.message
- tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- console.log(ex)
+ tip =
+ `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1829,27 +1673,10 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "9.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "9.1")
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "9.2",
- content: this.translate('execute_event_failed') +
- this.translateSys(
- "comma") +
- this.translate('reason') + this.translateSys(
- "colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "9.2")
}
},
--
Gitblit v1.9.1