From 07925905f1a596e20e980de6d42db217abb753b0 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 12 十二月 2025 18:06:11 +0800
Subject: [PATCH] plugin

---
 pages/modal/3018_2.vue | 1606 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 773 insertions(+), 833 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 7431959..b4a257d 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -2,7 +2,8 @@
 	<view class="uni-page-modal-3018-2" :class="largeMode?'large-mode':''">
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
+			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form"
+				:hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId"
 				@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
 				@on-click-suffix="classAttr_extButton"></OIForm>
 
@@ -55,6 +56,12 @@
 		Base64
 	} from '@/js/Base64.js';
 	import utils from "@/js/utils.js"
+	import {
+		showInfo,
+		showError,
+		showLoading,
+		hideLoading
+	} from "@/js/Page.js"
 	import dayjs from "dayjs";
 	import OIForm from '@/components/oi-form/index.vue'
 	import {
@@ -75,7 +82,7 @@
 		},
 		data() {
 			return {
-					largeMode: getApp().globalData.largeMode || false,
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys('add2'),
 				btnName: "",
 				param: {},
@@ -107,9 +114,9 @@
 			if (e.index == 0) {
 				const $this = this
 				uni.scanCode({
-					scanType: ["qrCode"],
+					scanType: ["qrCode", 'barCode'],
 					success: function(res) {
-
+						console.log(res)
 						if ($this.focusFieldId) {
 							const items = $this.head_styledef.form.items || []
 							for (let i in items) {
@@ -170,21 +177,31 @@
 				this.loadData()
 			}
 		},
+		onReady() {
+			uni.setNavigationBarTitle({
+				title: this.title
+			}); //璁剧疆椤堕儴鏍囬 
+		},
 		onLoad(options) {
 			// console.log(options);
-			uni.setNavigationBarTitle({
-				title: options.titlename
-			}); //璁剧疆椤堕儴鏍囬 
+
 			this.param = JSON.parse(options.param);
-			this.title = this.param.Add_BtnName ? this.param.Add_BtnName : options
-				.titlename; //璁剧疆鎸夐挳鏂囧瓧
+			this.title = options.titlename; //璁剧疆鎸夐挳鏂囧瓧 this.param.Add_BtnName ? this.param.Add_BtnName :
 			this.btnName = this.param.Add_BtnName || ""
-			this.loadData(options.paramValue)
+			const paramValue = options.paramValue ? JSON.parse(options.paramValue) : undefined
+			this.loadData(paramValue)
 		},
 		computed: {
 			dropdownBtns() {
 				const btns = this.head_styledef.button || [];
 				return btns
+			},
+			initialEvent() {
+				let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+				return {
+					id: event?.scrip_id || "",
+					name: event?.scrip_name || "",
+				};
 			},
 		},
 
@@ -212,35 +229,57 @@
 				});
 			},
 			async loadData(paramValue) {
+				try {
+					showLoading("loading...")
+					//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�+					await this.Head_UIStyleGetInfo(this.param.DataCls?.id, this.param.UI_Style?.ID);
+					//浼犲叆鍙傛暟鍊�+					if (paramValue) {
 
-				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�-				await this.Head_UIStyleGetInfo(this.param.DataCls?.id, this.param.UI_Style?.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)
+					}
+					await this.loadInitialEvent();
+					hideLoading()
+				} catch (ex) {
+					hideLoading()
+					showError(ex, this.translateSys("error"));
 				}
 
+			},
+			async loadInitialEvent() {
+				try {
+					var eventid = this.initialEvent?.id; //鍐呭鍙樺寲鍚庝簨浠�+					if (eventid) {
+						// self.event_no_sub = 1;
+						let obj_attr = this.head_styledef.form.model;
+						let req = {
+							id: "",
+							attrs: Object.keys(obj_attr).map((a) => ({
+								attr: a,
+								value: obj_attr[a],
+							})),
+						};
 
+						var info = {
+							eventid: eventid,
+							edtype: "0",
+							projectid: '',
+							rclsid: '',
+							robjid: '',
+							userlogin: '',
+							clsid: this.param.DataCls.id,
+							objid: "",
+							attr: req,
+							dataJson: []
+						}
+						this.DataObjRunCustomEvent(info);
+					}
+
+				} catch (ex) {
+					showError(ex, this.translateSys("error"))
+
+
+				}
 			},
 			async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮� 				var $this = this;
@@ -372,17 +411,7 @@
 					}
 				} catch (ex) {
 					// console.log(ex);
-					console.log(JSON.stringify(ex), 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") + "1.1",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + " 1.1")
 				}
 			},
 			async DictGetInfo(dict, formModel, formItem) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�@@ -411,18 +440,7 @@
 					}
 					formItem.dict = list;
 				} 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") + "1.3",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + " 1.3")
 
 
 				}
