From d84283821bb08d81d887f20a7118caf25b8b2714 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期二, 27 八月 2024 18:29:10 +0800
Subject: [PATCH] 判断接口返回值是否是字符串,然后解析

---
 pages/modal/5601.vue | 1623 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 1,097 insertions(+), 526 deletions(-)

diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 4b3901f..50ace94 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="uni-page-modal-5601">
 		<!-- 琛ㄥご鏍峰紡 -->
-
 		<uni-forms ref="baseForm" label-align="right">
 			<view v-for="(item,index) in head_styledef.form.items" :key="index" class="v-head-style">
 				<!-- 鏅�甯冨眬 -->
@@ -17,7 +16,7 @@
 							:style="{'padding-left':item.setting.prefix?0 : '8rpx','right':item.setting.suffix?0 : '8rpx'}"
 							:type="item.name=='Input'?'text':'number'" v-model="item.value" :disabled="item.disabled"
 							:placeholder="item.placeholder" :focus="focusFieldId == item.fieldId" @focus="ontap(item)"
-							@keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)" />
+							@click="onClick(item)" @keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)" />
 						<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
 							@click="onEnterChange(item)"></text>
 					</view>
@@ -25,7 +24,7 @@
 				<!-- 鏍呮牸甯冨眬 -->
 				<uni-row v-else :gutter="item.setting.gutter">
 					<uni-col
-						:span=" item.setting.spanList && item.setting.spanList[key - 1]? item.setting.spanList[key - 1] : 24 / item.setting.col"
+						:span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
 						v-for="(col,key) in item.setting.colList">
 						<uni-forms-item :label="col.label +'锛�" :label-width="col.labelWidth+'px'">
 							<uni-data-picker v-if="col.name=='Select'" :class="col.disabled?'input-disabled':''"
@@ -38,7 +37,7 @@
 									:style="{'padding-left':col.setting.prefix?0 : '8px','right':col.setting.suffix?0 : '8px'}"
 									:type="col.name=='Input'?'text':'number'" v-model="col.value"
 									:disabled="col.disabled" :placeholder="col.placeholder"
-									:focus="focusFieldId == col.fieldId" @focus="ontap(col)"
+									:focus="focusFieldId == col.fieldId" @focus="ontap(col)" @click="onClick(col)"
 									@keyup.enter="onEnterChange(col)" @blur="onEnterChange(col)" />
 								<text v-if="col.setting.suffix" class="uni-icon" :class="[col.setting.suffix]"
 									@click="onEnterChange(col)"></text>
@@ -85,7 +84,7 @@
 												<!-- 鏍呮牸甯冨眬 -->
 												<uni-row class="demo-uni-row" v-else :gutter="item.setting.gutter">
 													<uni-col
-														:span=" item.setting.spanList && item.setting.spanList[key - 1]? item.setting.spanList[key - 1] : 24 / item.setting.col"
+														:span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
 														v-for="(cols,key) in item.setting.colList">
 														<view v-if="cols!=null">
 															<text class="txt_title"
@@ -117,8 +116,9 @@
 							<view class="view-bottom" v-if="pageData.OK_Button==true">
 								<button type="default" @tap="cancel"
 									class="btn_cancel">{{translateSys('cancel')}}</button>
-								<button type="primary" @tap="ok(pageData)"
-									class="btn_add">{{translateSys('ok')}}</button>
+								<button type="primary" @tap="ok(pageData)" class="btn_add"
+									:class="pageData.okLoading?'btn_disabled':''"
+									:disabled="pageData.okLoading? true:false">{{translateSys('ok')}}</button>
 							</view>
 						</view>
 					</swiper-item>
@@ -186,10 +186,12 @@
 			}); //璁剧疆椤堕儴鏍囬 
 			this.title = options.titlename;
 			this.param = JSON.parse(options.param);
+
+
 			//鑾峰彇涓绘暟鎹被ID
 			this.ClsID = this.param.master_cls?.id;
 			if (this.ClsID) {
-				this.loadData()
+				this.loadData(options.paramValue)
 			} else {
 				uni.showModal({
 					title: this.translateSys("error"),
@@ -222,10 +224,34 @@
 					});
 				});
 			},
-			async loadData() {
+			async loadData(paramValue) {
 
 				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� 				await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID);
+				//浼犲叆鍙傛暟鍊�+				if (paramValue) {
+					const attrs = paramValue.attrs || [];
+					(this.$data.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;
+										}
+									});
+								}
+							});
+						}
+					})
+				}
 				//鍔犺浇鍒濆鐣岄潰
 				if (this.$data.param.Show_Welcom_Page) {
 					this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
@@ -235,8 +261,9 @@
 				//鍔犺浇Tab椤电
 				const pageList = this.param.Sub_Page || []
 				for (let i in pageList) {
-					page.DefList = [];
+
 					const page = pageList[i]
+					page.DefList = [];
 					page.StyleDef = await this.Detail_UIstyleGetInfo(
 						this.ClsID,
 						page.UI_Style.ID
@@ -246,6 +273,7 @@
 				this.setData({
 					pageDetail: pageList
 				})
+
 				console.log(this.pageDetail);
 			},
 			changeSwiper(evt) {
@@ -268,135 +296,270 @@
 				}
 			},
 			async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					class_id: class_id,
-					ui_style_id: style_id,
-				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						const styledefHead = styledef ? JSON.parse(styledef) : {};
-
-						styledefHead.form.items.forEach(async (ele) => {
+				try {
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					const ret = await this.getUIStyleInfo(dataInfo)
+					var styledef = "";
+					if (ret.result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = ret.result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!ret.result.style_def.includes('"')) styledef = Base64.decode(
+							ret.result
+							.style_def);
+					}
+					const styledefHead = styledef ? JSON.parse(styledef) : {};
+					if (styledefHead?.form?.items) {
+						for (let i in styledefHead.form.items) {
+							const ele = styledefHead.form.items[i]
 							if (ele.name != "Layout") {
 								if (ele?.useDict) {
 									//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-									await this.DictGetInfo(ele.bind.dict, styledefHead.form.model,
+									await this.DictGetInfo(ele.bind.dict,
+										styledefHead.form.model,
 										ele);
 								}
 								if ($this.focusFieldId == "") {
-									if (ele.name == 'Input' || ele.name == 'InputNumber') {
+									if (ele.name == 'Input' || ele.name ==
+										'InputNumber') {
 										$this.setData({
 											focusFieldId: ele.fieldId
 										})
 									}
 								}
 							} else {
-								ele.setting.colList.forEach(async (col) => {
+								for (let j in ele.setting.colList) {
+									const col = ele.setting.colList[j]
 									if (col?.useDict) {
 										//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-										await this.DictGetInfo(col.bind.dict,
-											styledefHead.form.model, col);
+										await this.DictGetInfo(col.bind
+											.dict,
+											styledefHead.form
+											.model, col);
 									}
 									if ($this.focusFieldId == "") {
-										if (col.name == 'Input' || col.name ==
+										if (col.name == 'Input' || col
+											.name ==
 											'InputNumber') {
 											$this.setData({
-												focusFieldId: col.fieldId
+												focusFieldId: col
+													.fieldId
 											})
 										}
 									}
-								});
+								}
 							}
-						});
-						this.setData({
-							head_styledef: styledefHead
-						})
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
-					}
-				}).catch(ex => {
-					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "1.1",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys("cancel")
-					});
-				});
-
-			},
-			async Detail_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					class_id: class_id,
-					ui_style_id: style_id,
-				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
 						}
 
