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/form/index.vue | 1416 +++++++++++++++++++++++-----------------------------------
 1 files changed, 568 insertions(+), 848 deletions(-)

diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue
index 1d2c903..4214186 100644
--- a/pages/modal/form/index.vue
+++ b/pages/modal/form/index.vue
@@ -1,13 +1,14 @@
 <template>
-	<view class="uni-page-modal-form">
+	<view class="uni-page-modal-form" :class="largeMode?'large-mode':''">
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<OIForm ref="refBaseForm" class="v-head-style" :form="head_styledef.form" :focusId="focusFieldId"
+			<OIForm ref="refBaseForm" class="v-head-style" :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>
 		</view>
 		<view class="view-bottom">
-			<button type="primary" @tap="onClickOk" class="btn_add" :class="okLoading?'btn_disabled':''"
+			<button type="primary" @tap="ok" class="btn_add" :class="okLoading?'btn_disabled':''"
 				:disabled="okLoading">{{translateSys('ok')}}</button>
 			<button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>
 
@@ -43,7 +44,7 @@
 <script>
 	import {
 		Base64
-	} from  '@/js/Base64.js';
+	} from '@/js/Base64.js';
 	import {
 		dictGetInfo
 	} from "@/api/mobox.js"
@@ -56,16 +57,18 @@
 	} from "@/api/data.js"
 	import dayjs from "dayjs";
 	import OIForm from '@/components/oi-form/index.vue'
-	import buttonClickMixin from '@/mixins/button-click.js';
-
+	import {
+		showInfo,
+		showError
+	} from "@/js/Page.js"
 	export default {
 		name: "PageModalForm",
-		mixins: [buttonClickMixin],
 		components: {
 			OIForm
 		},
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				okLoading: false,
 				title: this.translateSys('add2'),
 				type: '',
@@ -130,6 +133,11 @@
 				};
 			},
 		},
+		onReady() {
+			uni.setNavigationBarTitle({
+				title: this.title 
+			}); //璁剧疆椤堕儴鏍囬 
+		},
 		onLoad(options) {
 
 			this.param = JSON.parse(options.param);
@@ -150,20 +158,11 @@
 			if (options.dataJson)
 				this.data_json = JSON.parse(options.dataJson);
 			this.title = options.titlename ? options.titlename : this.param.ShowName; //璁剧疆鎸夐挳鏂囧瓧
-			// console.log(options)
-			uni.setNavigationBarTitle({
-				title: this.title
-			}); //璁剧疆椤堕儴鏍囬 
-
 			if (this.clsId) {
 				this.loadData(objAttr)
 			} else {
-				uni.showModal({
-					title: this.translateSys("error"),
-					content: this.translate("tip_no_master_class"),
-					showCancel: false,
-					confirmText: this.translateSys('close')
-				});
+				showInfo(this.translate("tip_no_master_class"))
+
 			}
 		},
 		//椤甸潰鍒濆鍖栬幏鍙栫劍鐐�@@ -295,6 +294,25 @@
 								}
 							}
 						}
+						const app = getApp()
+						if (app.globalData.bindClasses) {
+							styledefHead.form.items.push({
+								name: "Input",
+								label: this.translate("classes"),
+								labelWidth: 100,
+								disabled: true,
+								value: app.globalData.classes,
+								setting: {
+									width: 100,
+									height: 50,
+								},
+								bind: {
+									attr: "",
+								},
+								fieldId: "S_CLASSES",
+							})
+							styledefHead.form.model["S_CLASSES"] = app.globalData.classes
+						}
 
 					}
 					this.setData({
@@ -304,16 +322,8 @@
 
 				} 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') + "1",
-						content: exStr,
-						showCancel: false,
-						confirmText: $this.translateSys('close')
-					});
+					showError(ex, this.translateSys('tip') + "1")
+
 
 				}
 
@@ -346,12 +356,7 @@
 					formItem.dict = list;
 				} 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")
 				}
 
 			},
@@ -419,120 +424,106 @@
 							data_json,
 							ext_info
 						})