@@ -440,111 +458,104 @@
 					};
 					console.log(dataInfo);
 					var data = await runCustomEvent(dataInfo)
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info : data
-							.err_info.join('<br/>') : '';
+					if (data.ret != 0 && data.ret != 1) {
+						let cls_name = data.event_info?.cls_name
+						let event_name = data.event_info?.event_name
+						tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info.join(
+							'\n') : ''
 						if (data.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') + ':' + data
-								.ret,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						}
+						if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+						if (data.ret == 801) showInfo(tip)
+						else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+						this.saving = false
 						return false
 					} else {
 						var tip = data.info ? typeof data.info == 'string' ? data.info :
-							data.info.join('<br/>') : '';
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+							data.info.join('\n') : '';
+						tip = tip || data.err_info
+						let time = data.info_time || 0
+						if (time)
+							showError(tip, this.translateSys('tip'))
+						else
+							showInfo(tip)
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
-							for (var i = 0; i < actionlist.length; i++) {
-								var action = actionlist[i];
-								if (action.action_type == 'set_dlg_attr') {
-									var result = action.value;
-									$this.setFormValues(result)
-								} else if (action.action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-									$this.hideFormItems(result)
-									// console.log($this.head_styledef);
-								} else if (action.action_type ==
-									"set_dlg_current_edit_attr"
-								) {
-									if ($this.focusOldFieldId == action.value) {
-										$this.setData({
-											focusFieldId: ""
-										})
+							if (data.result_type == 2) {
+
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
+									showInfo(data.result)
+								}
+							}
+							try {
+								var actionlist = data.action || []
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										var result = action.value;
+										$this.setFormValues(result)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.hideFormItems(result)
+										// console.log($this.head_styledef);
+									} else if (action.action_type ==
+										"set_dlg_current_edit_attr"
+									) {
+										if ($this.focusOldFieldId == action.value) {
+											$this.setData({
+												focusFieldId: ""
+											})
+										} else {
+											$this.setData({
+												focusFieldId: $this
+													.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: action
+													.value
+											})
+										});
 									} else {
-										$this.setData({
-											focusFieldId: $this
-												.focusOldFieldId
-										})
-									}
-									$this.$nextTick(() => {
-										$this.setData({
-											focusFieldId: action
-												.value
-										})
-									});
-								} else {
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translate(
+										showInfo($this.translate(
 												'execute_init_event_failed') +
-											this.translateSys("full_stop") +
-											this.translate('reason') + this
+											$this.translateSys("full_stop") +
+											$this.translate('reason') + $this
 											.translateSys(
 												"colon") +
-											this.translateSys("quotation_mark_left") +
+											$this.translateSys("quotation_mark_left") +
 											action
-											.action_type + this.translateSys(
-												"quotation_mark_right") + this
-											.translate('tip_action_unprocessed'),
-										showCancel: false,
-										confirmText: this.translateSys('close')
-									});
+											.action_type + $this.translateSys(
+												"quotation_mark_right") + $this
+											.translate('tip_action_unprocessed'))
+
+									}
 								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								showError(tip, this.translateSys('tip'))
+								return
 							}
 						}
 					}
 				} 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") + "3",