-						const detailstyledef = ret.result.style_def ? JSON.parse(styledef) : {};
-						detailstyledef.SelBut_Checked = true;
-						detailstyledef.form.items.forEach(async (ele, index) => {
-
-							if (ele.name != "Layout") {
-								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-									await this.DictGetInfo(ele.bind.dict, detailstyledef.form
-										.model, ele);
-								}
-							} else {
-								ele.setting.colList.forEach(async (col) => {
-									if (col?.useDict == true) {
-										await this.DictGetInfo(col.bind.dict,
-											detailstyledef.form.model, col);
-									}
-								})
-							}
-						});
-						console.log("Detail_UIstyleGetInfo", detailstyledef);
-						return detailstyledef
-					} else {
-						return {}
-						uni.showModal({
-							title: this.translateSys("error") + "2",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
 					}
-				}).catch(ex => {
+					this.setData({
+						head_styledef: styledefHead
+					})
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
-						title: this.translateSys("error") + "2.1",
+						title: this.translateSys("error") + "1",
 						content: ex.errMsg,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
 					return {}
-				});
+				}
+				// this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
+				// 	// console.log(ret);
+				// 	if (ret.err_code == 0) {
+				// 		var styledef = "";
+				// 		if (ret.result.style_def) {
+				// 			//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+				// 			styledef = ret.result.style_def.replace(/\\/g, "");
+				// 			//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+				// 			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(
+				// 				ret.result
+				// 				.style_def);
+				// 		}
+				// 		const styledefHead = styledef ? JSON.parse(styledef) : {};
+
+				// 		for (let i in styledefHead.form.items) {
+				// 			const ele = styledefHead.form.items[i]
+				// 			if (ele.name != "Layout") {
+				// 				if (ele?.useDict) {
+				// 					//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+				// 					await this.DictGetInfo(ele.bind.dict,
+				// 						styledefHead.form.model,
+				// 						ele);
+				// 				}
+				// 				if ($this.focusFieldId == "") {
+				// 					if (ele.name == 'Input' || ele.name ==
+				// 						'InputNumber') {
+				// 						$this.setData({
+				// 							focusFieldId: ele.fieldId
+				// 						})
+				// 					}
+				// 				}
+				// 			} else {
+				// 				for (let j in ele.setting.colList) {
+				// 					const col = ele.setting.colList[j]
+				// 					if (col?.useDict) {
+				// 						//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+				// 						await this.DictGetInfo(col.bind
+				// 							.dict,
+				// 							styledefHead.form
+				// 							.model, col);
+				// 					}
+				// 					if ($this.focusFieldId == "") {
+				// 						if (col.name == 'Input' || col
+				// 							.name ==
+				// 							'InputNumber') {
+				// 							$this.setData({
+				// 								focusFieldId: col
+				// 									.fieldId
+				// 							})
+				// 						}
+				// 					}
+				// 				}
+				// 			}
+				// 		}
+				// 		this.setData({
+				// 			head_styledef: styledefHead
+				// 		})
+				// 	} else {
+				// 		uni.showModal({
+				// 			title: this.translateSys("error") + "1",
+				// 			content: ret.err_msg,
+				// 			showCancel: false,
+				// 			confirmText: this.translateSys("cancel")
+				// 		});
+				// 	}
+				// }).catch(ex => {
+				// 	// console.log(ex);
+				// 	uni.showModal({
+				// 		title: this.translateSys("error") + "1.1",
+				// 		content: ex.errMsg,
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// });
+
+			},
+			async Detail_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�+				try {
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					const ret = await this.getUIStyleInfo(dataInfo)
+					var styledef = "";
+					if (ret.result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = ret.result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!ret.result.style_def.includes('"')) styledef = Base64
+							.decode(ret.result
+								.style_def);
+					}
+
+					const detailstyledef = ret.result.style_def ? JSON.parse(
+						styledef) : {};
+					detailstyledef.SelBut_Checked = true;
+					if (detailstyledef?.form?.items) {
+						for (let index in detailstyledef.form.items) {
+							const ele = detailstyledef.form.items[index]
+
+							if (ele.name != "Layout") {
+								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									await this.DictGetInfo(ele.bind.dict,
+										detailstyledef.form
+										.model, ele);
+								}
+							} else {
+								for (let j in ele.setting.colList) {
+									const col = ele.setting.colList[j]
+									if (col?.useDict == true) {
+										await this.DictGetInfo(col
+											.bind.dict,
+											detailstyledef.form
+											.model, col);
+									}
+								}
+							}
+						}
+
+					}
+					console.log("Detail_UIstyleGetInfo", detailstyledef);
+					return detailstyledef
+				} catch (ex) {
+					// console.log(ex);
+					uni.showModal({
+						title: this.translateSys("error") + "2",
+						content: ex.errMsg,
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return {}
+				}
+				// this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
+				// 	// console.log(ret);
+				// 	if (ret.err_code == 0) {
+				// 		var styledef = "";
+				// 		if (ret.result.style_def) {
+				// 			//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+				// 			styledef = ret.result.style_def.replace(/\\/g, "");
+				// 			//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+				// 			if (!ret.result.style_def.includes('"')) styledef = Base64
+				// 				.decode(ret.result
+				// 					.style_def);
+				// 		}
+
+				// 		const detailstyledef = ret.result.style_def ? JSON.parse(
+				// 			styledef) : {};
+				// 		detailstyledef.SelBut_Checked = true;
+				// 		for (let index in detailstyledef.form.items) {
+				// 			const ele = detailstyledef.form.items[index]
+
+				// 			if (ele.name != "Layout") {
+				// 				if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+				// 					await this.DictGetInfo(ele.bind.dict,
+				// 						detailstyledef.form
+				// 						.model, ele);
+				// 				}
+				// 			} else {
+				// 				for (let j in ele.setting.colList) {
+				// 					const col = ele.setting.colList[j]
+				// 					if (col?.useDict == true) {
+				// 						await this.DictGetInfo(col
+				// 							.bind.dict,
+				// 							detailstyledef.form
+				// 							.model, col);
+				// 					}
+				// 				}
+				// 			}
+				// 		}
+				// 		console.log("Detail_UIstyleGetInfo", detailstyledef);
+				// 		return detailstyledef
+				// 	} else {
+				// 		return {}
+				// 		uni.showModal({
+				// 			title: this.translateSys("error") + "2",
+				// 			content: ret.err_msg,
+				// 			showCancel: false,
+				// 			confirmText: this.translateSys("cancel")
+				// 		});
+				// 	}
+				// }).catch(ex => {
+				// 	// console.log(ex);
+				// 	uni.showModal({
+				// 		title: this.translateSys("error") + "2.1",
+				// 		content: ex.errMsg,
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// 	return {}
+				// });
 
 			},
 
@@ -407,34 +570,28 @@
 					dict_id: dict.id,
 					dict_name: dict.name
 				};