-						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 == 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 (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 (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/>') : '';
-							if (tip) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys(
-									'close')
-							});
+							var tip = result.info ? typeof result.info == 'string' ? result.info :
+								result.info.join('\n') : '';
+							tip = tip || result.err_info
+							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) {
 
-							if (result.result_type == 0 && result.action) {
-								result.action.forEach(item => {
+								} else if (typeof result.result == 'string') {
+									showError(result.result)
 
-									if (item.action_type ==
-										"set_dlg_current_edit_attr"
-									) {
+								}
+								try {
+									var actionList = result.action || []
+									actionList.forEach(item => {
 
-										if ($this
-											.focusOldFieldId ==
-											item.value) {
-											$this.setData({
-												focusFieldId: ""
-											})
-										} else {
-											$this.setData({
-												focusFieldId: $this
-													.focusOldFieldId
-											})
+										if (item.action_type ==
+											"set_dlg_current_edit_attr"
+										) {
+
+											if ($this
+												.focusOldFieldId ==
+												item.value) {
+												$this.setData({
+													focusFieldId: ""
+												})
+											} else {
+												$this.setData({
+													focusFieldId: $this
+														.focusOldFieldId
+												})
+											}
+											$this.$nextTick(() => {
+												$this.setData({
+													focusFieldId: item
+														.value
+												})
+											});
+										} else if (item.action_type ==
+											"set_dlg_attr") {
+											// value = {"attr":"xxx", "value":"xxx"}
+											var data = item.value;
+											$this.setFormValues(data)
+										} else if (action.action_type == 'set_dlg_attr_show') {
+											var data = action.value;
+
+											$this.setFormItemVisible(data)
 										}
-										$this.$nextTick(() => {
-											$this.setData({
-												focusFieldId: item
-													.value
-											})
-										});
-									} else if (item.action_type ==
-										"set_dlg_attr") {
-										// value = {"attr":"xxx", "value":"xxx"}
-										var data = item.value;
-										$this.setFormValues(data)
-									}
-								});
-							} else {
-
-								if (result.info) {
-									uni.showModal({
-										title: this.translateSys(
-											"error") + "4.3",
-										content: result.info,
-										showCancel: false,
-										confirmText: this
-											.translateSys('close')
 									});
+
+								} catch (ex) {
+									let actionList = (result.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+									showError(tip, this.translateSys('tip'))
+									return
 								}
 							}
-
 						}
 
 					}
 				} catch (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') + "2",
-						content: exStr,
-						showCancel: false,
-						confirmText: $this.translateSys('close')
-					});
+					showError(ex, this.translateSys('tip') + "2")
 				}
 			},
 			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);
+				}
 			},
 			ontap(item) { //鎵爜鍔熻兘
 				// var $ele = e;
 				//console.log(e.target)
 				this.focusOldFieldId = item.fieldId
 				getApp().onScan((result) => {
-					console.log(result.decodedata);
-					item.value = result.decodedata;
+					console.log(result);
+					item.value = result;
 					var $this = this;
 					let newVal = item.value.trim()
 					if (newVal) {
@@ -647,28 +638,20 @@
 				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')
-					});
+					showInfo(this.translate('icon_click_callback_empty'))
+
 					return;
 				}
 				if (!onSuffixClickEvent.id) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate('icon_click_event_empty'),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					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,
+				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, onSuffixClickCallbackEvent.id,
 					item);
 			},
 