-						content: this.translate('execute_init_event_failed') +
-							this.translateSys("full_stop") +
-							this.translate('reason') + this.translateSys("colon") + tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + " 3")
+
 				}
 			},
 
 
 			ontap(item) { //鎵爜鍔熻兘
-			
+
 				this.focusOldFieldId = item.fieldId
 				getApp().onScan((result) => {
 					console.log(result);
@@ -554,7 +565,7 @@
 			},
 			onScanValue(item, value) {
 				const $this = this;
-				//console.log("onScanValue", item);
+				console.log("onScanValue", value);
 				item.value = value
 				let newVal = item.value
 				if (typeof item.value == "string") {
@@ -648,7 +659,18 @@
 			},
 			onClick(item) {
 				// console.log("onClick",item);
-				this.focusFieldId = item.fieldId
+				if (item.name == "Input" || item.name == "InputNumber" || item.name == "Textarea") {
+					this.focusFieldId = item.fieldId
+				} else if (item.name == "ImageButton") {
+
+					var onClickEvent = item.bind.onClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�+
+					if (!onClickEvent.id) {
+						showInfo(this.translate('icon_click_event_empty'))
+						return;
+					}
+					this.onChange(onClickEvent);
+				}
 			},
 			onEnterChange(item) {
 				let newVal = item.value
@@ -700,398 +722,87 @@
 				}
 
 			},
-
-			classAttr_extButton(item) {
-				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�-				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�-
-				if (!onSuffixClickCallbackEvent.id) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate('icon_click_callback_empty'),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
-					return;
-				}
-				if (!onSuffixClickEvent.id) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate('icon_click_event_empty'),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
-					return;
-				}
-				this.popupType = 'right'
-				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-				this.$refs.popup.open(this.popupType);
-
-				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent
-					.id,
-					item);
-			},
-			popupChange(e) {
-				console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show);
-			},
-			checkChange(e) { //寮规check閫夋嫨
-				// console.log(e.target.dataset);
-				var index = e.target.dataset.index;
-				var ischeck = e.target.dataset.ischeck;
-				var data = this.check_list.items;
-				// this.check_list.items=[];
-				if (this.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫�-					for (var i in data) {
-						data[i].check = false;
-					}
-				}
-				data[index].check = ischeck ? false : true;
-				this.check_list.items = data;
-
-			},
-			popup_cancel(e) { //寮规鍙栨秷
-				this.$refs.popup.close();
-			},
-			popup_sava(e) { //寮规纭畾
-				var $this = this;
-				var items = $this.check_list.items;
-				var data = [];
-				var name = "";
-				for (var i = 0; i < items.length; i++) {
-					if (items[i].check == true) {
-						if (name)
-							name += ';';
-						name += items[i].name;
-						data.push({
-							id: items[i].id,
-							name: items[i].name
-						});
-					}
-				}
-				if (!$this.popupParam) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: "popupParam涓虹┖锛�,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
-					return;
-				}
-				if (data.length == 0) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate("tip_no_select_data"),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
-					return;
-				}
-				var callback_eventid = $this.popupParam.button_callback.trim();
-				var info = {
-					eventid: callback_eventid,
-					edtype: "0",
-					projectid: '',
-					rclsid: '',
-					robjid: '',
-					userlogin: '',
-					clsid: $this.param.DataCls.id,
-					objid: "",
-					attr: $this.popupParam.req,
-					dataJson: data
-				}
-				$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
-				this.$refs.popup.close();
-			},
-
-			async DataObjRunCustomEvent(info, data_attr) {
-				var $this = this;
-				var enviroment = {
-					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�-					'button': 'top', // top/bottom
-					button_name: this.translateSys('add2'),
-					master: {
-						cls_id: this.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
-						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
-					}
-				};
-				if (data_attr) {
-					enviroment.edit_dlg = {
-						type: 'small', //灏忕獥鍙�-						class_id: this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
-					}
-					if (data_attr) {
-						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�-							name: data_attr.Name, //瀛楁灞炴�
-							text: data_attr.DispName, //鏄剧ず鏂囨湰
-							group_name: data_attr.GroupName, //灞炴�缁�-							type: data_attr.Type, //瀛楁绫诲瀷
-							readonly: data_attr.ReadOnly, //鏄惁鍙
-							button_img: data_attr.button_img, //寮曠敤鎸夐挳鐨勫浘鏍�-							button_tooltip: data_attr.button_tooltip //寮曠敤鎸夐挳鐨則ooltip
+			async onFormEventResult( data, callbackEventId, item,req) {
+				try {
+					const $this = this
+					var enviroment = {
+						'function': '3000', // 鍔熻兘鐐圭紪鍙�+						cls_id: $this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+						'button': 'top', // top/bottom
+						button_name: $this.translateSys('add2'),
+						master: {
+							cls_id: $this.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
+							//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 						}
-					}
-				}
+					};
+					if (data.ret != 0 && data.ret != 1) {
 
-				// var dataInfo = {
-				//     edtype: info.edtype, eventid: info.eventid, projectid: info.projectid.replace('{','').replace('}',''),
-				//     rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
-				//     attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: "",
-				// 	global_attr: JSON.stringify(this.global_attr), dataJson:JSON.stringify(info.dataJson)
-				// }
-				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var input_param = Base64.encode(JSON.stringify(info.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this
-					.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				if (info.dataJson)
-					info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var obj_attr = {};
-				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.value;
-				});
-				if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
-				var dataInfo = {
-					ed_type: info.edtype,
-					start_transaction: true,
-					class_id: info.clsid,
-					class_name: '',
-					event_id: info.eventid,
-					event_name: '',
-					data_obj_id: info.objid,
-					obj_attr: obj_attr,
-					prj_id: info.projectid,
-					ref_cls_id: info.rclsid,
-					rel_obj_id: info.robjid,
-					user_login: info.userlogin,
-					data_json: info.dataJson,
-					compose_info: '',
-					ext_info: enviroment,
-					global_attr: global_attr,
-					input_param: input_param,
-				};
-				console.log(dataInfo);
-				// return;
-				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
+						let cls_name = data.event_info?.cls_name
+						let event_name = data.event_info?.event_name
+						tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+							.err_info
+							.join('\n') : ''
 						if (data.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') + ':' +
-								data
-								.ret,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						}
+						if (cls_name && event_name) tip =
+							`鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+						if (data.ret == 801) showInfo(tip)
+						else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+						this.saving = false
 						return false
 					} else {
 						var tip = data.info ? typeof data.info == 'string' ? data.info :
-							data
-							.info
-							.join(
-								'<br/>') : '';
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
-
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
-							for (var i = 0; i < actionlist.length; i++) {
-								var action = actionlist[i];
-								if (action.action_type == 'set_dlg_attr') {
-									var result = action.value;
-									$this.setFormValues(result)
-								} else if (action.action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-									$this.hideFormItems(result)
-									// console.log($this.head_styledef);
-								} else if (action.action_type == 'set_global_attr') {
-									$this.global_attr = action.value || [];
-								} else if (action.action_type ==
-									"set_dlg_current_edit_attr"
-								) {
-									if ($this.focusOldFieldId == action.value) {
-										$this.setData({
-											focusFieldId: ""
-										})
-									} else {
-										$this.setData({
-											focusFieldId: $this.focusOldFieldId
-										})
-									}
-									$this.$nextTick(() => {
-										$this.setData({
-											focusFieldId: action.value
-										})
-									});
-								} else {
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translateSys(
-												"quotation_mark_left") +
-											action
-											.action_type + this.translateSys(
-												"quotation_mark_right") + this
-											.translate(
-												"tip_action_unprocessed"),
-										showCancel: false,
-										confirmText: this.translateSys('close')
-									});
+							data.info.join('\n') : '';
+						tip = tip || data.err_info
+						let time = data.info_time || 0
+						if (time)
+							showError(tip, this.translateSys('tip'))
+						else
+							showInfo(tip)
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
+								$this.setFormValues(data.result || [])
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
+									showInfo(data.result)
 								}
 							}
-						}
-						// var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
-						// $this.head_styledef=[];
-						// $this.head_styledef = head_styledef;
-						console.log($this.head_styledef);
-
-						if (data.result) {
-							$this.setFormValues(data.result)
-						}
-					}
-
-				}).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") + "3.1",
-						content: exStr,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
-				});
-			},
-			dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
-				const $this = this
-				var enviroment = {
-					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: $this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�-					'button': 'top', // top/bottom
-					button_name: $this.translateSys('add2'),
-					master: {
-						cls_id: $this.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
-						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
-					}
-				};
-				var obj_attr = $this.head_styledef.form.model;
-				console.log(obj_attr);
-				var req = Object.keys(obj_attr).map((a) => ({
-					attr: a,
-					value: obj_attr[a] || "",
-				}));
-
-				var extinfo = enviroment;
-				extinfo.edit_dlg = {
-					type: 'small', //灏忕獥鍙�-					class_id: $this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
-				}
-				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify($this
-					.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var obj_attr = {};
-				req.forEach(item2 => {
-					obj_attr[item2.attr] = item2.value;
-				});
-				let input_param = Base64.encode(
-					JSON.stringify(
-						Object.keys(obj_attr).map((a) => ({
-							attr: a,
-							value: obj_attr[a] || "",
-						}))
-					)
-				);
-
-				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
-				var dataInfo = {
-					ed_type: "0",
-					start_transaction: true,
-					class_id: $this.param.DataCls.id,
-					class_name: '',
-					event_id: eventid,
-					event_name: '',
-					data_obj_id: '',
-					obj_attr: obj_attr,
-					prj_id: '',
-					ref_cls_id: '',
-					rel_obj_id: '',
-					user_login: '',
-					data_json: [],
-					compose_info: '',
-					ext_info: extinfo,
-					global_attr: global_attr,
-					input_param: input_param,
-				};
-				console.log(dataInfo);
-				// return;
-				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
-						if (data.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') + ':' +
-								data
-								.ret,
-							showCancel: false,
-							confirmText: $this.translateSys('close')
-						});
-						return false
-					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info :
-							data
-							.info
-							.join(
-								'<br/>') : '';
-						if (tip) uni.showModal({
-							title: $this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: $this.translateSys('close')
-						});
-
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
-									var action = actions[i];
-									console.log(action)
-									var val = action.value;
-									var enviroment = JSON.stringify(enviroment);
-
-									if (action.action_type == 'open_panel') {
+							try {
+								var actionlist = data.action || []
+								var enviroment = JSON.stringify(enviroment);
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										var result = action.value;
+										$this.setFormValues(result)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.hideFormItems(result)
+										// console.log($this.head_styledef);
+									} else if (action.action_type == 'set_global_attr') {
+										$this.global_attr = action.value || [];
+									} else if (action.action_type ==
+										"set_dlg_current_edit_attr"
+									) {
+										if ($this.focusOldFieldId == action.value) {
+											$this.setData({
+												focusFieldId: ""
+											})
+										} else {
+											$this.setData({
+												focusFieldId: $this.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: action.value
+											})
+										});
+									} else if (action.action_type == 'open_panel') {
 										var d = dialog({
 											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
 												$this.translateSys("tip"),
@@ -1258,59 +969,285 @@
 											}
 										});
 									} else {
-										uni.showModal({
-											title: $this.translateSys("tip"),
-											content: $this.translateSys(
-													"quotation_mark_left") +
-												action.action_type + $this
-												.translateSys(
-													"quotation_mark_right") + $this
-												.translate(
-													"tip_action_unprocessed"),
-											showCancel: false,
-											confirmText: $this.translateSys(
-												'close')
-										});
+										showInfo(this.translateSys(
+												"quotation_mark_left") +
+											action
+											.action_type + this.translateSys(
+												"quotation_mark_right") + this
+											.translate(
+												"tip_action_unprocessed"))
+
 									}
 								}
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								showError(tip, this.translateSys('tip'))
+								return
 							}
-						} else {
-							uni.showModal({
-								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys(
-										"quotation_mark_left") +
-									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this
-									.translateSys(
-										"comma") + 'event_id' + eventid,
-								showCancel: false,
-								confirmText: $this.translateSys('close')
-							});
+
 						}
 					}
 
+				} catch (ex) {
+					showError(ex, this.translateSys("error") + "10.1")
+				}
+			},
+			classAttr_extButton(item) {
+				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�+
+				if (!onSuffixClickCallbackEvent.id) {
+					showInfo(this.translate('icon_click_callback_empty'))
+
+					return;
+				}
+				if (!onSuffixClickEvent.id) {
+					showInfo(this.translate('icon_click_event_empty'))
+
+					return;
+				}
+				this.popupType = 'right'
+				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+				this.$refs.popup.open(this.popupType);
+
+				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, onSuffixClickCallbackEvent
+					.id,
+					item);
+			},
+			popupChange(e) {
+				console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show);
+			},
+			checkChange(e) { //寮规check閫夋嫨
+				// console.log(e.target.dataset);
+				var index = e.target.dataset.index;
+				var ischeck = e.target.dataset.ischeck;
+				var data = this.check_list.items;
+				// this.check_list.items=[];
+				if (this.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫�+					for (var i in data) {
+						data[i].check = false;
+					}
+				}
+				data[index].check = ischeck ? false : true;
+				this.check_list.items = data;
+
+			},
+			popup_cancel(e) { //寮规鍙栨秷
+				this.$refs.popup.close();
+			},
+			popup_sava(e) { //寮规纭畾
+				var $this = this;
+				var items = $this.check_list.items;
+				var data = [];
+				var name = "";
+				for (var i = 0; i < items.length; i++) {
+					if (items[i].check == true) {
+						if (name)
+							name += ';';
+						name += items[i].name;
+						data.push({
+							id: items[i].id,
+							name: items[i].name
+						});
+					}
+				}
+				if (!$this.popupParam) {
+					showInfo("popupParam涓虹┖锛�)
+
+					return;
+				}
+				if (data.length == 0) {
+					showInfo(this.translate("tip_no_select_data"))
+
+					return;
+				}
+				var callback_eventid = $this.popupParam.button_callback.trim();
+				var info = {
+					eventid: callback_eventid,
+					edtype: "0",
+					projectid: '',
+					rclsid: '',
+					robjid: '',
+					userlogin: '',
+					clsid: $this.param.DataCls.id,
+					objid: "",
+					attr: $this.popupParam.req || [],
+					dataJson: data
+				}
+				$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
+				this.$refs.popup.close();
+			},
+
+			async DataObjRunCustomEvent(info, data_attr) {
+				try {
+					var $this = this;
+					if (!info.eventid)
+						return
+					showLoading("loading...")
+					var enviroment = {
+						'function': '3000', // 鍔熻兘鐐圭紪鍙�+						cls_id: this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+						'button': 'top', // top/bottom
+						button_name: this.translateSys('add2'),
+						master: {
+							cls_id: this.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
+							//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
+						}
+					};
+					if (data_attr) {
+						enviroment.edit_dlg = {
+							type: 'small', //灏忕獥鍙�+							class_id: this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
+						}
+						if (data_attr) {
+							enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�+								name: data_attr.Name, //瀛楁灞炴�
+								text: data_attr.DispName, //鏄剧ず鏂囨湰
+								group_name: data_attr.GroupName, //灞炴�缁�+								type: data_attr.Type, //瀛楁绫诲瀷
+								readonly: data_attr.ReadOnly, //鏄惁鍙
+								button_img: data_attr.button_img, //寮曠敤鎸夐挳鐨勫浘鏍�+								button_tooltip: data_attr.button_tooltip //寮曠敤鎸夐挳鐨則ooltip
+							}
+						}
+					}
+					enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+					var input_param = info.attr ? Base64.encode(JSON.stringify(info.attr)):"" //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+					var global_attr = Base64.encode(JSON.stringify(this
+						.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+					if (info.dataJson)
+						info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+					var obj_attr = {};
+					(info.attr || []).forEach(item => {
+						obj_attr[item.attr] = item.value;
+					});
+					if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
+					var dataInfo = {
+						ed_type: info.edtype,
+						start_transaction: true,
+						class_id: info.clsid,
+						class_name: '',
+						event_id: info.eventid,
+						event_name: '',
+						data_obj_id: info.objid,
+						obj_attr: obj_attr,
+						prj_id: info.projectid,
+						ref_cls_id: info.rclsid,
+						rel_obj_id: info.robjid,
+						user_login: info.userlogin,
+						data_json: info.dataJson,
+						compose_info: '',
+						ext_info: enviroment,
+						global_attr: global_attr,
+						input_param: input_param,
+					};
+					console.log(dataInfo);
+					// return;
+					runCustomEvent(dataInfo).then(data => {
+						hideLoading()
+						$this.onFormEventResult(data, "")
+
+					}).catch(ex => {
+						// console.log(ex);
+						showError(ex, this.translateSys("error") + " 3.1")
+
+					});
+				} catch (ex) {
+					hideLoading()
+					showError(ex, this.translateSys("error"));
+				}
+
+			},
+			dataObjRunCustomEvent_Return(eventid, button_callback, item) {
+				const $this = this
+				showLoading("loading...")
+				var enviroment = {
+					'function': '3000', // 鍔熻兘鐐圭紪鍙�+					cls_id: $this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					'button': 'top', // top/bottom
+					button_name: $this.translateSys('add2'),
+					master: {
+						cls_id: $this.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
+						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
+					}
+				};
+				var obj_attr = $this.head_styledef.form.model;
+				console.log(obj_attr);
+				var req = Object.keys(obj_attr).map((a) => ({
+					attr: a,
+					value: obj_attr[a] || "",
+				}));
+
+				var extinfo = enviroment;
+				extinfo.edit_dlg = {
+					type: 'small', //灏忕獥鍙�+					class_id: $this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
+				}
+				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify($this
+					.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var obj_attr = {};
+				req.forEach(item2 => {
+					obj_attr[item2.attr] = item2.value;
+				});
+				let input_param = Base64.encode(
+					JSON.stringify(
+						Object.keys(obj_attr).map((a) => ({
+							attr: a,
+							value: obj_attr[a] || "",
+						}))
+					)
+				);
+
+				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
+				var dataInfo = {
+					ed_type: "0",
+					start_transaction: true,
+					class_id: $this.param.DataCls.id,
+					class_name: '',
+					event_id: eventid,
+					event_name: '',
+					data_obj_id: '',
+					obj_attr: obj_attr,
+					prj_id: '',
+					ref_cls_id: '',
+					rel_obj_id: '',
+					user_login: '',
+					data_json: [],
+					compose_info: '',
+					ext_info: extinfo,
+					global_attr: global_attr,
+					input_param: input_param,
+				};
+				console.log(dataInfo);
+				// return;
+				runCustomEvent(dataInfo).then(data => {
+					hideLoading()
+					$this.onFormEventResult( data, button_callback,item,req)
+
 				}).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('tip') + "5.1",
-						content: exStr,
-						showCancel: false,
-						confirmText: $this.translateSys('close')
-					});
+					hideLoading()
+					showError(ex, this.translateSys("error") + " 5.1")
+
 				});
 			},
 
 			//纭畾
 			sava() {
-				if (this.after_ok?.id) { // 鐐瑰嚮纭畾鎸夐挳鍚�-					this.afterOK();
-				} else {
-					this.add();
-				}
+				this.handleButtonClick((done) => {
+					if (this.after_ok?.id) { // 鐐瑰嚮纭畾鎸夐挳鍚�+						this.afterOK();
+					} else {
+						this.add();
+					}
+					setTimeout(() => {
+						done(); // 閲嶇疆鐘舵�
+					}, 1000);
+				});
+
 
 			},
 			add() {
@@ -1357,122 +1294,115 @@
 				dataObjCreate(dataInfo).then(res => {
 					uni.hideLoading();
 					let data = res.lua_result
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
-						if (data.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') + ':' +
-								data
-								.ret,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
-						this.saving = false
-						return false
-					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info :
-							data
-							.info
-							.join(
-								'<br/>') : '';
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
-						else {
-
-							uni.showToast({
-								title: this.translate('create_success'),
-								icon: "success",
-								duration: 3000
-							});
-						}
-
-
-						if (!this.param.After_Btn_Not_Refresh) {
-							//鍒锋柊
-							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this
-										.$data
-										.param) +
-									"&titlename=" + this.title
-							});
-						} else {
-							var actionlist = data.action;
-							if (actionlist) {
-								console.log(actionlist);
-								for (var i = 0; i < actionlist.length; i++) {
-									var action = actionlist[i];
-									if (action.action_type == 'set_dlg_attr') {
-										$this.setFormValues(action.value)
-									} else if (action.action_type == 'set_dlg_attr_show') {
-										var result = action.value;
-										$this.hideFormItems(result)
-									} else if (action.action_type ==
-										"set_dlg_current_edit_attr"
-									) {
-										if ($this
-											.focusOldFieldId ==
-											action.value) {
-											$this.setData({
-												focusFieldId: ""
-											})
-										} else {
-											$this.setData({
-												focusFieldId: $this
-													.focusOldFieldId
-											})
-										}
-										$this.$nextTick(() => {
-											$this.setData({
-												focusFieldId: action
-													.value
-											})
-										});
-									}
+					if (data) {
+						if (data.ret != 0 && data.ret != 1) {
+							let cls_name = data.event_info?.cls_name
+							let event_name = data.event_info?.event_name
+							tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+								.join('\n') : ''
+							if (data.ret == 801) {
+								if (this.param.Only_Script_Error) {
+									let pos = tip.indexOf("锛�);
+									if (pos > -1) tip = tip.substring(pos + 1);
 								}
 							}
+							if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+							if (data.ret == 801) showInfo(tip)
+							else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+							this.saving = false
+							return false
+						} else {
+							var tip = data.info ? typeof data.info == 'string' ? data.info :
+								data.info.join('\n') : '';
+							tip = tip || data.err_info
+							if (tip) {
+								let time = data.info_time || 0
+								if (time)
+									showError(tip, this.translateSys('tip'))
+								elseshowInfo(tip)
+							} else {
+								showInfo(this.translate('create_success'));
+							}
+							if (!this.param.After_Btn_Not_Refresh) {
+								//鍒锋柊
+								uni.redirectTo({
+									url: '../modal/3018_2?param=' + JSON.stringify(this
+											.$data
+											.param) +
+										"&titlename=" + this.title
+								});
+							} else {
+								if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+									if (data.result_type == 2) {
+										$this.setFormValues(data.result || [])
+									} else if (typeof data.result == 'string') {
+										if (data.result) {
+											showInfo(data.result)
 
+										}
+									}
+									try {
+										var actionlist = data.action || []
+										for (var i = 0; i < actionlist.length; i++) {
+											var action = actionlist[i];
+											if (action.action_type == 'set_dlg_attr') {
+												$this.setFormValues(action.value)
+											} else if (action.action_type == 'set_dlg_attr_show') {
+												var result = action.value;
+												$this.hideFormItems(result)
+											} else if (action.action_type ==
+												"set_dlg_current_edit_attr"
+											) {
+												if ($this
+													.focusOldFieldId ==
+													action.value) {
+													$this.setData({
+														focusFieldId: ""
+													})
+												} else {
+													$this.setData({
+														focusFieldId: $this
+															.focusOldFieldId
+													})
+												}
+												$this.$nextTick(() => {
+													$this.setData({
+														focusFieldId: action
+															.value
+													})
+												});
+											}
+										}
+
+									} catch (ex) {
+										let actionList = (data.action || []).map(a => a.action_type).join(';')
+										let tip = typeof ex == 'string' ? ex : ex.message
+										tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+										showError(tip, this.translateSys('tip'))
+										return
+									}
+								}
+
+							}
 						}
+						// this.class_attr_init();
 					}
-					// this.class_attr_init();
-
 					this.saving = false
 				}).catch(ex => {
 					this.saving = false
 
 					uni.hideLoading();
-					let exStr = JSON.stringify(ex)
-					if (exStr == "{}")
-						exStr = ex
-					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("tip"))
+
+
 				});
 			},
 			setFormValues(data) {
 				const $this = this
 				const head_styledef = this.head_styledef
+				if (!Array.isArray(data)) {
+					return
+				}
 				for (var i = 0; i < data.length; i++) {
 					const attr = data[i]
 					if (attr.choice_list) {
@@ -1568,31 +1498,32 @@
 				}
 
 			},
-			hideFormItems(data) {
-				const $this = this
+			hideFormItems(attrs) {
+				if (!Array.isArray(attrs)) {
+					return
+				}
 				const head_styledef = this.head_styledef
-				data.forEach(async (attr, key) => {
-					head_styledef.form.items.forEach(async (ele, index) => {
-						//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-						if (ele.name != 'Layout') {
-							if (ele.fieldId == attr.attr) {
-								ele.show = attr.show;
-							}
-						} else if (ele.name == 'Layout') {
-							ele.setting.colList.forEach((col) => {
-								if (col) {
-									if (col.fieldId == attr.attr) {
-										col.show = attr.show;
-									}
-								}
-							});
-						}
-					});
+				if (!head_styledef.hiddenIds) {
+					head_styledef.hiddenIds = []
+				}
+				attrs.forEach((attr) => {
+					let index = head_styledef.hiddenIds.findIndex((id) => id == attr.attr);
+					if (attr.show) {
+						if (index > -1) head_styledef.hiddenIds.splice(index, 1);
+					} else {
+						if (index == -1) head_styledef.hiddenIds.push(attr.attr);
+					}
 				});
+
+				this.setData({
+					head_styledef: head_styledef
+				})
 			},
+
 			afterOK() {
 				this.saving = true
 				const $this = this
+				showLoading("loading...")
 				var obj_attr = this.head_styledef.form.model;
 				// console.log(obj_attr);
 				var input_param = {
@@ -1624,45 +1555,33 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
+					hideLoading()
+					if (data.ret != 0 && data.ret != 1) {
 
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
+						let cls_name = data.event_info?.cls_name
+						let event_name = data.event_info?.event_name
+						tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+							.join('\n') : ''
 						if (data.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') + ':' +
-								data
-								.ret,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						}
+						if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+						if (data.ret == 801) showInfo(tip)
+						else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
 						this.saving = false
 						return false
 					} else {
 						var tip = data.info ? typeof data.info == 'string' ? data.info :
-							data
-							.info
-							.join(
-								'<br/>') : '';
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+							data.info.join('\n') : '';
+						tip = tip || data.err_info
+						let time = data.info_time || 0
+						if (time)
+							showError(tip, this.translateSys('tip'))
+						else
+							showInfo(tip)
 						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
@@ -1672,58 +1591,64 @@
 									"&titlename=" + this.title
 							});
 						} else {
-							var actionlist = data.action;
-							if (actionlist) {
-								console.log(actionlist);
-								for (var i = 0; i < actionlist.length; i++) {
-									var action = actionlist[i];
-									if (action.action_type == 'set_dlg_attr') {
-										$this.setFormValues(action.value)
-									} else if (action.action_type == 'set_dlg_attr_show') {
-										var result = action.value;
-										$this.hideFormItems(result)
-									} else if (action.action_type ==
-										"set_dlg_current_edit_attr"
-									) {
-										if ($this
-											.focusOldFieldId ==
-											action.value) {
-											$this.setData({
-												focusFieldId: ""
-											})
-										} else {
-											$this.setData({
-												focusFieldId: $this
-													.focusOldFieldId
-											})
-										}
-										$this.$nextTick(() => {
-											$this.setData({
-												focusFieldId: action
-													.value
-											})
-										});
-									}
+							if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+								if (data.result_type == 2) {
+
+								} else if (typeof data.result == 'string') {
+
+									showInfo(data.result)
+
 
 								}
+								try {
+									var actionlist = data.action || []
+									for (var i = 0; i < actionlist.length; i++) {
+										var action = actionlist[i];
+										if (action.action_type == 'set_dlg_attr') {
+											$this.setFormValues(action.value)
+										} else if (action.action_type == 'set_dlg_attr_show') {
+											var result = action.value;
+											$this.hideFormItems(result)
+										} else if (action.action_type ==
+											"set_dlg_current_edit_attr"
+										) {
+											if ($this
+												.focusOldFieldId ==
+												action.value) {
+												$this.setData({
+													focusFieldId: ""
+												})
+											} else {
+												$this.setData({
+													focusFieldId: $this
+														.focusOldFieldId
+												})
+											}
+											$this.$nextTick(() => {
+												$this.setData({
+													focusFieldId: action
+														.value
+												})
+											});
+										}
+
+									}
+								} catch (ex) {
+									let actionList = (data.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+									showError(tip, this.translateSys('tip'))
+									return
+								}
 							}
+
 						}
 					}
-
 					this.saving = false
 				}).catch(ex => {
-					// console.log(ex);
-					this.saving = false
-					let exStr = JSON.stringify(ex)
-					if (exStr == "{}")
-						exStr = ex
-					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
-					uni.showModal({
-						title: this.translateSys('tip') + "7.1",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					hideLoading()
+					showError(ex, this.translateSys("tip") + " 7.1")
+
 				});
 			},
 			//鐐瑰嚮鎸夐挳鍒楄〃
@@ -1744,6 +1669,14 @@
 				})
 			},
 			onButtonClicked(btn) {
+				this.handleButtonClick((done) => {
+					this.buttonClicked(btn);
+					setTimeout(() => {
+						done(); // 閲嶇疆鐘舵�
+					}, 1000);
+				});
+			},
+			buttonClicked(btn) {
 				let enviroment = {
 					button: "top",
 					button_name: btn.ShowName,
@@ -1756,12 +1689,8 @@
 					if (btn.Edit_dlg.Model == "small") {
 						this.showAddSmallDialog(btn, 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 == "TriggerEvent") {
 					this.onTriggerEvent(btn, enviroment);
@@ -1771,6 +1700,7 @@
 			},
 			onTriggerEvent(btn, enviroment) {
 				const $this = this
+				showLoading("loading...")
 				var obj_attr = this.head_styledef.form.model;
 				// console.log(obj_attr);
 				var input_param = {
@@ -1801,45 +1731,36 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
+					hideLoading()
+					if (data.ret != 0 && data.ret != 1) {
+						let cls_name = data.event_info?.cls_name
+						let event_name = data.event_info?.event_name
+						tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+							.join('\n') : ''
 						if (data.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') + ':' +
-								data
-								.ret,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						}
+						if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+						if (data.ret == 801) showInfo(tip)
+						else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+						this.saving = false
 						return false
 					} else {
+
 						var tip = data.info ? typeof data.info == 'string' ? data.info :
-							data
-							.info
-							.join(
-								'<br/>') : '';
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+							data.info.join('\n') : '';
+						tip = tip || data.err_info
+						let time = data.info_time || 0
+						if (time)
+							showError(tip, this.translateSys('tip'))
+						else
+							showInfo(tip)
 						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
+
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this
 										.$data
@@ -1847,56 +1768,75 @@
 									"&titlename=" + this.title
 							});
 						} else {
-							var actionlist = data.action;
-							if (actionlist) {
-								console.log(actionlist);
-								for (var i = 0; i < actionlist.length; i++) {
-									var action = actionlist[i];
-									if (action.action_type == 'set_dlg_attr') {
-										$this.setFormValues(action.value)
-									} else if (action.action_type == 'set_dlg_attr_show') {
-										var result = action.value;
-										$this.hideFormItems(result)
-									} else if (action.action_type ==
-										"set_dlg_current_edit_attr"
-									) {
-										if ($this
-											.focusOldFieldId ==
-											action.value) {
-											$this.setData({
-												focusFieldId: ""
-											})
-										} else {
-											$this.setData({
-												focusFieldId: $this
-													.focusOldFieldId
-											})
-										}
-										$this.$nextTick(() => {
-											$this.setData({
-												focusFieldId: action
-													.value
-											})
-										});
-									}
+							if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+								if (data.result_type == 2) {
+
+								} else if (typeof data.result == 'string') {
+									showInfo(data.result)
 
 								}
+								try {
+									var actionlist = data.action || []
+									for (var i = 0; i < actionlist.length; i++) {
+										var action = actionlist[i];
+										if (action.action_type == 'set_dlg_attr') {
+											$this.setFormValues(action.value)
+										} else if (action.action_type == 'set_dlg_attr_show') {
+											var result = action.value;
+											$this.hideFormItems(result)
+										} else if (action.action_type ==
+											"set_dlg_current_edit_attr"
+										) {
+											if ($this
+												.focusOldFieldId ==
+												action.value) {
+												$this.setData({
+													focusFieldId: ""
+												})
+											} else {
+												$this.setData({
+													focusFieldId: $this
+														.focusOldFieldId
+												})
+											}
+											$this.$nextTick(() => {
+												$this.setData({
+													focusFieldId: action
+														.value
+												})
+											});
+										} else if (action.action_type == 'get_pre_page_subtable_next_row') {
+											var value = action.value;
+											const eventChannel = this.getOpenerEventChannel();
+											eventChannel.emit('get_pre_page_subtable_next_row', value);
+										} else if (action.action_type == 'remove_pre_page_subtable_row') {
+											var value = action.value;
+											const eventChannel = this.getOpenerEventChannel();
+											eventChannel.emit('remove_pre_page_subtable_row', value);
+										} else if (action.action_type == "goback_to_pre_page") {
+											//杩斿洖涓婁竴椤�+											uni.navigateBack({
+												delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+											});
+										}
+									}
+
+
+								} catch (ex) {
+									let actionList = (data.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+									showError(tip, this.translateSys('tip'))
+									return
+								}
 							}
+
 						}
 					}
 
 				}).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('tip') + "7.1",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys("close")
-					});
+					showError(ex, this.translateSys("tip") + " 7.1")
+
 				});
 
 			},

--
Gitblit v1.9.1