-				// console.log(dataInfo);
-				this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => {
-					console.log(success);
-					if (success.err_code == 0) {
-						var list = [];
-						var itemName = '';
-						success.result.dict_item_list.forEach((item) => {
-							if (item.is_default == '1')
-								itemName = item.name;
-							list.push({
-								text: item.value,
-								value: item.name,
-							});
+				try {
+					const res = await this.getDictInfo(dataInfo)
+					var list = [];
+					var itemName = '';
+					res.result.dict_item_list.forEach((item) => {
+						if (item.is_default == '1')
+							itemName = item.name;
+						list.push({
+							text: item.value,
+							value: item.name,
 						});
-						if (itemName) {
-							formItem.value = itemName;
-							formModel[formItem.fieldId] = itemName;
-						}
-						formItem.dict = list;
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "3.1",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+					});
+					//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+					if (itemName) {
+						formItem.value = itemName;
+						formModel[formItem.fieldId] = itemName;
 					}
-				}).catch(ex => {
+					formItem.dict = list;
+
+					// $this.head_styledef.form.items[index].dictitem=success.result;
+					// this.$store.commit("classAttrList", $this.$data.classAttrList);
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
 						title: this.translateSys("error") + "3",
@@ -442,9 +599,89 @@
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
+				}
+
+			},
+			getDictInfo(info) { //Mobox3寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�+				const loginInfo = this.$store.getters.loginid
+				const mobxoSApi = this.$store.getters.getMobxoSApi
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
+						data: info,
+						method: 'POST',
+						dataType: "json",
+						success: (_res) => {
+							// console.log(_res);
+							const ret = _res.data
+							if (ret.err_code == 0) {
+								resolve(ret);
+							} else {
+								reject({
+									"errMsg": ret.err_msg
+								});
+							}
+						},
+						fail: (err) => {
+							// console.log(err);
+							reject(err);
+						}
+					})
+
+				})
+
+			},
+			getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+				const loginInfo = this.$store.getters.loginid
+				const dataSApi = this.$store.getters.getDataSApi
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+							.session_id,
+						data: info,
+						method: 'POST',
+						dataType: "json",
+						success: (_res) => {
+							// console.log(_res);
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
+							if (ret.err_code == 0) {
+								resolve(ret);
+							} else {
+								reject({
+									"errMsg": ret.err_msg || ret.errMsg
+								});
+							}
+						},
+						fail: (err) => {
+							// console.log(err);
+							reject(err);
+						}
+					})
+
+				})
+
 			},
 