@@ -723,551 +706,100 @@
 						};
 						runCustomEvent(dataInfo).then(result => {
 							console.log(result);
-
-							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 == 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;
-							} else {
-								var tip = result.info ? typeof result.info ==
-									'string' ? result.info :
-									result.info.join('<br/>') : '';
-								if (tip) uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys(
-										'close')
-								});
-
-								if (result.result_type == 0 && result.action) {
-									result.action.forEach(item => {
-
-										if (item.action_type ==
-											"set_dlg_current_edit_attr"
-										) {
-
-											if ($this
-												.focusOldFieldId ==
-												item.value) {
-												$this.setData({
-													focusFieldId: ""
-												})
-											} else {
-												$this.setData({
-													focusFieldId: $this
-														.focusOldFieldId
-												})
-											}
-											$this.$nextTick(() => {
-												$this.setData({
-													focusFieldId: item
-														.value
-												})
-											});
-										} else if (item.action_type ==
-											"set_dlg_attr") {
-											// value = {"attr":"xxx", "value":"xxx"}
-											var data = item.value;
-											$this.setFormValues(data)
-										}
-									});
-								} else {
-
-									if (result.info) {
-										uni.showModal({
-											title: this.translateSys(
-												"error") + "4.3",
-											content: result.info,
-											showCancel: false,
-											confirmText: this
-												.translateSys('close')
-										});
-									}
-								}
-
-							}
+							$this.onFormEventResult(result, "")
 
 						}).catch(ex => {
 							// console.log(ex);
-							let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
-							uni.showModal({
-								title: this.translateSys("error") + "4.1",
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
+							showError(ex, this.translateSys('error') + "4.1")
 						});
 					}
 				} catch (ex) {
-					var tip = typeof ex == "string" ? ex : ex.message;
-					uni.showModal({
-						title: this.translateSys("error") + "4.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('tip') + "4.2")
 				}
 			},
-
-			setFormValues(attrs) {
-				console.log(attrs)
-				const head_styledef = this.head_styledef
-				if (JSON.stringify(attrs) == '{}') {
-					return;
-				}
-				attrs.forEach(async (attr, key) => {
-					if (attr.choice_list) {
-						var dictItemList = [];
-						attr.choice_list.forEach(async (val, index) => {
-							dictItemList.push({
-								text: val,
-								value: val
-							});
-						});
-						head_styledef.form.items.forEach(async (attr_item, index) => {
-							if (attr_item.name != "Layout") {
-								if (attr_item.fieldId == attr.attr) {
-									if (attr_item.useDict) {
-										attr_item.dict = dictItemList;
-									} else {
-										attr_item.selections = dictItemList;
-									}
-								}
-							} else if (attr_item.name == "Layout") {
-								attr_item.setting.colList.forEach((col) => {
-									if (col) {
-										if (col.fieldId == attr.attr) {
-											if (col.useDict) {
-												col.dict = dictItemList;
-											} else {
-												col.selections = dictItemList;
-											}
-										}
-									}
-								});
-							}
-						});
-					}
-					head_styledef.form.model[attr.attr] = attr.value;
-					head_styledef.form.items.forEach(async (ele, index) => {
-						if (ele.name != "Layout") {
-							if (ele.fieldId == attr.attr) {
-								ele.value = attr.value;
-								ele.oldvalue = attr.value;
-							}
-						} else if (ele.name == "Layout") {
-							ele.setting.colList.forEach((col) => {
-								if (col) {
-									if (col.fieldId == attr.attr) {
-										col.value = attr.value;
-										col.oldvalue = attr.value;
-									}
-								}
-							});
+			async onFormEventResult(data, button_callback, item,req) {
+				try {
+					const $this = this
+					var enviroment = {
+						'function': '3000', // 鍔熻兘鐐圭紪鍙�+						cls_id: $this.clsId, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+						'button': 'top', // top/bottom
+						button_name: $this.translateSys('add2'),
+						master: {
+							cls_id: $this.clsId, // button=bottom鏃�master鐨刢ls_id
+							//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 						}
+					};
+					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') : ''
 
-					})
-
-					//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-				})
-				console.log(head_styledef)
-				this.setData({
-					head_styledef: head_styledef
-				})
-			},
-			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;
-				}
-				let global_attr = Base64.encode(JSON.stringify(this.global_attr))
-				let data_json = Base64.encode(JSON.stringify(this.data_json))
-				let ext_info = Base64.encode(JSON.stringify(this.ext_info))
-				var callback_eventid = $this.popupParam.button_callback.trim();
-				var info = {
-					eventid: callback_eventid,
-					edtype: "0",
-					projectid: '',
-					rclsid: '',
-					robjid: '',
-					userlogin: '',
-					clsid: $this.clsId,
-					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.clsId, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�-					'button': 'top', // top/bottom
-					button_name: this.translateSys('add2'),
-					master: {
-						cls_id: this.clsId, // button=bottom鏃�master鐨刢ls_id
-						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
-					}
-				};
-				if (data_attr) {
-					enviroment.edit_dlg = {
-						type: 'small', //灏忕獥鍙�-						class_id: this.clsId, //褰撳墠鏁版嵁绫籭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 = 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/>') : '';
-						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 tip = data.info ? typeof data.info == 'string' ? data.info :
+							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)
+						showInfo(tip)
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
 
-						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;
-									result.forEach(async (attr, key) => {
-										$this.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;
-																		}
-																	}
-																});
-													}
-												});
-									});
-									var head_styledef = JSON.parse(JSON.stringify($this.$data
-										.head_styledef));
-									$this.head_styledef = [];
-									$this.head_styledef = head_styledef;
-									// console.log($this.head_styledef);
-								} else if (action.action_type == 'set_global_attr') {
-									$this.global_attr = 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')
-									});
-								}
+							} else if (typeof data.result == 'string') {
+								showInfo(data.result)
+
 							}
-						}
-						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) {
-				console.log("dataObjRunCustomEvent_Return", eventid, data_attr, button_callback)
-				const $this = this
-				var enviroment = {
-					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: $this.clsId, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�-					'button': 'top', // top/bottom
-					button_name: $this.translateSys('add2'),
-					master: {
-						cls_id: $this.clsId, // 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] || "",
-				}));
-				let global_attr = Base64.encode(JSON.stringify(this.global_attr))
-				let data_json = Base64.encode(JSON.stringify(this.data_json))
-				let ext_info = Base64.encode(JSON.stringify(this.ext_info))
-				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.clsId,
-					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,
-					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) {
+							try {
+								var enviroment = JSON.stringify(enviroment);
+								var actions = data.action || []
 								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 ==
+										"set_dlg_current_edit_attr"
+									) {
 
-									if (action.action_type == 'open_panel') {
+										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 ==
+										"set_dlg_attr") {
+										// value = {"attr":"xxx", "value":"xxx"}
+										var data = action.value;
+										$this.setFormValues(data)
+									} else if (action.action_type ==
+										'set_dlg_attr_show') {
+										var data = action.value;
+
+										$this.setFormItemVisible(data)
+									} else if (action.action_type == 'set_global_attr') {
+										$this.global_attr = 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"),
@@ -1287,7 +819,7 @@
 											item: item,
 											button_callback: button_callback,
 											req: req,
-											data_attr: data_attr
+											data_attr: ""
 										}
 										uni.navigateTo({
 											url: '../selpsn/index?mulit=false&param=' +
@@ -1339,7 +871,8 @@
 											$this.setData({
 												check_list: val.config
 											})
-											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+											if (val.config.appear_style ==
+												'sideslip') //鍒ゆ柇鏄惁鏄晶婊� 												$this.setData({
 													popupType: "right"
 												})
@@ -1353,13 +886,14 @@
 												item: item,
 												button_callback: button_callback,
 												req: req,
-												data_attr: data_attr
+												data_attr: ""
 											}
 											$this.setData({
 												popupParam: popupParam
 											})
 										}
-									} else if (action.action_type == 'open_project_query_dlg') {
+									} else if (action.action_type ==
+										'open_project_query_dlg') {
 										//console.log(action.value.select_range);
 										//console.log(action.value.mulit_select);
 										var priRel = '-1';
@@ -1420,51 +954,319 @@
 											}
 										});
 									} 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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{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")
+				}
+			},
+			setFormValues(attrs) {
+				console.log(attrs)
+				const head_styledef = this.head_styledef
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				attrs.forEach(async (attr, key) => {
+					if (attr.choice_list) {
+						var dictItemList = [];
+						attr.choice_list.forEach(async (val, index) => {
+							dictItemList.push({
+								text: val,
+								value: val
+							});
+						});
+						head_styledef.form.items.forEach(async (attr_item, index) => {
+							if (attr_item.name != "Layout") {
+								if (attr_item.fieldId == attr.attr) {
+									if (attr_item.useDict) {
+										attr_item.dict = dictItemList;
+									} else {
+										attr_item.selections = dictItemList;
+									}
+								}
+							} else if (attr_item.name == "Layout") {
+								attr_item.setting.colList.forEach((col) => {
+									if (col) {
+										if (col.fieldId == attr.attr) {
+											if (col.useDict) {
+												col.dict = dictItemList;
+											} else {
+												col.selections =
+													dictItemList;
+											}
+										}
+									}
+								});
+							}
+						});
+					}
+					head_styledef.form.model[attr.attr] = attr.value;
+					head_styledef.form.items.forEach(async (ele, index) => {
+						if (ele.name != "Layout") {
+							if (ele.fieldId == attr.attr) {
+								ele.value = attr.value;
+								ele.oldvalue = attr.value;
+							}
+						} else if (ele.name == "Layout") {
+							ele.setting.colList.forEach((col) => {
+								if (col) {
+									if (col.fieldId == attr.attr) {
+										col.value = attr.value;
+										col.oldvalue = attr.value;
+									}
+								}
+							});
+						}
+
+					})
+
+					//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+				})
+				this.setData({
+					head_styledef: head_styledef
+				})
+			},
+			setFormItemVisible(attrs) {
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				const head_styledef = this.head_styledef
+				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
+				})
+
+			},
+
+			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;
+				}
+				let global_attr = Base64.encode(JSON.stringify(this.global_attr))
+				let data_json = Base64.encode(JSON.stringify(this.data_json))
+				let ext_info = Base64.encode(JSON.stringify(this.ext_info))
+				var callback_eventid = $this.popupParam.button_callback.trim();
+				var info = {
+					eventid: callback_eventid,
+					edtype: "0",
+					projectid: '',
+					rclsid: '',
+					robjid: '',
+					userlogin: '',
+					clsid: $this.clsId,
+					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;
+				if (!info.eventid)
+					return
+				var enviroment = {
+					'function': '3000', // 鍔熻兘鐐圭紪鍙�+					cls_id: this.clsId, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					'button': 'top', // top/bottom
+					button_name: this.translateSys('add2'),
+					master: {
+						cls_id: this.clsId, // button=bottom鏃�master鐨刢ls_id
+						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
+					}
+				};
+				if (data_attr) {
+					enviroment.edit_dlg = {
+						type: 'small', //灏忕獥鍙�+						class_id: this.clsId, //褰撳墠鏁版嵁绫籭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 = 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 => {
+					$this.onFormEventResult(data, "")
+
 				}).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')
-					});
+					showError(ex, this.translateSys('error') + "3.1")
 				});
 			},