+			onClick(item) {
+				this.focusFieldId = item.fieldId
+			},
 			ontap(item) { //鎵爜鍔熻兘
 				// var $ele = e;
 				//console.log(e.target)
@@ -453,13 +690,15 @@
 					console.log(result.decodedata);
 					item.value = result.decodedata;
 					var $this = this;
-					if (item.oldvalue != item.value) {
+					if (item.oldvalue != item.value && item.value.trim() != "") {
 						item.oldvalue = item.value;
 						var attr = item.fieldId;
 						this.head_styledef.form.model[attr] = item.value;
 						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-						var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�-						var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�+						var onSuffixClickCallbackEvent = item.bind
+							.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+						var onSuffixClickEvent = item.bind
+							.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 						var isflag = false;
 
 						if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�@@ -472,7 +711,8 @@
 								const ele = $this.head_styledef.form.items[i]
 
 								if (ele.name != "Layout") {
-									if (ele.name == 'Input' || ele.name == 'InputNumber') {
+									if (ele.name == 'Input' || ele.name ==
+										'InputNumber') {
 										if (attr == ele.fieldId) {
 											findd = true
 										} else {
@@ -488,32 +728,39 @@
 									}
 								} else {
 									if (findd) {
-										let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-											return (col.name == 'Input' || col.name == 'InputNumber');
+										let curIndex = ele.setting.colList.findIndex((
+											col, index2, arr) => {
+											return (col.name == 'Input' || col
+												.name == 'InputNumber');
 										})
 										if (curIndex > -1) {
 											$this.setData({
-												focusFieldId: ele.setting.colList[curIndex]
+												focusFieldId: ele.setting
+													.colList[curIndex]
 													.fieldId
 											})
 											break
 										}
 
 									} else {
-										let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
+										let curIndex = ele.setting.colList.findIndex((
+											col, index2, arr) => {
 											return attr == col.fieldId;
 										})
 										if (curIndex > -1) {
 											findd = true
-											let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
-												return (col.name == 'Input' || col.name ==
-														'InputNumber') &&
-													index2 >
-													curIndex;
-											})
+											let curIndex2 = ele.setting.colList
+												.findIndex((col, index2, arr) => {
+													return (col.name == 'Input' ||
+															col.name ==
+															'InputNumber') &&
+														index2 >
+														curIndex;
+												})
 											if (curIndex2 > -1) {
 												$this.setData({
-													focusFieldId: ele.setting.colList[curIndex]
+													focusFieldId: ele.setting
+														.colList[curIndex]
 														.fieldId
 												})
 												break
@@ -528,14 +775,16 @@
 					}
 				})
 			},
+
 			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
 				console.log(item);
-				if (item.oldvalue != item.value) {
+				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
 					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-					var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+					var onSuffixClickCallbackEvent = item.bind
+						.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 					var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 					var isflag = false;
 
@@ -547,43 +796,48 @@
 			},
 			getDetailAttrList(pageData) {
 				const detailAttrList = [];
-				pageData.DefList.forEach(style => {
-					var detail_attr = {};
-					style.form.items.forEach(item => {
-						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-							item.setting.colList.forEach(cols => {
-								if (cols != null) detail_attr[cols.fieldId] = cols.value;
-							});
-						} else
-							detail_attr[item.fieldId] = item.value;
-					});
-
-					detail_attr['id'] = style.form.objId;
-					if (pageData.Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
-						if (style.SelBut_Checked == true)
-							detailAttrList.push(detail_attr);
-					} else
-						detailAttrList.push(detail_attr);
-				});
-				// console.log(detailAttrList);
-				//鑾峰彇姝e湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
-				pageData.DefList.forEach(style => {
-					style.form.attrs.forEach(attr => {
-						for (var key in detailAttrList) {
-							if (style.form.objId == detailAttrList[key]['id']) {
-								var keys = Object.keys(detailAttrList[key]);
-								var isflag = true;
-								keys.forEach((ele) => {
-									if (ele == attr.attr) isflag = false;
+				if (pageData.DefList) {
+					pageData.DefList.forEach(style => {
+						var detail_attr = {};
+						style.form.items.forEach(item => {
+							if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+								item.setting.colList.forEach(cols => {
+									if (cols != null) detail_attr[cols
+										.fieldId] = cols.value;
 								});
-								if (isflag) {
-									detailAttrList[attr.attr] = attr.value;
+							} else
+								detail_attr[item.fieldId] = item.value;
+						});
+
+						detail_attr['id'] = style.form.objId;
+						if (pageData.Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+							if (style.SelBut_Checked == true)
+								detailAttrList.push(detail_attr);
+						} else
+							detailAttrList.push(detail_attr);
+					});
+					// console.log(detailAttrList);
+					//鑾峰彇姝e湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
+					pageData.DefList.forEach(style => {
+						style.form.attrs.forEach(attr => {
+							for (var key in detailAttrList) {
+								if (style.form.objId == detailAttrList[key][
+										'id'
+									]) {
+									var keys = Object.keys(detailAttrList[key]);
+									var isflag = true;
+									keys.forEach((ele) => {
+										if (ele == attr.attr) isflag =
+											false;
+									});
+									if (isflag) {
+										detailAttrList[attr.attr] = attr.value;
+									}
 								}
 							}
-						}
+						});
 					});
-				});
-
+				}
 				const jsonlist = [];
 				detailAttrList.forEach(attr => {
 					jsonlist.push({
@@ -607,7 +861,8 @@
 						this.head_styledef.form.items.forEach(item => {
 							if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 								item.setting.colList.forEach(cols => {
-									if (cols != null) head_attr[cols.fieldId] = cols.value;
+									if (cols != null) head_attr[cols
+										.fieldId] = cols.value;
 								});
 							} else
 								head_attr[item.fieldId] = item.value;
@@ -625,12 +880,15 @@
 						var $this = this;
 						const jsonList = []
 						this.pageDetail.forEach((page) => {
+
 							jsonList.push({
 								page_name: page.Name,
-								item_list: $this.getDetailAttrList(page.DefList, page
+								item_list: $this.getDetailAttrList(page
+									.DefList, page
 									.Select_Button),
 								ext_data: page.ExtData || {}
 							})
+
 						})
 						const data_json = Base64.encode(
 							JSON.stringify(jsonList)
@@ -655,234 +913,429 @@
 							input_param: input_param,
 						};
 						this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
-							// console.log(ret);
+							console.log(ret);
 							if (ret.err_code == 0) {
 								var result = ret.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) uni.showModal({
+									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(
+												"cancel")
+										});
+									} else uni.showModal({
 										title: this.translateSys('tip'),
-										content: tip,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-									else uni.showModal({
-										title: this.translateSys('tip'),
-										content: tip + ',' + this.translateSys('tip') + ':' + result
+										content: tip + ',' + this
+											.translateSys('tip') + ':' +
+											result
 											.ret,
 										showCancel: false,
-										confirmText: this.translateSys("cancel")
+										confirmText: this.translateSys(
+											"cancel")
 									});
 									return false;
 								} else {
-									var tip = result.info ? typeof result.info == 'string' ? result.info :
+									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("cancel")
+										confirmText: this.translateSys(
+											"cancel")
 									});
 
 									if (result.result_type == 0 && result.action) {
 										result.action.forEach(item => {
-											if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�-												$this.$data.param.Show_Welcom_Page = false;
+
+											if (item.action_type ==
+												"insert_subtable_page_row"
+											) { //鐮佺洏涓�+												$this.$data.param
+													.Show_Welcom_Page =
+													false;
 												var value = item.value;
 												$this.viewAceionRow(value);
 											} else if (item.action_type ==
-												"set_subtable_page_content") { //宸茬爜鐩�-												$this.$data.param.Show_Welcom_Page = false;
+												"set_subtable_page_content"
+											) { //宸茬爜鐩�+												$this.$data.param
+													.Show_Welcom_Page =
+													false;
 												var value = item.value;
-												const pageData = $this.pageDetail.find((page) => {
-													value.page_name == page.Name;
-												});
-												if (value.clear_confirm != false && value.clear ==
+												const pageData = $this
+													.pageDetail.find((
+														page) => {
+														return value
+															.page_name ==
+															page.Name;
+													});
+												if (value.clear_confirm !=
+													false && value.clear ==
 													true &&
-													pageData && pageData.DefList.length > 0
+													pageData && pageData
+													.DefList.length > 0
 												) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹� 													uni.showModal({
-														title: this.translateSys('tip'),
-														content: this.translate(
-																"are_you_sure_clear_first") +
-															this.translateSys(
-																"quotation_mark_left") + value
-															.page_name + this.translateSys(
-																"sys.quotation_mark_right") +
-															this.translate(
-																"are_you_sure_clear_last"),
-														success: function(res) {
-															if (res.confirm) {
-																if (pageData)
-																	pageData.DefList = [];
-																$this.viewAceionContent(
-																	value);
-															} else if (res.cancel) {
-																if (pageData)
-																	pageData.DefList = [];
-																$this.viewAceionContent(
-																	value);
+														title: this
+															.translateSys(
+																'tip'
+															),
+														content: this
+															.translate(
+																"are_you_sure_clear_first"
+															) +
+															this
+															.translateSys(
+																"quotation_mark_left"
+															) +
+															value
+															.page_name +
+															this
+															.translateSys(
+																"quotation_mark_right"
+															) +
+															this
+															.translate(
+																"are_you_sure_clear_last"
+															),
+														success: function(
+															res
+														) {
+															if (res
+																.confirm
+															) {
+																if (
+																	pageData)
+																	pageData
+																	.DefList = [];
+																$this
+																	.viewAceionContent(
+																		value
+																	);
+															} else if (
+																res
+																.cancel
+															) {
+																if (
+																	pageData)
+																	pageData
+																	.DefList = [];
+																$this
+																	.viewAceionContent(
+																		value
+																	);
 															}
 														}
 													});
 												} else {
 													if (pageData)
-														pageData.DefList = [];
-													$this.viewAceionContent(value);
+														pageData
+														.DefList = [];
+													$this
+														.viewAceionContent(
+															value);
 												}
 											} else if (item.action_type ==
-												"select_subtable_page_row") {
+												"select_subtable_page_row"
+											) {
 												// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
 												var value = item.value;
-												const pageData = $this.pageDetail.find((page) => {
-													value.page_name == page.Name;
-												});
-												if (pageData?.DefList) {
-													pageData.DefList.forEach(ele => {
-														$this.activelist[index].active = false;
-														if (ele.form.objId == value.row.id) {
-															ele.SelBut_Checked = true;
-															$this.active_id = ele.form
-																.htmlobjId;
-															//鑷姩婊氬姩鍒版寚瀹氬厓绱�-															uni.createSelectorQuery()
-																.select("#tabpanel" + value
-																	.page_name) //瀵瑰簲澶栧眰鑺傜偣
-																.boundingClientRect((
-																	container) => {
-																	uni.createSelectorQuery()
-																		.select(
-																			"#dvpanel" +
-																			ele.form
-																			.htmlobjId
-																		) //鐩爣鑺傜偣
-																		.boundingClientRect(
-																			(
-																				target
-																			) => {
-																				uni.pageScrollTo({
-																					scrollTop: target
-																						.top -
-																						container
-																						.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�-																				});
-																			})
-																		.exec();
-																})
-																.exec();
-														}
+												const pageData = $this
+													.pageDetail.find((
+														page) => {
+														return value
+															.page_name ==
+															page.Name;
 													});
+												if (pageData?.DefList) {
+													pageData.DefList
+														.forEach(ele => {
+															$this
+																.activelist[
+																	index
+																]
+																.active =
+																false;
+															if (ele
+																.form
+																.objId ==
+																value
+																.row.id
+															) {
+																ele.SelBut_Checked =
+																	true;
+																$this
+																	.active_id =
+																	ele
+																	.form
+																	.htmlobjId;
+																//鑷姩婊氬姩鍒版寚瀹氬厓绱�+																uni.createSelectorQuery()
+																	.select(
+																		"#tabpanel" +
+																		value
+																		.page_name
+																	) //瀵瑰簲澶栧眰鑺傜偣
+																	.boundingClientRect(
+																		(
+																			container
+																		) => {
+																			uni.createSelectorQuery()
+																				.select(
+																					"#dvpanel" +
+																					ele
+																					.form
+																					.htmlobjId
+																				) //鐩爣鑺傜偣
+																				.boundingClientRect(
+																					(
+																						target
+																					) => {
+																						uni.pageScrollTo({
+																							scrollTop: target
+																								.top -
+																								container
+																								.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�+																						});
+																					}
+																				)
+																				.exec();
+																		}
+																	)
+																	.exec();
+															}
+														});
 												}
 											} else if (item.action_type ==
-												"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+												"remove_subtable_page_row"
+											) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 												var value = item.value;
-												const pageData = $this.pageDetail.find((page) => {
-													value.page_name == page.Name;
-												});
+												const pageData = $this
+													.pageDetail.find((
+														page) => {
+														return value
+															.page_name ==
+															page.Name;
+													});
 												if (pageData
 													?.DefList
 												) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 												{
-													value.row.forEach(row => {
-														pageData
-															.DefList
-															.forEach((ele, index) => {
-																if (ele.form.objId == row
-																	.id) {
-																	pageData
-																		.DefList
-																		.splice(index, 1);
-																}
-															});
-													});
+													value.row.forEach(
+														row => {
+															pageData
+																.DefList
+																.forEach(
+																	(ele,
+																		index
+																	) => {
+																		if (ele
+																			.form
+																			.objId ==
+																			row
+																			.id
+																		) {
+																			pageData
+																				.DefList
+																				.splice(
+																					index,
+																					1
+																				);
+																		}
+																	});
+														});
 												}
 
 
 
-											} else if (item.action_type == "set_subtable_page_row") {
-												$this.viewActionSetRow(item.value)
+											} else if (item.action_type ==
+												"set_subtable_page_row") {
+												$this.viewActionSetRow(item
+													.value)
 
 											} else if (item.action_type ==
-												"set_subtable_page_ext_data") {
+												"set_subtable_page_ext_data"
+											) {
 												var value = item.value;
-												const pageData = $this.pageDetail.find((page) => {
-													value.page_name == page.Name;
-												});
+												const pageData = $this
+													.pageDetail.find((
+														page) => {
+														return value
+															.page_name ==
+															page.Name;
+													});
 												if (pageData)
-													pageData.ExtData = value.ext_data
+													pageData.ExtData =
+													value.ext_data
 
-											} else if (item.action_type == "clear_subpage_rows") {
+											} else if (item.action_type ==
+												"clear_subpage_rows") {
 												var value = item.value;
-												const pageData = $this.pageDetail.find((page) => {
-													value.page_name == page.Name;
-												});
+												const pageData = $this
+													.pageDetail.find((
+														page) => {
+														return value
+															.page_name ==
+															page.Name;
+													});
 												if (pageData) {
 													pageData.DefList = []
 													pageData.ExtData = {}
 												}
 
 											} else if (item.action_type ==
-												"set_dlg_current_edit_attr") {
+												"set_dlg_current_edit_attr"
+											) {
 
-												if ($this.focusOldFieldId == item.value) {
+												if ($this
+													.focusOldFieldId ==
+													item.value) {
 													$this.setData({
 														focusFieldId: ""
 													})
 												} else {
 													$this.setData({
-														focusFieldId: $this.focusOldFieldId
+														focusFieldId: $this
+															.focusOldFieldId
 													})
 												}
 												$this.$nextTick(() => {
 													$this.setData({
-														focusFieldId: item.value
+														focusFieldId: item
+															.value
 													})
 												});
-											} else if (item.action_type == "set_dlg_attr") {
+											} else if (item.action_type ==
+												"set_dlg_attr") {
 												// value = {"attr":"xxx", "value":"xxx"}
 												var data = item.value;
-												$this.$data.head_styledef.form.items.forEach(async (
-													ele, index) => {
-													if (ele.name != "Layout") {
-														data.forEach(
-															async (ele2,
-																index
-															) => {
-																if (ele
-																	.fieldId ==
-																	ele2
-																	.attr
-																) {
-																	ele.value =
-																		ele2
-																		.value;
-																}
-															});
-													} else {
-														ele.setting.colList.forEach(async (
-															col) => {
-															if (col) {
+												$this.$data.head_styledef
+													.form.items.forEach(
+														async (
+															ele, index
+														) => {
+															if (ele
+																.name !=
+																"Layout"
+															) {
 																data.forEach(
 																	async (ele2,
 																		index
 																	) => {
-																		if (col
+																		if (ele
 																			.fieldId ==
 																			ele2
 																			.attr
 																		) {
-																			col.value =
+																			if (ele.name ==
+																				'Select' &&
+																				ele2
+																				.choice_list
+																			) {
+																				const
+																					dictItemList = [];
+																				const
+																					choiceList =
+																					ele2
+																					.choice_list ||
+																					[];
+																				for (let d in
+																						choiceList) {
+																					const
+																						val =
+																						choiceList[
+																							d
+																						];
+																					dictItemList
+																						.push({
+																							text: val,
+																							value: val
+																						});
+																				}
+																				ele.dict =
+																					dictItemList;
+																			}
+
+																			ele.value =
 																				ele2
 																				.value;
 																		}
 																	});
+															} else {
+																ele.setting
+																	.colList
+																	.forEach(
+																		async (
+																			col
+																		) => {
+																			if (
+																				col) {
+																				data.forEach(
+																					async (ele2,
+																						index
+																					) => {
+																						if (col
+																							.fieldId ==
+																							ele2
+																							.attr
+																						) {
+																							if (col
+																								.name ==
+																								'Select' &&
+																								ele2
+																								.choice_list
+																							) {
+																								const
+																									dictItemList = [];
+																								const
+																									choiceList =
+																									ele2
+																									.choice_list ||
+																									[];
+																								for (
+																									let d in
+																										choiceList
+																								) {
+																									const
+																										val =
+																										choiceList[
+																											d
+																										];
+																									dictItemList
+																										.push({
+																											text: val,
+																											value: val
+																										});
+																								}
+																								col.dict =
+																									dictItemList;
+																							}
 
+																							col.value =
+																								ele2
+																								.value;
+																						}
+																					});
+
+																			}
+
+																		})
 															}
-
 														})
-													}
-												})
 											}
 
 										});
@@ -890,10 +1343,12 @@
 
 										if (result.info) {
 											uni.showModal({
-												title: this.translateSys("error") + "4.3",
+												title: this.translateSys(
+													"error") + "4.3",
 												content: result.info,
 												showCancel: false,
-												confirmText: this.translateSys("cancel")
+												confirmText: this
+													.translateSys("cancel")
 											});
 										}
 									}
@@ -901,17 +1356,20 @@
 								}
 							} else {
 								uni.showModal({
-									title: this.translateSys("error") + "4",
+									title: this.translateSys("error") +
+										"4",
 									content: ret.err_msg,
 									showCancel: false,
-									confirmText: this.translateSys("cancel")
+									confirmText: this.translateSys(
+										"cancel")
 								});
 							}
 						}).catch(ex => {
 							// console.log(ex);
+							let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 							uni.showModal({
 								title: this.translateSys("error") + "4.1",
-								content: ex.errMsg,
+								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
@@ -921,9 +1379,12 @@
 					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(
+						content: this.translate(
+								'execute_after_change_event_failed') + this
+							.translateSys(
 								"comma") +
-							this.translate('reason') + this.translateSys("colon") + tip,
+							this.translate('reason') + this.translateSys("colon") +
+							tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -954,7 +1415,7 @@
 			viewActionSetRow(value) {
 				const $this = this
 				const pageData = $this.pageDetail.find((page) => {
-					value.page_name == page.Name;
+					return value.page_name == page.Name;
 				});
 				if (!pageData)
 					return
@@ -964,38 +1425,48 @@
 						if (ele.form.objId == rowData.id) {
 							rowData.attrs.forEach(attr => {
 								ele.form.items.forEach(ele2 => {
-									if (ele2.name != 'Layout') {
-										if (ele2.fieldId == attr
+									if (ele2.name !=
+										'Layout') {
+										if (ele2.fieldId ==
+											attr
 											.attr) {
-											ele2.value = $this
+											ele2.value =
+												$this
 												.operationNumber(
-													ele2.value,
-													attr.value,
-													attr.operation)
+													ele2
+													.value,
+													attr
+													.value,
+													attr
+													.operation
+												)
 										}
 									} else if (ele2.name ==
 										'Layout') {
-										ele2.setting.colList
-											.forEach(col => {
-												if (col) {
-													if (col
-														.fieldId ==
-														attr
-														.attr
-													) {
-														col.value =
-															$this
-															.operationNumber(
-																col
-																.value,
-																attr
-																.value,
-																attr
-																.operation
-															)
+										ele2.setting
+											.colList
+											.forEach(
+												col => {
+													if (
+														col) {
+														if (col
+															.fieldId ==
+															attr
+															.attr
+														) {
+															col.value =
+																$this
+																.operationNumber(
+																	col
+																	.value,
+																	attr
+																	.value,
+																	attr
+																	.operation
+																)
+														}
 													}
-												}
-											})
+												})
 									}
 								});
 							});
@@ -1012,126 +1483,147 @@
 					return;
 				}
 				const pageData = this.pageDetail.find((page) => {
-					value.page_name == page.Name;
+					return data.page_name == page.Name;
 				});
 				if (!pageData)
 					return
-				data.row.forEach(row => {
-					var styleStr = JSON.stringify(pageData.StyleDef);
+				var styleStr = JSON.stringify(pageData.StyleDef);
 
-					var detailStyle = JSON.parse(styleStr);
-					detailStyle.form.objId = row.id;
-					detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace(
-						'{', '').replace('}',
-						'') : 'null';
-					detailStyle.form.attrs = row.attrs;
-					row.attrs.forEach(attr => {
-						detailStyle.form.items.forEach(ele => {
-							if (ele.name != 'Layout') {
-								if (ele.fieldId == attr.attr) ele.value =
-									attr.value;
-							} else if (ele.name == 'Layout') {
-								ele.setting.colList.forEach(col => {
-									if (col) {
-										if (col.fieldId == attr
-											.attr) col.value = attr
-											.value;
-									}
-								});
-							}
+				var detailStyle = JSON.parse(styleStr);
+				if (detailStyle.form) {
+					data.row.forEach(row => {
+						detailStyle = JSON.parse(styleStr);
+						detailStyle.form.objId = row.id;
+						detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '')
+							.replace(
+								'{', '').replace('}',
+								'') : 'null';
+						detailStyle.form.attrs = row.attrs;
+						row.attrs.forEach(attr => {
+							detailStyle.form.items.forEach(ele => {
+								if (ele.name != 'Layout') {
+									if (ele.fieldId == attr.attr) ele
+										.value =
+										attr.value;
+								} else if (ele.name == 'Layout') {
+									ele.setting.colList.forEach(
+										col => {
+											if (col) {
+												if (col.fieldId ==
+													attr
+													.attr) col
+													.value = attr
+													.value;
+											}
+										});
+								}
+							});
 						});
+
+						pageData.DefList.push(detailStyle);
+
 					});
-
-					pageData.DefList.push(detailStyle);
-
-				});
+				}
 			},
 			//鍔犺浇宸茬爜鐩樺唴瀹� 			viewAceionContent(data) {
 				var $this = this;
 				const pageData = $this.pageDetail.find((page) => {
-					value.page_name == page.Name;
+					return data.page_name == page.Name;
 				});
 				if (!pageData)
 					return
-
 				pageData.ExtData = data.ext_data || {}
 
 				if (JSON.stringify(data.content) == '{}') {
 					return;
 				}
-				data.content.forEach(cont => {
-					var styleStr = JSON.stringify(pageData.StyleDef);
+				var styleStr = JSON.stringify(pageData.StyleDef);
+				var detailStyle = JSON.parse(styleStr);
+				if (detailStyle.form) {
+					data.content.forEach(cont => {
+						detailStyle = JSON.parse(styleStr);
+						detailStyle.SelBut_Checked = data.checkbox ?? true;
 
-					var detailStyle = JSON.parse(styleStr);
-					detailStyle.SelBut_Checked = data.checkbox ?? true;
-					detailStyle.form.objId = cont.id;
-					detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '')
-						.replace('{', '').replace('}',
-							'') : 'null';
-					detailStyle.form.attrs = cont.attrs;
-					cont.attrs.forEach(attr => {
-						detailStyle.form.items.forEach(ele => {
-							if (ele.name != 'Layout') {
-								if (ele.fieldId == attr.attr) ele.value =
-									attr.value;
-							} else if (ele.name == 'Layout') {
-								ele.setting.colList.forEach(col => {
-									if (col) {
-										if (col.fieldId == attr
-											.attr) col.value = attr
-											.value;
-									}
-								});
-							}
+						detailStyle.form.objId = cont.id;
+						detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g,
+								'')
+							.replace('{', '').replace('}',
+								'') : 'null';
+						detailStyle.form.attrs = cont.attrs;
+						cont.attrs.forEach(attr => {
+							detailStyle.form.items.forEach(ele => {
+								if (ele.name != 'Layout') {
+									if (ele.fieldId == attr.attr) ele
+										.value =
+										attr.value;
+								} else if (ele.name == 'Layout') {
+									ele.setting.colList.forEach(
+										col => {
+											if (col) {
+												if (col.fieldId ==
+													attr
+													.attr) col
+													.value = attr
+													.value;
+											}
+										});
+								}
+							});
 						});
-					});
-					//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�-					if (data.clear == false) {
-						var isflag = true;
-						pageData.DefList.forEach((style, index) => {
-							if (style.form.objId == detailStyle.form.objId) {
-								cont.attrs.forEach(attr => {
-									style.form.items.forEach(ele => {
-										if (ele.name !=
-											'Layout') {
-											if (ele.fieldId ==
-												attr.attr) ele
-												.value =
-												attr.value;
-										} else if (ele.name ==
-											'Layout') {
-											ele.setting.colList
-												.forEach(
-													col => {
-														if (
-															col) {
-															if (col
-																.fieldId ==
-																attr
-																.attr
-															)
-																col
-																.value =
-																attr
-																.value;
-														}
-													});
-										}
+						//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+						if (data.clear == false) {
+							var isflag = true;
+							pageData.DefList.forEach((style, index) => {
+								if (style.form.objId == detailStyle.form
+									.objId) {
+									cont.attrs.forEach(attr => {
+										style.form.items.forEach(
+											ele => {
+												if (ele.name !=
+													'Layout') {
+													if (ele
+														.fieldId ==
+														attr.attr)
+														ele
+														.value =
+														attr.value;
+												} else if (ele
+													.name ==
+													'Layout') {
+													ele.setting
+														.colList
+														.forEach(
+															col => {
+																if (
+																	col
+																) {
+																	if (col
+																		.fieldId ==
+																		attr
+																		.attr
+																	)
+																		col
+																		.value =
+																		attr
+																		.value;
+																}
+															});
+												}
+											});
 									});
-								});
-								isflag = false;
-							}
+									isflag = false;
+								}
+							});
+							if (isflag) pageData.DefList.push(detailStyle); //寰呭垎鎷�+						} else {
+							pageData.DefList.push(detailStyle); //寰呭垎鎷�+						}
+						$this.activelist.push({
+							active: false
 						});
-						if (isflag) pageData.DefList.push(detailStyle); //寰呭垎鎷�-					} else {
-						pageData.DefList.push(detailStyle); //寰呭垎鎷�-					}
-					$this.activelist.push({
-						active: false
 					});
-
-				});
+				}
 
 			},
 			onClickItem(e) { //閫夋嫨椤电
@@ -1162,7 +1654,8 @@
 				this.$data.head_styledef.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 						item.setting.colList.forEach(cols => {
-							if (cols != null) head_attr[cols.fieldId] = cols.value;
+							if (cols != null) head_attr[cols.fieldId] =
+								cols.value;
 						});
 					} else
 						head_attr[item.fieldId] = item.value;
@@ -1174,7 +1667,8 @@
 				style.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 						item.setting.colList.forEach(cols => {
-							if (cols != null) detail_attr[cols.fieldId] = cols
+							if (cols != null) detail_attr[cols
+									.fieldId] = cols
 								.value;
 						});
 					} else
@@ -1269,23 +1763,26 @@
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate(
-								"page.tip_no_data_first") +
+								"tip_no_data_first") +
 							this.translateSys(
-								"quotation_mark_left") + pageData.Name + this.translateSys(
-								"sys.quotation_mark_right") +
+								"quotation_mark_left") + pageData.Name + this
+							.translateSys(
+								"quotation_mark_right") +
 							this.translate(
-								"page.tip_no_data_last"),
+								"tip_no_data_last"),
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
 					return false;
 				}
 				//鑾峰彇琛ㄥご灞炴�
+				pageData.okLoading = true
 				var head_attr = {};
 				this.$data.head_styledef.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 						item.setting.colList.forEach(cols => {
-							if (cols != null) head_attr[cols.fieldId] = cols.value;
+							if (cols != null) head_attr[cols.fieldId] =
+								cols.value;
 						});
 					} else
 						head_attr[item.fieldId] = item.value;
@@ -1298,7 +1795,8 @@
 					style.form.items.forEach(item => {
 						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 							item.setting.colList.forEach(cols => {
-								if (cols != null) detail_attr[cols
+								if (cols != null) detail_attr[
+									cols
 									.fieldId] = cols.value;
 							});
 						} else
@@ -1318,18 +1816,21 @@
 				pageData.DefList.forEach(style => {
 					style.form.attrs.forEach(attr => {
 						for (var key in detailAttrList) {
-							if (style.form.objId == detailAttrList[key][
+							if (style.form.objId == detailAttrList[key]
+								[
 									'id'
 								]) {
 								var keys = Object.keys(detailAttrList[
 									key]);
 								var isflag = true;
 								keys.forEach((ele) => {
-									if (ele == attr.attr) isflag =
+									if (ele == attr.attr)
+										isflag =
 										false;
 								});
 								if (isflag) {
-									detailAttrList[attr.attr] = attr.value;
+									detailAttrList[attr.attr] = attr
+										.value;
 								}
 							}
 						}
@@ -1356,6 +1857,7 @@
 					});
 				});
 				if (jsonlist.length == 0) {
+					pageData.okLoading = false
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
@@ -1411,17 +1913,28 @@
 							var tip = result.err_info ? typeof result
 								.err_info == 'string' ? result.err_info :
 								result.err_info.join('<br/>') : '';
-							if (result.ret == 801) uni.showModal({
+							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(
+										"cancel")
+								});
+							} else uni.showModal({
 								title: this.translateSys('tip'),
-								content: tip,
+								content: tip + ',' + this
+									.translateSys('tip') + ':' +
+									result.ret,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-							else uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip + ',' + this.translateSys('tip') + ':' + result.ret,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys(
+									"cancel")
 							});
 							return false;
 						} else {
@@ -1432,7 +1945,8 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys(
+									"cancel")
 							});
 							if (result.result_type == 0) {
 								if (result.action) {
@@ -1444,10 +1958,13 @@
 										) { //鐮佺洏涓� 											var value = item.value;
 											//鍔犺浇宸茬粡鐮佺洏鏁版嵁
-											$this.viewAceionRow(value, );
+											$this.viewAceionRow(
+												value, );
 											//娓呯┖鏉$爜鍐呭
-											$this.$data.head_styledef
-												.form.items.forEach((
+											$this.$data
+												.head_styledef
+												.form.items
+												.forEach((
 													item,
 													index) => {
 													if (item
@@ -1458,7 +1975,8 @@
 															'';
 														item.oldvalue =
 															'';
-														$this.$data
+														$this
+															.$data
 															.head_styledef
 															.form
 															.model[
@@ -1470,26 +1988,41 @@
 												});
 
 											uni.showModal({
-												title: this.translateSys("tip"),
-												content: this.translate(
-													'execute_event_success'),
+												title: this
+													.translateSys(
+														"tip"
+													),
+												content: this
+													.translate(
+														'execute_event_success'
+													),
 												showCancel: false,
-												confirmText: this.translateSys("cancel")
+												confirmText: this
+													.translateSys(
+														"cancel"
+													)
 											});
-										} else if (item.action_type ==
+										} else if (item
+											.action_type ==
 											"remove_subtable_page_row"
 										) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 											var value = item.value;
-											const pageData = $this.pageDetail.find((page) => {
-												value.page_name == page.Name;
-											});
+											const pageData = $this
+												.pageDetail.find((
+													page) => {
+													return value
+														.page_name ==
+														page
+														.Name;
+												});
 											if (pageData
 												?.DefList
 											) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 												//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 												value.row.forEach(
 													row => {
-														pageData.DefList
+														pageData
+															.DefList
 															.forEach(
 																(
 																	ele,
@@ -1501,40 +2034,64 @@
 																		row
 																		.id
 																	) {
-																		pageData.DefList.splice(
-																			index, 1);
+																		pageData
+																			.DefList
+																			.splice(
+																				index,
+																				1
+																			);
 																	}
-																});
+																}
+															);
 													});
 											}
-										} else if (item.action_type ==
-											"set_subtable_page_row") {
-											$this.viewActionSetRow(item
+										} else if (item
+											.action_type ==
+											"set_subtable_page_row"
+										) {
+											$this.viewActionSetRow(
+												item
 												.value)
 
-										} else if (item.action_type ==
+										} else if (item
+											.action_type ==
 											"set_subtable_page_ext_data"
 										) {
 											var value = item.value;
-											const pageData = $this.pageDetail.find((page) => {
-												value.page_name == page.Name;
-											});
+											const pageData = $this
+												.pageDetail.find((
+													page) => {
+													return value
+														.page_name ==
+														page
+														.Name;
+												});
 											if (pageData) {
-												pageData.ExtData = value
+												pageData.ExtData =
+													value
 													.ext_data
 											}
 
-										} else if (item.action_type ==
+										} else if (item
+											.action_type ==
 											"clear_subpage_rows") {
 											var value = item.value;
-											const pageData = $this.pageDetail.find((page) => {
-												value.page_name == page.Name;
-											});
+											const pageData = $this
+												.pageDetail.find((
+													page) => {
+													return value
+														.page_name ==
+														page
+														.Name;
+												});
 											if (pageData) {
-												pageData.DefList = []
-												pageData.ExtData = {}
+												pageData
+													.DefList = []
+												pageData
+													.ExtData = {}
 											}
-										} else if (item.action_type ==
+										} else if (item
+											.action_type ==
 											"set_dlg_current_edit_attr"
 										) {
 											if ($this
@@ -1550,15 +2107,17 @@
 												})
 											}
 											$this.$nextTick(() => {
-												$this.setData({
-													focusFieldId: item
-														.value
-												})
+												$this
+													.setData({
+														focusFieldId: item
+															.value
+													})
 											});
 										}
 									});
 								} else {
-									if ($this.$data.After_OK_Event.ID != event
+									if ($this.$data.After_OK_Event.ID !=
+										event
 										.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
 
 										$this.sava(pageParam, $this.$data
@@ -1570,27 +2129,35 @@
 
 								if (result.info) {
 									uni.showModal({
-										title: this.translateSys("tip"),
+										title: this.translateSys(
+											"tip"),
 										content: result.info,
 										showCancel: false,
-										confirmText: this.translateSys("cancel")
+										confirmText: this
+											.translateSys("cancel")
 									});
 								}
 							}
 						}
 					} else {
 						uni.showModal({
-							title: this.translateSys("error") + "8",
+							title: this.translateSys("error") +
+								"8",
 							content: res.err_msg,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys(
+								"cancel")
 						});
 					}
+					pageParam.okLoading = false
 				}).catch(ex => {
-					var tip = typeof ex == "string" ? ex : ex.errMsg;
+					pageParam.okLoading = false
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
-						content: this.translate("execute_after_ok_event_failed") + this.translateSys(
+						content: this.translate(
+								"execute_after_ok_event_failed") +
+							this.translateSys(
 								"comma") +
 							tip,
 						showCancel: false,
@@ -1634,8 +2201,8 @@
 		.v-head-style {
 			width: 98%;
 
-			.uni-form-item {
-				margin-bottom: 15rpx;
+			.uni-forms-item {
+				margin-bottom: 11rpx;
 			}
 
 			.input-wrapper {
@@ -1647,6 +2214,7 @@
 				.uni-input {
 					flex: 1;
 					padding: 12rpx 8rpx;
+					color: #2d8cf0;
 					// height: 40rpx;
 					// line-height: 40rpx;
 				}
@@ -1712,10 +2280,6 @@
 			position: relative;
 			border: 0 solid #000;
 			box-sizing: border-box;
-		}
-
-		.uni-input {
-			/* border: none; */
 		}
 
 		.uni-icon {
@@ -1818,9 +2382,16 @@
 						font-size: 38rpx;
 						font-weight: bold;
 						float: right;
+						color: #fff;
 						display: inline-block;
 					}
 
+					.btn_disabled {
+						background-color: #ddd;
+						color: #888;
+					}
+
+
 				}
 			}
 

--
Gitblit v1.9.1