-			onClickOK() {
-				this.handleButtonClick(async (done) => {
-					await this.ok()
-					done(); // 閲嶇疆鐘舵�
+			dataObjRunCustomEvent_Return(eventid, button_callback, item) {
+				console.log("dataObjRunCustomEvent_Return", eventid, button_callback)
+				const $this = this
+				var enviroment = {
+					'function': '3000', // 鍔熻兘鐐圭紪鍙�+					cls_id: $this.clsId, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					'button': 'top', // top/bottom
+					button_name: $this.translateSys('add2'),
+					master: {
+						cls_id: $this.clsId, // 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] || "",
+				}));
+				let global_attr = Base64.encode(JSON.stringify(this.global_attr))
+				let data_json = Base64.encode(JSON.stringify(this.data_json))
+				let ext_info = Base64.encode(JSON.stringify(this.ext_info))
+				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.clsId,
+					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,
+					global_attr,
+					input_param: input_param,
+				};
+				console.log(dataInfo);
+				// return;
+				runCustomEvent(dataInfo).then(data => {
+					$this.onFormEventResult(data, button_callback, item,req)
+
+				}).catch(ex => {
+					showError(ex, this.translateSys('tip') + "5.1")
+
 				});
 			},
 			//纭畾
@@ -1475,6 +1277,7 @@
 						mask: true
 					});
 					this.okLoading = true
+					console.log(obj_attr)
 					var obj_attr = this.head_styledef.form.model || {};
 					console.log(obj_attr)
 					let ret = await this.sava();
@@ -1490,6 +1293,8 @@
 
 					uni.navigateBack()
 				} catch (ex) {
+					this.okLoading = true
+					showError(ex, this.translateSys('tip') + "1")
 					return false;
 				}
 			},
@@ -1526,7 +1331,7 @@
 					return true;
 				} catch (ex) {
 					console.log("sava", ex)
-					this.showError(ex)
+					showError(ex, this.translateSys('tip'))
 					return false;
 				}
 
@@ -1572,16 +1377,7 @@
 					await runCustomEvent(dataInfo)
 					return true
 				} catch (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")
 					return false
 				}
 
@@ -1599,16 +1395,7 @@
 					await dataObjCreate(dataInfo)
 					return true
 				} catch (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") + "6.1",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('tip') + "6.1")
 					return false
 				}
 
@@ -1626,16 +1413,7 @@
 					return true
 
 				} catch (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") + "6.2",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('tip') + "6.2")
 					return false
 				}
 
@@ -1652,8 +1430,10 @@
 							value: obj_attr[a],
 						})),
 					};
-					let global_attr = Base64.encode(JSON.stringify(this.global_attr))
-					let data_json = Base64.encode(JSON.stringify(this.data_json))
+					let global_attr = Base64.encode(JSON.stringify(this
+						.global_attr))
+					let data_json = Base64.encode(JSON.stringify(this
+						.data_json))
 					let ext_info = Base64.encode(JSON.stringify(this.ext_info))
 					var dataInfo = {
 						ed_type: "0",
@@ -1672,21 +1452,13 @@
 						data_json,
 						ext_info,
 						compose_info: '',
-						input_param: Base64.encode(JSON.stringify(input_param)),
+						input_param: Base64.encode(JSON.stringify(
+							input_param)),
 					};
 					await runCustomEvent(dataInfo)
 					return true
 				} catch (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.2",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('tip') + "7.2")
 					return false
 				}
 
@@ -1710,59 +1482,15 @@
 						delta: 1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
 					});
 					await this.afterCancel();
-				} catch (ex) {}
+				} catch (ex) {
+					showError(ex, this.translateSys('tip'))
+				}
 			},
 			async beforeCancel() {
 				try {
 					if (!this.beforeCancelEvent.id) return true;
 					var obj_attr = this.head_styledef.form.model;
 
-					let inputParam = {
-						id: "",
-						attrs: Object.keys(obj_attr).map((a) => ({
-							attr: a,
-							value: obj_attr[a],
-						})),
-					};
-					let input_param = Base64.encode(JSON.stringify(
-						inputParam));
-					let global_attr = Base64.encode(JSON.stringify(this
-						.global_attr))
-					let data_json = Base64.encode(JSON.stringify(this
-						.data_json))
-					let ext_info = Base64.encode(JSON.stringify(this.ext_info))
-
-					await runCustomEvent({
-						ed_type: 0,
-						start_transaction: true,
-						class_id: this.clsId,
-						event_id: this.beforeCancelEvent.id,
-						data_obj_id: this.objId,
-						obj_attr,
-						input_param,
-						global_attr,
-						data_json,
-						ext_info,
-					})
-					return true
-				} catch (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") + "8.1",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
-					return false
-				}
-			},
-			async afterCancel() {
-				try {
-					if (!this.afterCancelEvent.id) return true;
-					var obj_attr = this.head_styledef.form.model;
 					let inputParam = {
 						id: "",
 						attrs: Object.keys(obj_attr).map((a) => ({
@@ -1783,6 +1511,48 @@
 						ed_type: 0,
 						start_transaction: true,
 						class_id: this.clsId,
+						event_id: this.beforeCancelEvent.id,
+						data_obj_id: this.objId,
+						obj_attr,
+						input_param,
+						global_attr,
+						data_json,
+						ext_info,
+					})
+					return true
+				} catch (ex) {
+					showError(ex, this.translateSys('tip') + "8.1")
+					return false
+				}
+			},
+			async afterCancel() {
+				try {
+					if (!this.afterCancelEvent.id) return true;
+					var obj_attr = this.head_styledef.form.model;
+					let inputParam = {
+						id: "",
+						attrs: Object.keys(obj_attr).map((a) =>
+							({
+								attr: a,
+								value: obj_attr[a],
+							})),
+					};
+					let input_param = Base64.encode(JSON.stringify(
+						inputParam));
+					let global_attr = Base64.encode(JSON.stringify(
+						this
+						.global_attr))
+					let data_json = Base64.encode(JSON.stringify(
+						this
+						.data_json))
+					let ext_info = Base64.encode(JSON.stringify(
+						this
+						.ext_info))
+
+					await runCustomEvent({
+						ed_type: 0,
+						start_transaction: true,
+						class_id: this.clsId,
 						event_id: this.afterCancelEvent.id,
 						data_obj_id: this.objId,
 						obj_attr,
@@ -1793,28 +1563,11 @@
 					})
 					return true
 				} catch (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") + "8.2",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('tip') + "8.2")
 					return false
 				}
 			},
-			showError(ex) {
-				uni.showModal({
-					title: this.translateSys('error'),
-					content: typeof ex == "string" ? ex : typeof ex.errMsg == "string" ? ex.errMsg : "",
-					showCancel: false,
-					confirmText: this.translateSys('cancel')
-				})
-			},
+
 			translate(t) {
 				if (typeof this.$t == "function") return this.$t(
 					`page.${t}`)
@@ -1844,39 +1597,6 @@
 			flex-direction: column;
 		}
 
-		.v-head-style {
-			width: 98%;
-
-			.uni-forms-item {
-				margin-bottom: 11rpx;
-			}
-
-			.input-wrapper {
-				border: 1px solid #d5d5d5;
-				width: 100%;
-				display: flex;
-				flex-direction: row;
-
-				.uni-input {
-					flex: 1;
-					padding: 12rpx 8rpx;
-					color: #2d8cf0;
-					// height: 40rpx;
-					// line-height: 40rpx;
-				}
-
-				.uni-icon {
-
-					padding: 10rpx 5rpx;
-					font-size: 32rpx;
-					color: rgb(192, 196, 204);
-				}
-			}
-
-			.input-wrapper:hover {
-				border: 1px solid rgb(41, 121, 255);
-			}
-		}
 
 		.view-content {
 			display: flex;

--
Gitblit v1.9.1