From d066a9659f793dee40ac7fa0bc399ebd30664b4a Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 14 八月 2025 10:01:10 +0800
Subject: [PATCH] 3202加列表按钮跳转功能点

---
 pages/modal/5601.vue | 2628 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 1,302 insertions(+), 1,326 deletions(-)

diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index a6024ec..ac406c8 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -1,95 +1,11 @@
 <template>
-	<view class="uni-page-modal-5601">
+	<view class="uni-page-modal-5601" :class="largeMode?'large-mode':''">
 		<!-- 琛ㄥご鏍峰紡 -->
-		<uni-forms ref="baseForm" label-align="right">
-			<view v-for="(item,index) in head_styledef.form.items" :key="index" class="v-head-style">
-				<!-- 鏅�甯冨眬 -->
-				<uni-forms-item v-if="item.name != 'Layout'" :label="item.label ?item.label +'锛�:'' "
-					:label-width="item.labelWidth+'px'">
-					<uni-data-picker v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
-						v-model="item.value" :localdata="item.useDict ? item.dict : item.selections" @change="onEnterChange(item)"
-						:readonly="item.disabled" :clear-icon="false" :popup-title="item.label"></uni-data-picker>
-					<view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
-						<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
-							@click="classAttr_extButton(item)">&#xe568;</text>
-						<input class="uni-input" :class="item.disabled?'input-disabled':''"
-							: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)"
-							@click="onClick(item)" @keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)"
-							:maxlength="-1" />
-						<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
-							@click="classAttr_extButton(item)"></text>
-					</view>
-					<!-- 澶嶉�妗�-->
-					<checkbox-group v-if="item.name=='Checkbox'" :class="item.disabled?'input-disabled':''"
-						:disabled="item.disabled" @change="onCheckBoxValue" :data-attr="item.fieldId"
-						:data-index="index">
-						<label v-for="(item2) in item.selections" :key="item2.value">
-							<checkbox :value="item2.value" :checked="item.value.includes(item2.value)" />
-							<text>{{item2.label}}</text>
-						</label>
-					</checkbox-group>
-					<!-- 鍗曢�妗�-->
-					<radio-group v-if="item.name=='Radio'" :class="item.disabled?'input-disabled':''"
-						:disabled="item.disabled" @change="onRadioBoxValue" :data-attr="item.fieldId"
-						:data-index="index">
-						<label v-for="(item2) in item.selections" :key="item2.value">
-							<radio :value="item2.value" :checked="item2.value === item.value" />
-							<text>{{item2.label}}</text>
-						</label>
-					</radio-group>
-					<!-- Switch寮�叧 -->
-					<switch class="input-switch" v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
-						:disabled="item.disabled" v-model="item.value" @change="onEnterChange(item)" />
-				</uni-forms-item>
-				<!-- 鏍呮牸甯冨眬 -->
-				<uni-row v-else :gutter="item.setting.gutter">
-					<uni-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 v-if="col!=null" :label="col.label ? col.label +'锛�:''" :label-width="col.labelWidth+'px'">
-							<uni-data-picker v-if="col.name=='Select'" :class="col.disabled?'input-disabled':''"
-								v-model="col.value" :localdata="col.useDict ? col.dict : col.selections" @change="onEnterChange(col)"
-								:readonly="col.disabled" :clear-icon="false" :popup-title="col.label"></uni-data-picker>
-							<view class="input-wrapper" v-if="col.name=='Input' || col.name=='InputNumber'">
-								<text v-if="col.setting.prefix" class="uni-icon" :class="[col.setting.prefix]"
-									@click="classAttr_extButton(col)">&#xe568;</text>
-								<input class="uni-input" :class="col.disabled?'input-disabled':''"
-									: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)" @click="onClick(col)"
-									@keyup.enter="onEnterChange(col)" @blur="onEnterChange(col)" :maxlength="-1" />
-								<text v-if="col.setting.suffix" class="uni-icon" :class="[col.setting.suffix]"
-									@click="classAttr_extButton(col)"></text>
-							</view>
-							<!-- 澶嶉�妗�-->
-							<checkbox-group v-if="col.name=='Checkbox'" :class="col.disabled?'input-disabled':''"
-								:disabled="col.disabled" @change="onCheckBoxValue" :data-attr="col.fieldId"
-								:data-index="index" :data-iindex="key">
-								<label v-for="(col2) in col.selections" :key="col2.value">
-									<checkbox :value="col2.value" :checked="col.value.includes(col2.value)" />
-									<text>{{col2.label}}</text>
-								</label>
-							</checkbox-group>
-							<!-- 鍗曢�妗�-->
-							<radio-group v-if="col.name=='Radio'" :class="col.disabled?'input-disabled':''"
-								:disabled="col.disabled" @change="onRadioBoxValue" :data-attr="col.fieldId"
-								:data-index="index" :data-iindex="key">
-								<label v-for="(col2) in col.selections" :key="col2.value">
-									<radio :value="col2.value" :checked="col2.value === col.value" />
-									<text>{{col2.label}}</text>
-								</label>
-							</radio-group>
-							<!-- Switch寮�叧 -->
-							<switch v-if="col.name=='Switch'" :class="col.disabled?'input-disabled':''"
-								:disabled="col.disabled" v-model="col.value" @change="onEnterChange(col)" />
-						</uni-forms-item>
-					</uni-col>
-				</uni-row>
-			</view>
-		</uni-forms>
+		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form"
+			:hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId"
+			@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
+			@on-click-suffix="classAttr_extButton"></OIForm>
+
 		<view class="view-content">
 			<!-- 鐮佺洏瀛愮晫闈�-->
 			<view v-if="param.Show_Welcom_Page==false" class="uni-panel-content">
@@ -102,82 +18,54 @@
 				<swiper class="view-tabpage" :current="current" @change="changeSwiper">
 					<!-- 瀛愮晫闈�-->
 					<swiper-item v-for="(pageData, pageIndex) in pageDetail" :key="pageIndex">
-						<view class="uni-panel-content">
+						<view class="tab-content">
 							<view class="view-tab-content" :id="'tabpanel' + pageData.Name">
 								<image class="logo" v-if="pageData.DefList.length==0"
 									src="../../images/mobox_log_200x40.png">
 								</image>
 								<checkbox-group @change="checkboxChange">
-									<div class="dv-panel" v-for="(style,ii) in pageData.DefList"
+									<div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
 										@tap="onPanelClick(ii,style.form.htmlobjId)"
 										:id="'dvpanel'+style.form.htmlobjId"
 										:class="style.form.htmlobjId==active_id?'bk-active':''">
-										<div class="dv-panel-input">
-											<div class="dv-input" v-for="(item,index) in style.form.items">
-												<!-- 鏅�甯冨眬 -->
-												<view v-if="item.name!='Layout'">
-													<text class="txt_title"
-														:style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
-													<span class="form-item-span"
-														v-if="item.disabled">{{item.value}}</span>
-													<input class="uni-input" v-if="!item.disabled"
-														:type="item.name=='InputNumber'?'number':'text'"
-														v-model="item.value" :disabled="item.disabled"
-														:placeholder="item.placeholder" :maxlength="-1" />
-												</view>
-												<!-- 鏍呮牸甯冨眬 -->
-												<uni-row class="demo-uni-row" v-else :gutter="item.setting.gutter">
-													<uni-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"
-																:style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
-															<span class="form-item-span"
-																v-if="cols.disabled">{{cols.value}}</span>
-															<input class="uni-input" v-if="!cols.disabled"
-																:type="cols.name=='InputNumber'?'number':'text'"
-																v-model="cols.value" :disabled="cols.disabled"
-																:placeholder="cols.placeholder" :maxlength="-1" />
-														</view>
-													</uni-col>
-												</uni-row>
-											</div>
-										</div>
+										<OIForm class="dv-panel-form" :form="style.form"
+											:hiddenIds="style.hiddenIds ?style.hiddenIds :[] " viewMode @on-change="(item2)=>{
+												onDetailEnterChange(item2,style,pageIndex)
+											}"></OIForm>
 										<div class="dv-panel-button"
 											v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0">
 
-											<checkbox v-if="pageData.Select_Button==true" :model="ii"
+											<checkbox v-if="pageData.Select_Button==true" :value="ii"
 												:checked="style.SelBut_Checked" />
 											<!-- <text></text> -->
 											<!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> -->
 											<button size="mini" v-for="(btn,btnIndex) in pageData.Row_Button"
-												:key="btnIndex" :type="btn.FunCode == 'Delete' ? 'warn' : 'primary'"
+												:key="btnIndex" type="default"
+												:class="btn.FunCode == 'Delete' ? 'btn-warn' : 'btn-primary'"
 												@click="onRowBtnClick(btn, pageData,ii)">
-												<Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'"
-													class="Img" />
+												<text v-if="btn.Style == 'img' || btn.Style == 'img_text'"
+													class="Img"></text>
 												{{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
 											</button>
 										</div>
+
 									</div>
 								</checkbox-group>
 							</view>
 							<view class="view-bottom" v-if="pageData.Button.length >0 ">
-								<button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex"
-									:type="btn.FunCode == 'Cancel' ? 'default' : 'primary'"
-									:class="{'btn-disabled':(btn.FunCode != 'Cancel' && pageData.okLoading),
-													'btn-one':pageData.Button.length == 1,
-													'btn-left':(btnIndex < pageData.Button.length - 1),
-													'btn-right': btnIndex > 0 && btnIndex == pageData.Button.length - 1 ,
-													'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}"
-									:disabled="(btn.FunCode != 'Cancel' && pageData.okLoading)? true:false"
-									@click="onBtnClick(btn, pageData)">
-									<Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="Img" />
+								<button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex" type="default"
+									:class="{'btn-primary':(btn.FunCode != 'Cancel'),
+										'btn-cancel':(btn.FunCode == 'Cancel'),
+										'btn-one':pageData.Button.length == 1,
+										'btn-left':(btnIndex < pageData.Button.length - 1),
+										'btn-right': btnIndex > 0 && btnIndex == pageData.Button.length - 1 ,
+										'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}" @click="onBtnClick(btn, pageData)">
+									<text v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="Img"></text>
 									{{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
 								</button>
 								<view class="btn-right" v-if="pageData.DropDownButton.length >0 ">
 									<a @click="clickDropdownBtns(pageData)">
-										<Icon class="mobox-normal-more" />
+										<text class="mobox-normal-more"></text>
 									</a>
 								</view>
 							</view>
@@ -200,8 +88,9 @@
 			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
 				<view class="popup-header">{{check_list.title}}</view>
 				<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
-					:style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
-					<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+					:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+					<view class="popup-cont"
+						:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
 						<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
 							<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
 								:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -224,7 +113,9 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from '@/js/Base64.js';
 	import {
 		dictGetInfo
 	} from "@/api/mobox.js"
@@ -232,14 +123,27 @@
 		getUIStyleInfo,
 		runCustomEvent,
 	} from "@/api/data.js"
+	import dayjs from "dayjs";
+	import OIForm from '@/components/oi-form/index.vue'
+	import OIFormItem from '@/components/oi-form/list/index.vue'
+	import OIFormInput from '@/components/oi-form/list/input/index.vue'
+	import OIFormInputNumber from '@/components/oi-form/list/input-number/index.vue'
+	import buttonClickMixin from '@/mixins/button-click.js';
 
 	export default {
 		name: "PageModal5601",
-		modules: {
-			Base64,
+		mixins: [buttonClickMixin],
+		components: {
+			OIForm,
+			OIFormItem,
+			OIFormInput,
+			OIFormInputNumber
+
 		},
+
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys("inventory"),
 				ClsID: '',
 				param: {},
@@ -258,7 +162,6 @@
 				selectAttrObj: {},
 
 				global_attr: [],
-				refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 				popupType: "center",
 				check_list: {},
 				popupParam: {},
@@ -282,13 +185,14 @@
 			//鑾峰彇涓绘暟鎹被ID
 			this.ClsID = this.param.master_cls?.id;
 			if (this.ClsID) {
-				this.loadData(options.paramValue)
+				const  paramValue = options.paramValue ?JSON.parse(options.paramValue) :undefined
+				this.loadData(paramValue)
 			} else {
 				uni.showModal({
 					title: this.translateSys("error"),
 					content: this.translate("tip_no_master_class"),
 					showCancel: false,
-					confirmText: this.translateSys("cancel")
+					confirmText: this.translateSys('close')
 				});
 			}
 		},
@@ -321,9 +225,10 @@
 				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� 				await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID);
 				//浼犲叆鍙傛暟鍊�+				console.log(paramValue)
 				if (paramValue) {
 					const attrs = paramValue.attrs || [];
-					(this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+					(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
 						if (ele.name != "Layout") {
 							attrs.forEach(async (ele2, index2) => {
 								if (ele.fieldId == ele2.name) {
@@ -345,10 +250,10 @@
 					})
 				}
 				//鍔犺浇鍒濆鐣岄潰
-				if (this.$data.param.Show_Welcom_Page) {
-					this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
-					this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
-					this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
+				if (this.param.Show_Welcom_Page) {
+					this.param.Welcome_Page.Img = this.param.Welcome_Page.Img.replace(/ /g, '+');
+					this.param.Welcome_Page.Width = parseInt(this.param.Welcome_Page.Width);
+					this.param.Welcome_Page.Height = parseInt(this.param.Welcome_Page.Height);
 				};
 				//鍔犺浇Tab椤电
 				const pageList = this.param.Sub_Page || []
@@ -467,21 +372,18 @@
 								Name: page.After_Delete?.Name
 							};
 						}
-
-						if (evt.ID) {
-							return [{
-								Cls_Name: this.param?.master_cls?.name || "",
-								Cls_ID: this.param?.master_cls?.id || "",
-								FunCode: "Delete",
-								ShowName: this.$t("sys.delete"),
-								Style: "text",
-								Prompt: false,
-								NotTriggerSYSEvent: false,
-								DataStateVerify: false,
-								AttrVerify: false,
-								AfterProcess_Event: evt,
-							}];
-						}
+						return [{
+							Cls_Name: this.param?.master_cls?.name || "",
+							Cls_ID: this.param?.master_cls?.id || "",
+							FunCode: "Delete",
+							ShowName: this.$t("sys.delete"),
+							Style: "text",
+							Prompt: false,
+							NotTriggerSYSEvent: false,
+							DataStateVerify: false,
+							AttrVerify: false,
+							AfterProcess_Event: evt,
+						}];
 					}
 					return [];
 				}
@@ -536,7 +438,7 @@
 											styledefHead.form
 												.model[ele.fieldId] = itemName;
 										}
-										
+
 										ele.selections = selections.map((a) => {
 											return {
 												value: a.value,
@@ -595,7 +497,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({
 						head_styledef: styledefHead
@@ -604,11 +524,15 @@
 
 				} catch (ex) {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return {}
 				}
@@ -645,14 +569,12 @@
 									await this.DictGetInfo(ele.bind.dict,
 										detailstyledef.form
 										.model, ele);
-								}
-								else
-								{
+								} else {
 									if (ele?.name === "Select") {
-										ele.selections =[]
+										ele.selections = []
 									}
 								}
-									
+
 							} else {
 								for (let j in ele.setting.colList) {
 									const col = ele.setting.colList[j]
@@ -661,11 +583,9 @@
 											.bind.dict,
 											detailstyledef.form
 											.model, col);
-									}
-									else
-									{
+									} else {
 										if (col?.name === "Select") {
-											col.selections =[]
+											col.selections = []
 										}
 									}
 								}
@@ -676,12 +596,16 @@
 					console.log("Detail_UIstyleGetInfo", detailstyledef);
 					return detailstyledef
 				} catch (ex) {
-					// console.log(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") + "2",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return {}
 				}
@@ -715,71 +639,99 @@
 					}
 					formItem.dict = list;
 				} catch (ex) {
-					// console.log(ex);
+					console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "3",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 
 			},
 			onClick(item) {
+				console.log("onClick", item)
 				this.focusFieldId = item.fieldId
 			},
 			ontap(item) { //鎵爜鍔熻兘
 				// var $ele = e;
 				//console.log(e.target)
 				this.focusOldFieldId = item.fieldId
-				getApp().onScan((result) => {
-					console.log(result.decodedata);
-					item.value = result.decodedata;
+				getApp().onScan(async (result) => {
+					console.log(result);
+					item.value = result;
 					var $this = this;
-					if (item.oldvalue != item.value && item.value.trim() != "") {
-						item.oldvalue = item.value;
+					let newVal = item.value.trim()
+					if (newVal) {
+						item.oldvalue = newVal;
 						var attr = item.fieldId;
-						this.head_styledef.form.model[attr] = item.value;
+						this.head_styledef.form.model[attr] = newVal;
 						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-						var onSuffixClickCallbackEvent = item.bind
-							.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�-						var onSuffixClickEvent = item.bind
-							.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 						var isflag = false;
-
+						if (item.changeEventRunding)
+							return
+						item.changeEventRunding = true
 						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�-							$this.onChange(onChangeEvent);
+							await this.onChange(onChangeEvent);
 						}
-						if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�-							//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
-							var findd = false
-							for (let i in $this.head_styledef.form.items) {
-								const ele = $this.head_styledef.form.items[i]
+						item.changeEventRunding = false
+						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
+						var findd = false
+						for (let i in $this.head_styledef.form.items) {
+							const ele = $this.head_styledef.form.items[i]
 
-								if (ele.name != "Layout") {
-									if (ele.name == 'Input' || ele.name ==
-										'InputNumber') {
-										if (attr == ele.fieldId) {
-											findd = true
-										} else {
-											if (findd) {
-												$this.setData({
-													focusFieldId: ele.fieldId
-												})
-												break
-											}
-
+							if (ele.name != "Layout") {
+								if (ele.name == 'Input' || ele.name ==
+									'InputNumber') {
+									if (attr == ele.fieldId) {
+										findd = true
+									} else {
+										if (findd) {
+											$this.setData({
+												focusFieldId: ele.fieldId
+											})
+											break
 										}
 
 									}
-								} else {
-									if (findd) {
-										let curIndex = ele.setting.colList.findIndex((
-											col, index2, arr) => {
-											return (col.name == 'Input' || col
-												.name == 'InputNumber');
+
+								}
+							} else {
+								if (findd) {
+									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]
+												.fieldId
 										})
-										if (curIndex > -1) {
+										break
+									}
+
+								} else {
+									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;
+											})
+										if (curIndex2 > -1) {
 											$this.setData({
 												focusFieldId: ele.setting
 													.colList[curIndex]
@@ -787,112 +739,41 @@
 											})
 											break
 										}
-
-									} else {
-										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;
-												})
-											if (curIndex2 > -1) {
-												$this.setData({
-													focusFieldId: ele.setting
-														.colList[curIndex]
-														.fieldId
-												})
-												break
-											}
-										}
 									}
-
 								}
+
 							}
 						}
-
 					}
 				})
 			},
 
-			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
+			async onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
 				console.log(item);
-				if (item.oldvalue != item.value && item.value.trim() != "") {
-					item.oldvalue = item.value;
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+					if (!newVal) {
+						item.oldvalue = newVal;
+						var attr = item.fieldId;
+						this.head_styledef.form.model[attr] = newVal;
+						return
+					}
+
+				}
+				if (item.oldvalue != newVal) {
+					item.oldvalue = newVal;
 					var attr = item.fieldId;
-					this.head_styledef.form.model[attr] = item.value;
+					this.head_styledef.form.model[attr] = newVal;
 					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-
 					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�-						this.onChange(onChangeEvent);
+						await this.onChange(onChangeEvent);
 					}
 
 				}
 			},
-			onCheckBoxValue(e) { //缁戝畾Model鍊�-				let values = e.detail.value || []
-				const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index || 0]
-				if (item?.setting?.colList) {
-					const col = item.setting.colList[e.currentTarget?.dataset?.iindex || 0]
-					if (col) {
-						col.value = values
-						let attr = col.fieldId;
-						this.head_styledef.form.model[attr] = col.value;
-						var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�-							this.onChange(onChangeEvent);
-						}
-						return
-					}
-				} else {
-					if (item) {
-						item.value = values
-						let attr = item.fieldId;
-						this.head_styledef.form.model[attr] = item.value;
-						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�-							this.onChange(onChangeEvent);
-						}
-					}
-				}
 
-			},
-			onRadioBoxValue(e) { //缁戝畾Model鍊�-				let values = e.detail.value || ""
-				const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index || 0]
-				if (item?.setting?.colList) {
-					const col = item.setting.colList[e.currentTarget?.dataset?.iindex || 0]
-					if (col) {
-						col.value = values
-						let attr = col.fieldId;
-						this.head_styledef.form.model[attr] = col.value;
-						var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�-							this.onChange(onChangeEvent);
-						}
-						return
-					}
-				} else {
-					if (item) {
-						item.value = values
-						let attr = item.fieldId;
-						this.head_styledef.form.model[attr] = item.value;
-						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�-							this.onChange(onChangeEvent);
-						}
-					}
 
-				}
-
-			},
 			classAttr_extButton(item) {
 				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�@@ -902,7 +783,7 @@
 						title: this.translateSys("tip"),
 						content: this.translate('icon_click_callback_empty'),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -911,28 +792,195 @@
 						title: this.translateSys("tip"),
 						content: this.translate('icon_click_event_empty'),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
-				this.$data.popupType = 'right'
+				this.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
 
 				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
 					item);
 			},
+			onDetailEnterChange(item, style, pageIndex) {
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+					if (!newVal) {
+						item.oldvalue = newVal;
+						var attr = item.fieldId;
+						style.form.model[attr] = newVal;
+						return
+					}
+				}
+				if (item.oldvalue != newVal) {
+					item.oldvalue = newVal;
+					var attr = item.fieldId;
+					style.form.model[attr] = newVal;
+					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+						this.runDetailChangeEvent(onChangeEvent, style, pageIndex)
+					}
+				}
+			},
+			async runDetailChangeEvent(event, style, pageIndex) {
+				try {
+					const detail_attr = {}
 
+					style.form.items.forEach(item2 => {
+						if (item2.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+							item2.setting.colList.forEach(col => {
+								if (col != null) detail_attr[col
+									.fieldId] = col.value;
+							});
+						} else
+							detail_attr[item2.fieldId] = item2.value;
+					});
+					var obj_attr = detail_attr
+					var input_param = Base64.encode(
+						JSON.stringify(
+							Object.keys(detail_attr).map((a) => ({
+								attr: a,
+								value: detail_attr[a] || "",
+							}))
+						)
+					);
+					var dataInfo = {
+						ed_type: 0,
+						start_transaction: true,
+						class_id: style.form.clsId,
+						class_name: '',
+						event_id: event.id,
+						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,
+					};
+					const result = await runCustomEvent(dataInfo)
+					console.log(result)
+					if (result.ret != 0&& result.ret != 1) {
+						var tip = result.err_info ? typeof result
+							.err_info == 'string' ? result
+							.err_info : result.err_info.join('<br/>') :
+							'';
+						if (result.ret == 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/>') : '';
+						tip = tip || result.err_info
+						if (tip) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+						if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+							if (result.result_type == 2) {
+
+							} else if (typeof result.result == 'string') {
+								if (result.result) {
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: result.result,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+								}
+							}
+							try {
+								var actionList = result.action || []
+								actionList.forEach(item => {
+									if (item.action_type == "set_dlg_attr") {
+										// value = {"attr":"xxx", "value":"xxx"}
+										var data = item.value;
+										this.setDetailFormValues(data, style, pageIndex)
+									} else if (item.action_type == 'set_dlg_attr_show') {
+										var data = item.value;
+										this.setDetailFormItemVisible(data, style, pageIndex)
+									}
+								});
+							} catch (ex) {
+								let actionList = (result.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
+							}
+						}
+
+					}
+
+				} catch (ex) {
+					console.log(ex)
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+					uni.showModal({
+						title: this.translateSys("error") + "6.1",
+						content: this.translate(
+								'execute_after_change_event_failed') + this
+							.translateSys(
+								"comma") +
+							this.translate('reason') + this.translateSys("colon") +
+							tip,
+						showCancel: false,
+						confirmText: this.translateSys('close')
+					});
+				}
+
+			},
 			getDetailAttrList(pageData) {
 				const detailAttrList = [];
+				console.log(pageData)
 				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;
+								item.setting.colList.forEach(col => {
+									if (col != null) detail_attr[col
+										.fieldId] = col.value;
 								});
 							} else
 								detail_attr[item.fieldId] = item.value;
@@ -967,6 +1015,7 @@
 						});
 					});
 				}
+				console.log(detailAttrList)
 				const jsonlist = [];
 				detailAttrList.forEach(attr => {
 					jsonlist.push({
@@ -989,15 +1038,16 @@
 						var head_attr = {};
 						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;
+								item.setting.colList.forEach(col => {
+									if (col != null) head_attr[col
+										.fieldId] = col.value;
 								});
 							} else
 								head_attr[item.fieldId] = item.value;
 						});
 						var obj_attr = this.head_styledef.form.model;
 						// console.log(obj_attr);
+
 						var input_param = Base64.encode(
 							JSON.stringify(
 								Object.keys(head_attr).map((a) => ({
@@ -1012,9 +1062,7 @@
 
 							jsonList.push({
 								page_name: page.Name,
-								item_list: $this.getDetailAttrList(page
-									.DefList, page
-									.Select_Button),
+								item_list: $this.getDetailAttrList(page),
 								ext_data: page.ExtData || {}
 							})
 
@@ -1022,10 +1070,11 @@
 						const data_json = Base64.encode(
 							JSON.stringify(jsonList)
 						);
+						console.log(jsonList)
 						var dataInfo = {
 							ed_type: 0,
 							start_transaction: true,
-							class_id: this.$data.head_styledef.form.clsId,
+							class_id: this.head_styledef.form.clsId,
 							class_name: '',
 							event_id: event.id,
 							event_name: '',
@@ -1041,342 +1090,202 @@
 							global_attr: '',
 							input_param: input_param,
 						};
-						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(
-											"cancel")
-									});
-								} else uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip + ',' + this
-										.translateSys('tip') + ':' +
-										result
-										.ret,
-									showCancel: false,
-									confirmText: this.translateSys(
-										"cancel")
-								});
-								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'),
+						const result = await runCustomEvent(dataInfo)
+						console.log(result);
+						if (result.ret != 0&& result.ret != 1) {
+							var tip = result.err_info ? typeof result
+								.err_info == 'string' ? result
+								.err_info : result.err_info.join('<br/>') :
+								'';
+							if (result.ret == 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")
+										'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/>') : '';
+							tip = tip || result.err_info
+							if (tip) uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys(
+									'close')
+							});
+							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 => {
-
-										if (item.action_type ==
-											"insert_subtable_page_row"
-										) { //鐮佺洏涓�-											$this.$data.param
-												.Show_Welcom_Page =
-												false;
+								} else if (typeof result.result == 'string') {
+									if (result.result) {
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: result.result,
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+								}
+								try {
+									let actionList = result.action || []
+									actionList.forEach(item => {
+										if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+											$this.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.param.Show_Welcom_Page = false;
 											var value = item.value;
-											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
+											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
 											) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹� 												uni.showModal({
-													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
-																);
+													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"),
+													cancelText: $this.translateSys('ok'),
+													confirmText: $this.translateSys('cancel'),
+													success: function(res) {
+														if (res.cancel) {
+															if (pageData)
+																pageData.DefList = [];
+															$this.viewAceionContent(value);
+														} else if (res.confirm) {
+															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"
-										) {
+										} else if (item.action_type == "select_subtable_page") {
+											var value = item.value;
+											const pageIndex = $this.pageDetail.findIndex((page) => {
+												return value.page_name == page.Name;
+											});
+											if (pageIndex > -1) {
+												$this.setData({
+													current: pageIndex
+												})
+											}
+										} else if (item.action_type == "select_subtable_page_row") {
 											// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
 											var value = item.value;
-											const pageData = $this
-												.pageDetail.find((
-													page) => {
-													return value
-														.page_name ==
-														page.Name;
-												});
-											if (pageData?.DefList) {
-												pageData.DefList
-													.forEach(ele => {
-
-														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();
-														}
-													});
-											}
+											$this.viewActionSelectRow(value)
 										} 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) => {
-													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
-																			);
-																	}
-																});
-													});
-											}
+											$this.viewActionRemoveRow(value)
+										} 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"
-										) {
+										} else if (item.action_type == "set_subtable_page_ext_data") {
 											var value = item.value;
-											const pageData = $this
-												.pageDetail.find((
-													page) => {
-													return 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) => {
-													return value
-														.page_name ==
-														page.Name;
-												});
-											if (pageData) {
+											const pageIndex = $this.pageDetail.findIndex((page) => {
+												return value.page_name == page.Name;
+											});
+											if (pageIndex > -1) {
+												const pageData = $this.pageDetail[pageIndex]
 												pageData.DefList = []
 												pageData.ExtData = {}
+
+												$this.$set(this.pageDetail, pageIndex, pageData)
 											}
 
-										} else if (item.action_type ==
-											"set_dlg_current_edit_attr"
-										) {
+										} else if (item.action_type == "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.setFormValues(data)
+										} else if (item.action_type == 'set_dlg_attr_show') {
+											var data = item.value;
+											$this.setFormItemVisible(data)
 										}
 									});
-								} else {
 
-									if (result.info) {
-										uni.showModal({
-											title: this.translateSys(
-												"error") + "4.3",
-											content: result.info,
-											showCancel: false,
-											confirmText: this
-												.translateSys("cancel")
-										});
-									}
+								} catch (ex) {
+									let actionList = (result.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: tip,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+									console.log(ex)
+									return
 								}
-
 							}
 
-						}).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("cancel")
-							});
-						});
+						}
+
 					}
 				} catch (ex) {
-					var tip = typeof ex == "string" ? ex : ex.message;
+					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") + "4.2",
 						content: this.translate(
@@ -1386,7 +1295,7 @@
 							this.translate('reason') + this.translateSys("colon") +
 							tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -1420,71 +1329,200 @@
 				}
 			},
 
+			viewActionSelectRow(value) {
+				const pageData = this.pageDetail.find((page) => {
+					return value.page_name == page.Name;
+				});
+				if (pageData?.DefList) {
+					const detailStyleDefList = pageData.DefList || []
+					let bFindRow = false;
+					for (let index = 0; index < detailStyleDefList.length; index++) {
+						const ele = detailStyleDefList[index]
+
+						if (value.row.id) {
+							if (ele.form.objId == value.row.id) {
+								bFindRow = true;
+							}
+						} else {
+							const conditions = row.condition || [];
+							if (conditions.length > 0) {
+								for (let index = 0; index < detailStyleDefList.length; index++) {
+									const ele = detailStyleDefList[index]
+									let bFindCondition = true;
+									for (let i in conditions) {
+										const condition = conditions[i];
+										let bFind = false;
+										for (let i2 in ele.form.items) {
+											const ele2 = ele.form.items[i2];
+											if (ele2.name != "Layout") {
+												if (ele2.fieldId == condition.attr) {
+													if (condition.value == ele2.value) {
+														bFind = true;
+													}
+													break;
+												}
+											} else {
+												const colList = ele2.setting.colList || [];
+												for (let i3 in colList) {
+													const col = colList[i3];
+													if (col.fieldId == condition.attr) {
+														if (condition.value == col.value) {
+															bFind = true;
+														}
+														break;
+													}
+												}
+												if (bFind) break;
+											}
+										}
+										if (!bFind) {
+											bFindCondition = false;
+											break;
+										}
+									}
+									if (bFindCondition) {
+										bFindRow = true;
+									}
+								}
+							}
+						}
+						if (bFindRow) {
+							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();
+						}
+						break
+					}
+				}
+
+			},
+
+			viewActionRemoveRow(value) {
+				if (JSON.stringify(value.row) == '{}') {
+					return;
+				}
+				const pageIndex = this.pageDetail.findIndex((page, index2, arr) => {
+					return value.page_name == page.Name;
+				})
+				if (pageIndex < 0)
+					return
+				const pageData = this.pageDetail[pageIndex]
+				if (pageData?.DefList) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+				{
+					const detailStyleDefList = pageData.DefList || []
+					value.row.forEach((row) => {
+						if (row.id) {
+							for (let index = 0; index < detailStyleDefList.length; index++) {
+								const ele = detailStyleDefList[index]
+								if (ele.form.objId == row.id) {
+									detailStyleDefList.splice(index, 1);
+									index--;
+								}
+							}
+
+						} else {
+							const conditions = row.condition || [];
+							if (conditions.length > 0) {
+								for (let index = 0; index < detailStyleDefList.length; index++) {
+									const ele = detailStyleDefList[index]
+									let bFindCondition = true;
+									for (let i in conditions) {
+										const condition = conditions[i];
+										let bFind = false;
+										for (let i2 in ele.form.items) {
+											const ele2 = ele.form.items[i2];
+											if (ele2.name != "Layout") {
+												if (ele2.fieldId == condition.attr) {
+													if (condition.value == ele2.value) {
+														bFind = true;
+													}
+													break;
+												}
+											} else {
+												const colList = ele2.setting.colList || [];
+												for (let i3 in colList) {
+													const col = colList[i3];
+													if (col.fieldId == condition.attr) {
+														if (condition.value == col.value) {
+															bFind = true;
+														}
+														break;
+													}
+												}
+												if (bFind) break;
+											}
+										}
+										if (!bFind) {
+											bFindCondition = false;
+											break;
+										}
+									}
+									if (bFindCondition) {
+										detailStyleDefList.splice(index, 1);
+
+									}
+								}
+							}
+
+						}
+					});
+				}
+				this.$set(this.pageDetail, pageIndex, pageData)
+			},
 			//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
 			viewActionSetRow(value) {
 				const $this = this
-				const pageIndex = $this.pageDetail.findIndex((
-					page, index2, arr) => {
+				const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => {
 					return value.page_name == page.Name;
 				})
 				if (pageIndex < 0)
 					return
 				const pageData = $this.pageDetail[pageIndex]
-				var detailStyleDefList = pageData.DefList || []
+				const detailStyleDefList = pageData.DefList || []
 				detailStyleDefList.forEach(ele => {
 					value.row.forEach((rowData) => {
 						if (rowData.id) {
 							if (ele.form.objId == rowData.id) {
 								rowData.attrs.forEach(attr => {
 									ele.form.items.forEach(ele2 => {
-										if (ele2.name !=
-											'Layout') {
-											if (ele2.fieldId ==
-												attr
-												.attr) {
-												ele2.value =
-													$this
-													.operationNumber(
-														ele2
-														.value,
-														attr
-														.value,
-														attr
-														.operation
-													)
+										if (ele2.name != 'Layout') {
+											if (ele2.fieldId == attr.attr) {
+												ele2.value = $this.operationNumber(
+													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
-																	)
-															}
-														}
-													})
+										} 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
+															)
+													}
+												}
+											})
 										}
 									});
 								});
 							}
 						} else if (rowData.condition) {
-							const conditions = rowData.condition;
+							const conditions = rowData.condition
 							let bFindCondition = true;
 							for (let i in conditions) {
 								const condition = conditions[i];
@@ -1518,62 +1556,40 @@
 								}
 							}
 							if (bFindCondition) {
-
 								rowData.attrs.forEach(attr => {
 									ele.form.items.forEach(ele2 => {
-										if (ele2.name !=
-											'Layout') {
-											if (ele2.fieldId ==
-												attr
-												.attr) {
+										if (ele2.name != 'Layout') {
+											if (ele2.fieldId == attr.attr) {
 												ele2.value =
-													$this
-													.operationNumber(
-														ele2
-														.value,
-														attr
-														.value,
-														attr
-														.operation
+													$this.operationNumber(
+														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
-																	)
-															}
-														}
-													})
+										} 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)
+													}
+												}
+											})
 										}
 									});
 								});
 
 							}
+
 						}
 					})
 				});
 				pageData.DefList = detailStyleDefList
 				$this.$set(this.pageDetail, pageIndex, pageData)
-
 			},
 			//鍔犺浇姝ｅ湪鐮佺洏鍐呭
 			viewAceionRow(data) {
@@ -1595,28 +1611,22 @@
 					data.row.forEach(row => {
 						detailStyle = JSON.parse(styleStr);
 						detailStyle.form.objId = row.id;
-						detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '')
+						detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '')
 							.replace(
-								'{', '').replace('}',
-								'') : 'null';
+								'}', '') : '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;
+									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;
-											}
-										});
+									ele.setting.colList.forEach(col => {
+										if (col) {
+											if (col.fieldId == attr.attr)
+												col.value = attr.value;
+										}
+									});
 								}
 							});
 						});
@@ -1644,11 +1654,11 @@
 					return;
 				}
 				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;
+
+				data.content.forEach(cont => {
+					var detailStyle = JSON.parse(styleStr);
+					if (detailStyle.form) {
+						//	detailStyle.SelBut_Checked = data.checkbox ?? true;
 
 						detailStyle.form.objId = cont.id;
 						detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g,
@@ -1659,18 +1669,15 @@
 						cont.attrs.forEach(attr => {
 							detailStyle.form.items.forEach(ele => {
 								if (ele.name != 'Layout') {
-									if (ele.fieldId == attr.attr) ele
-										.value =
-										attr.value;
+									if (ele.fieldId == attr.attr)
+										ele.value = attr.value;
 								} else if (ele.name == 'Layout') {
 									ele.setting.colList.forEach(
 										col => {
 											if (col) {
 												if (col.fieldId ==
-													attr
-													.attr) col
-													.value = attr
-													.value;
+													attr.attr)
+													col.value = attr.value;
 											}
 										});
 								}
@@ -1680,42 +1687,25 @@
 						if (data.clear == false) {
 							var isflag = true;
 							pageData.DefList.forEach((style, index) => {
-								if (style.form.objId == detailStyle.form
-									.objId) {
+								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;
-																}
-															});
-												}
-											});
+										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;
 								}
@@ -1726,15 +1716,36 @@
 						}
 						// $this.setData({pageDetail:pageD})
 						$this.$set(this.pageDetail, pageIndex, pageData)
+					}
+				});
 
-					});
+				$this.$set(this.pageDetail, pageIndex, pageData)
+			},
+			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
+				})
 			},
 			setFormValues(attrs) {
 				const head_styledef = this.head_styledef
-				if (JSON.stringify(attrs) == '{}') {
-					return;
+				if (!Array.isArray(attrs)) {
+					return
 				}
 				console.log(attrs)
 				attrs.forEach(async (attr, key) => {
@@ -1746,7 +1757,7 @@
 								value: val
 							});
 						});
-						
+
 						head_styledef.form.items.forEach(async (attr_item, index) => {
 							if (attr_item.name != "Layout") {
 								if (attr_item.fieldId == attr.attr) {
@@ -1779,6 +1790,13 @@
 							if (ele.fieldId == attr.attr) {
 								ele.value = attr.value;
 								ele.oldvalue = attr.value;
+								if (ele.name == "Input") {
+									if (attr.prompt) ele.placeholder = attr.prompt;
+								}
+								if (attr.enable !== undefined) {
+									if (attr.enable) ele.disabled = false;
+									else ele.disabled = true;
+								}
 							}
 						} else if (ele.name == "Layout") {
 							ele.setting.colList.forEach((col) => {
@@ -1786,6 +1804,13 @@
 									if (col.fieldId == attr.attr) {
 										col.value = attr.value;
 										col.oldvalue = attr.value;
+										if (col.name == "Input") {
+											if (attr.prompt) col.placeholder = attr.prompt;
+										}
+										if (attr.enable !== undefined) {
+											if (attr.enable) col.disabled = false;
+											else col.disabled = true;
+										}
 									}
 								}
 							});
@@ -1799,21 +1824,121 @@
 					head_styledef: head_styledef
 				})
 			},
+			setDetailFormItemVisible(attrs, style, pageIndex) {
+				if (pageIndex < 0)
+					return
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				const pageData = this.pageDetail[pageIndex]
+				if (!style.hiddenIds) {
+					style.hiddenIds = []
+				}
+				attrs.forEach((attr) => {
+					let index = style.hiddenIds.findIndex((id) => id == attr.attr);
+					if (attr.show) {
+						if (index > -1) style.hiddenIds.splice(index, 1);
+					} else {
+						if (index == -1) style.hiddenIds.push(attr.attr);
+					}
+				});
+				this.$set(this.pageDetail, pageIndex, pageData)
+			},
+			setDetailFormValues(attrs, style, pageIndex) {
+				if (pageIndex < 0)
+					return
+				if (!Array.isArray(attrs)) {
+					return
+				}
+
+				const pageData = this.pageDetail[pageIndex]
+				attrs.forEach(async (attr, key) => {
+					if (attr.choice_list) {
+						var dictItemList = [];
+						attr.choice_list.forEach(async (val, index) => {
+							dictItemList.push({
+								text: val,
+								value: val
+							});
+						});
+
+						style.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;
+											}
+										}
+									}
+								});
+							}
+						});
+					}
+					if (!style.form.model[attr.attr]) {
+						style.form.model[attr.attr] = attr.value;
+					}
+					style.form.items.forEach(async (ele) => {
+						if (ele.name != "Layout") {
+							if (ele.fieldId == attr.attr) {
+								ele.value = attr.value;
+								ele.oldvalue = attr.value;
+								if (ele.name == "Input") {
+									if (attr.prompt) ele.placeholder = attr.prompt;
+								}
+								if (attr.enable !== undefined) {
+									if (attr.enable) ele.disabled = false;
+									else ele.disabled = true;
+								}
+							}
+						} 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;
+										if (col.name == "Input") {
+											if (attr.prompt) col.placeholder = attr.prompt;
+										}
+										if (attr.enable !== undefined) {
+											if (attr.enable) col.disabled = false;
+											else col.disabled = true;
+										}
+									}
+								}
+							});
+						}
+
+					})
+					//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+				})
+				this.$set(this.pageDetail, pageIndex, pageData)
+			},
+
 			onClickItem(e) { //閫夋嫨椤电
 				// console.log(e);
 				this.current = e.currentIndex
 			},
-			onDetail1EnterChange(item) { //鐮佺洏涓牱寮忓洖杞︿簨浠�-				console.log(item);
-			},
+
 			async del(pageData, style, event) {
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				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;
+						item.setting.colList.forEach(col => {
+							if (col != null) head_attr[col.fieldId] =
+								col.value;
 						});
 					} else
 						head_attr[item.fieldId] = item.value;
@@ -1824,9 +1949,9 @@
 				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
+						item.setting.colList.forEach(col => {
+							if (col != null) detail_attr[col
+									.fieldId] = col
 								.value;
 						});
 					} else
@@ -1881,7 +2006,7 @@
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -1902,15 +2027,15 @@
 				// console.log(e.target.dataset);
 				var index = e.target.dataset.index;
 				var ischeck = e.target.dataset.ischeck;
-				var data = this.$data.check_list.items;
-				// this.$data.check_list.items=[];
-				if (this.$data.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫�+				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.$data.check_list.items = data;
+				this.check_list.items = data;
 
 			},
 			popup_cancel(e) { //寮规鍙栨秷
@@ -1918,7 +2043,7 @@
 			},
 			popup_sava(e) { //寮规纭畾
 				var $this = this;
-				var items = $this.$data.check_list.items;
+				var items = $this.check_list.items;
 				var data = [];
 				var name = "";
 				for (var i = 0; i < items.length; i++) {
@@ -1932,12 +2057,12 @@
 						});
 					}
 				}
-				if (!$this.$data.popupParam) {
+				if (!$this.popupParam) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: "popupParam涓虹┖锛�,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -1946,11 +2071,11 @@
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
-				var callback_eventid = $this.$data.popupParam.button_callback.trim();
+				var callback_eventid = $this.popupParam.button_callback.trim();
 				var info = {
 					eventid: callback_eventid,
 					edtype: "0",
@@ -1958,12 +2083,12 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: $this.$data.ClsID,
+					clsid: $this.ClsID,
 					objid: "",
-					attr: $this.$data.popupParam.req,
+					attr: $this.popupParam.req,
 					dataJson: data
 				}
-				$this.DataObjRunCustomEvent(info, $this.$data.popupParam.data_attr);
+				$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
 				this.$refs.popup.close();
 			},
 
@@ -1971,18 +2096,18 @@
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.ClsID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.ClsID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.ClsID, // button=bottom鏃�master鐨刢ls_id
+						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.$data.ClsID, //褰撳墠鏁版嵁绫籭d
+						class_id: this.ClsID, //褰撳墠鏁版嵁绫籭d
 					}
 					if (data_attr) {
 						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1998,7 +2123,7 @@
 				}
 				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.$data.global_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 = {};
@@ -2028,7 +2153,7 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
+					if (data.ret != 0&& data.ret != 1) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info :
 							data
@@ -2042,14 +2167,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -2057,136 +2182,69 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
-
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
-							for (var i = 0; i < actionlist.length; i++) {
-								var action = actionlist[i];
-								if (action.action_type == 'set_dlg_attr') {
-									var result = action.value;
-									$this.setFormValues(result)
-								} else if (action.action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-									result.forEach(async (attr, key) => {
-										$this.$data.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.$data.head_styledef = [];
-									$this.$data.head_styledef = head_styledef;
-									// console.log($this.$data.head_styledef);
-								} else if (action.action_type == 'set_global_attr') {
-									$this.$data.global_attr = action.value || [];
-								} else {
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
+								$this.setFormValues(data.result || [])
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
 									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"),
+										title: this.translateSys('tip'),
+										content: data.result,
 										showCancel: false,
-										confirmText: this.translateSys("cancel")
+										confirmText: this.translateSys('close')
 									});
 								}
 							}
-						}
-						console.log($this.head_styledef);
-						if (data.result) {
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.head_styledef.form.items
-									.length; c++) {
-									var attr = $this.$data.head_styledef.form.items[c];
-									//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-									if ($this.head_styledef.form.model[result[i].attr] ==
-										undefined) {
-										$this.head_styledef.form.model[result[i].attr] =
-											result[i]
-											.value;
-									}
-									//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-									if (attr.name != 'Layout') {
-										if (attr.fieldId == result[i].attr) {
-											attr.value = '';
-											attr.oldvalue = '';
-											attr.value = result[i].value;
-											attr.oldvalue = result[i].value;
-											$this.head_styledef.form.model[attr.fieldId] =
-												result[i]
-												.value;
-										}
-									} else if (attr.name == 'Layout') {
-										attr.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == result[i].attr) {
-													col.value = '';
-													col.oldvalue = '';
-													col.value = result[i].value;
-													col.oldvalue = result[i].value;
-													$this.head_styledef.form.model[col
-															.fieldId] =
-														result[i].value;
-												}
-											}
+							try {
+								var actionlist = data.action || []
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										var result = action.value;
+										$this.setFormValues(result)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.setFormItemVisible(result)
+
+										// 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')
 										});
 									}
 								}
 
-								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i]
-											.attr) {
-											$this.$data.refdatastore[j].value = result[i]
-												.value;
-										}
-									}
-								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
 						}
 					}
@@ -2201,7 +2259,7 @@
 						title: this.translateSys("error") + "3.1",
 						content: exStr,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -2224,18 +2282,6 @@
 					attr: a,
 					value: obj_attr[a] || "",
 				}));
-				if ($this.refdatastore.length > 0) {
-					for (var i = 0; i < $this.refdatastore.length; i++) {
-						if (!req.filter(function(s) {
-								return $this.refdatastore[i].attr == s.name
-							}).length) {
-							req.push({
-								'attr': $this.refdatastore[i].attr,
-								'value': $this.refdatastore[i].value
-							});
-						}
-					}
-				}
 
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
@@ -2280,7 +2326,7 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
+					if (data.ret != 0&& data.ret != 1) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info :
 							data
@@ -2294,14 +2340,14 @@
 								title: $this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: $this.translateSys("cancel")
+								confirmText: $this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip + ',' + $this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: $this.translateSys("cancel")
+							confirmText: $this.translateSys('close')
 						});
 						return false
 					} else {
@@ -2309,16 +2355,28 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: $this.translateSys("cancel")
+							confirmText: $this.translateSys('close')
 						});
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: data.result,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+								}
+							}
+							try {
+								var actions = data.action || []
 								for (var i = 0; i < actions.length; i++) {
 									var action = actions[i];
 									console.log(action)
@@ -2366,7 +2424,7 @@
 														rclsid: '',
 														robjid: '',
 														userlogin: '',
-														clsid: $this.$data.param
+														clsid: $this.param
 															.DataCls
 															.id,
 														objid: "",
@@ -2399,6 +2457,7 @@
 											$this.setData({
 												check_list: val.config
 											})
+											console.log($this.check_list)
 											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊� 												$this.setData({
 													popupType: "right"
@@ -2454,8 +2513,8 @@
 														data[0].ID +
 														';' + data[0].Name;
 
-													// $this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
-													// $this.$data.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
+													// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+													// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
 													var callback_eventid = param
 														.button_callback
 														.trim();
@@ -2491,22 +2550,26 @@
 												.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
-											confirmText: $this.translateSys("cancel")
+											confirmText: $this.translateSys('close')
 										});
 									}
 								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								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("cancel")
-							});
 						}
+
 					}
 
 				}).catch(ex => {
@@ -2519,7 +2582,7 @@
 						title: $this.translateSys('tip') + "5.1",
 						content: exStr,
 						showCancel: false,
-						confirmText: $this.translateSys("cancel")
+						confirmText: $this.translateSys('close')
 					});
 				});
 			},
@@ -2552,11 +2615,14 @@
 				const $this = this
 				if (btn.Prompt) {
 					const sContent = btn.PromptContent || this.translate("confirm")
+
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: btn.PromptContent || this.translate("confirm"),
+						cancelText: this.translateSys('ok'),
+						confirmText: this.translateSys('cancel'),
 						success: function(res) {
-							if (res.confirm) {
+							if (res.cancel) {
 								$this.onButtonClicked(btn, pageData, -1);
 							}
 
@@ -2564,7 +2630,13 @@
 					})
 
 				} else {
-					this.onButtonClicked(btn, pageData, -1);
+					this.handleButtonClick((done) => {
+						this.onButtonClicked(btn, pageData, -1);
+						setTimeout(() => {
+							done(); // 閲嶇疆鐘舵�
+						}, 1000);
+					});
+
 				}
 			},
 			onRowBtnClick(btn, pageData, index) {
@@ -2574,8 +2646,10 @@
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: btn.PromptContent || this.translate("confirm"),
+						cancelText: this.translateSys('ok'),
+						confirmText: this.translateSys('cancel'),
 						success: function(res) {
-							if (res.confirm) {
+							if (res.cancel) {
 								$this.onButtonClicked(btn, pageData, index);
 							}
 
@@ -2583,7 +2657,13 @@
 					})
 
 				} else {
-					this.onButtonClicked(btn, pageData, index);
+					this.handleButtonClick((done) => {
+						this.onButtonClicked(btn, pageData, index);
+						setTimeout(() => {
+							done(); // 閲嶇疆鐘舵�
+						}, 1000);
+					});
+
 				}
 			},
 			onButtonClicked(btn, pageData, index) {
@@ -2609,7 +2689,8 @@
 						const style = pageData.DefList[index];
 						//鍒犻櫎鐮佺洏涓牱寮忛潰鏉� 						pageData.DefList.splice(index, 1);
-						this.del(pageData, style, btn.AfterProcess_Event);
+						if (btn.AfterProcess_Event.ID)
+							this.del(pageData, style, btn.AfterProcess_Event);
 						this.$set(this.pageDetail, pageIndex, pageData)
 					}
 				} else if (btn.FunCode == "Modify") {
@@ -2624,7 +2705,7 @@
 								title: this.translateSys("tip"),
 								content: this.translateSys("unrealized"),
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						}
 					}
@@ -2646,9 +2727,9 @@
 				const objAttr = {}
 				row.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-						item.setting.colList.forEach(cols => {
-							if (cols != null) objAttr[cols
-								.fieldId] = cols.value;
+						item.setting.colList.forEach(col => {
+							if (col != null) objAttr[col
+								.fieldId] = col.value;
 						});
 					} else
 						objAttr[item.fieldId] = item.value;
@@ -2678,7 +2759,8 @@
 								} else {
 									ele.setting.colList.forEach(async (col) => {
 										if (col) {
-											let value = formData[col.fieldId]
+											let value = formData[col
+												.fieldId]
 											if (value)
 												col.value = value
 										}
@@ -2686,7 +2768,6 @@
 								}
 							})
 							$this.$set($this.pageDetail, pageIndex, pageData)
-
 						},
 
 					}
@@ -2698,15 +2779,15 @@
 				const objAttr = {}
 				row.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-						item.setting.colList.forEach(cols => {
-							if (cols != null) objAttr[cols
-								.fieldId] = cols.value;
+						item.setting.colList.forEach(col => {
+							if (col != null) objAttr[col.fieldId] = col.value;
 						});
 					} else
 						objAttr[item.fieldId] = item.value;
 				});
 
-				const url = `../modal/form/index?param=${JSON.stringify(btn)}&titlename=${btn.ShowName}&editMode=1&objAttr=${JSON.stringify(objAttr)}&type=updateDataObj`
+				const url =
+					`../modal/form/index?param=${JSON.stringify(btn)}&titlename=${btn.ShowName}&editMode=1&objAttr=${JSON.stringify(objAttr)}&type=updateDataObj`
 				var $this = this;
 				uni.navigateTo({
 					url: url,
@@ -2729,7 +2810,8 @@
 								} else {
 									ele.setting.colList.forEach(async (col) => {
 										if (col) {
-											let value = formData[col.fieldId]
+											let value = formData[col
+												.fieldId]
 											if (value)
 												col.value = value
 										}
@@ -2737,6 +2819,7 @@
 								}
 							})
 							$this.$set($this.pageDetail, pageIndex, pageData)
+							console.log($this.pageDetail)
 
 						},
 					}
@@ -2748,37 +2831,38 @@
 				this.After_OK_Event = pageData.After_ok;
 				// console.log(this.Before_OK_Event);
 				// console.log(this.After_OK_Event);
-				if (this.$data.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
-					this.sava(pageData, this.$data.Before_OK_Event);
-				else if (this.$data.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
-					this.sava(pageData, this.$data.After_OK_Event);
+				console.log("ok");
+				if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
+					this.sava(pageData, this.Before_OK_Event);
+				else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
+					this.sava(pageData, this.After_OK_Event);
 			},
 			sava(pageData, event) {
+
 				var $this = this;
-				if (pageData.DefList.length == 0) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate(
-								"tip_no_data_first") +
-							this.translateSys(
-								"quotation_mark_left") + pageData.Name + this
-							.translateSys(
-								"quotation_mark_right") +
-							this.translate(
-								"tip_no_data_last"),
-						showCancel: false,
-						confirmText: this.translateSys("cancel")
-					});
-					return false;
-				}
+				// if (pageData.DefList.length == 0) {
+				// 	uni.showModal({
+				// 		title: this.translateSys("tip"),
+				// 		content: this.translate(
+				// 				"tip_no_data_first") +
+				// 			this.translateSys(
+				// 				"quotation_mark_left") + pageData.Name + this
+				// 			.translateSys(
+				// 				"quotation_mark_right") +
+				// 			this.translate(
+				// 				"tip_no_data_last"),
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys('close')
+				// 	});
+				// 	return false;
+				// }
 				//鑾峰彇琛ㄥご灞炴�
-				pageData.okLoading = true
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				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;
+						item.setting.colList.forEach(col => {
+							if (col != null) head_attr[col.fieldId] =
+								col.value;
 						});
 					} else
 						head_attr[item.fieldId] = item.value;
@@ -2790,10 +2874,9 @@
 					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;
+							item.setting.colList.forEach(col => {
+								if (col != null)
+									detail_attr[col.fieldId] = col.value;
 							});
 						} else
 							detail_attr[item.fieldId] = item.value;
@@ -2853,12 +2936,11 @@
 					});
 				});
 				if (jsonlist.length == 0) {
-					pageData.okLoading = false
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -2868,7 +2950,7 @@
 					item_list: jsonlist,
 					ext_data: pageData.ExtData
 				})
-				// console.log(jsonlist);
+
 				$this.runCustomEvent(pageData, event, input_param, list);
 				// jsonlist.forEach(async (json,key)=>{
 				// 	await $this.runCustomEvent(event,input_param,json,'1');
@@ -2883,7 +2965,7 @@
 				var dataInfo = {
 					ed_type: 0,
 					start_transaction: true,
-					class_id: this.$data.ClsID,
+					class_id: this.ClsID,
 					class_name: '',
 					event_id: event.ID,
 					event_name: '',
@@ -2899,11 +2981,10 @@
 					global_attr: '',
 					input_param: input_param,
 				};
-
-				// console.log(dataInfo);
+				console.log(dataInfo);
 				runCustomEvent(dataInfo).then(result => {
 					console.log(result);
-					if (result.ret != 0) {
+					if (result.ret != 0&& result.ret != 1) {
 						var tip = result.err_info ? typeof result
 							.err_info == 'string' ? result.err_info :
 							result.err_info.join('<br/>') : '';
@@ -2919,7 +3000,7 @@
 								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys(
-									"cancel")
+									'close')
 							});
 						} else uni.showModal({
 							title: this.translateSys('tip'),
@@ -2928,251 +3009,173 @@
 								result.ret,
 							showCancel: false,
 							confirmText: this.translateSys(
-								"cancel")
+								'close')
 						});
 						return false;
 					} else {
 						var tip = result.info ? typeof result.info ==
 							'string' ? result.info : result.info
 							.join('<br/>') : '';
+						tip = tip || result.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys('tip'),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys(
-								"cancel")
+								'close')
 						});
-						if (result.result_type == 0) {
-							if (result.action) {
-								//	uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")});
+						if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+							if (result.result_type == 2) {
 
-								result.action.forEach(item => {
+							} else if (typeof result.result == 'string') {
+								if (result.result) {
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: result.result,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+								}
+							}
+							try {
+								let actionList = result.action || []
+								actionList.forEach(item => {
 									if (item.action_type ==
-										"insert_subtable_page_row"
-									) { //鐮佺洏涓�+										"insert_subtable_page_row") { //鐮佺洏涓� 										var value = item.value;
 										//鍔犺浇宸茬粡鐮佺洏鏁版嵁
-										$this.viewAceionRow(
-											value, );
+										$this.viewAceionRow(value);
 										//娓呯┖鏉＄爜鍐呭
-										$this.$data
-											.head_styledef
-											.form.items
-											.forEach((
-												item,
-												index) => {
-												if (item
-													.fieldId !=
-													"S_CNTR_CODE"
-												) {
-													item.value =
-														'';
-													item.oldvalue =
-														'';
-													$this
-														.$data
-														.head_styledef
-														.form
-														.model[
-															item
-															.fieldId
-														] =
-														'';
-												}
-											});
+										$this.head_styledef.form.items.forEach((item,
+											index) => {
+											if (item.fieldId !=
+												"S_CNTR_CODE") {
+												item.value = '';
+												item.oldvalue = '';
+												$this.head_styledef.form.model[
+													item
+													.fieldId] = '';
+											}
+										});
 
 										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(
+												'close')
 										});
 									} else if (item.action_type ==
 										"set_subtable_page_content"
 									) { //宸茬爜鐩�-										$this.$data.param
-											.Show_Welcom_Page =
-											false;
+										$this.param.Show_Welcom_Page = false;
 										var value = item.value;
-										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
+										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
 										) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹� 											uni.showModal({
-												title: this
-													.translateSys(
-														'tip'
-													),
-												content: this
-													.translate(
+												title: $this.translateSys(
+													'tip'),
+												content: $this.translate(
 														"are_you_sure_clear_first"
 													) +
-													this
-													.translateSys(
+													$this.translateSys(
 														"quotation_mark_left"
 													) +
-													value
-													.page_name +
-													this
-													.translateSys(
+													value.page_name +
+													$this.translateSys(
 														"quotation_mark_right"
 													) +
-													this
-													.translate(
+													$this.translate(
 														"are_you_sure_clear_last"
 													),
-												success: function(
-													res
-												) {
-													if (res
-														.confirm
-													) {
-														if (
-															pageData
-														)
+												cancelText: $this.translateSys(
+													'ok'),
+												confirmText: $this
+													.translateSys('cancel'),
+												success: function(res) {
+													if (res.cancel) {
+														if (pageData)
 															pageData
 															.DefList = [];
 														$this
 															.viewAceionContent(
-																value
-															);
-													} else if (
-														res
-														.cancel
-													) {
-														if (
-															pageData
-														)
+																value);
+													} else if (res
+														.confirm) {
+														if (pageData)
 															pageData
 															.DefList = [];
 														$this
 															.viewAceionContent(
-																value
-															);
+																value);
 													}
 												}
 											});
 										} else {
 											if (pageData)
-												pageData
-												.DefList = [];
-											$this
-												.viewAceionContent(
-													value);
+												pageData.DefList = [];
+											$this.viewAceionContent(value);
 										}
-									} else if (item
-										.action_type ==
-										"remove_subtable_page_row"
-									) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+									} else if (item.action_type ==
+										"select_subtable_page") {
 										var value = item.value;
-										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
-																		);
-																}
-															}
-														);
-												});
+										const pageIndex = $this.pageDetail.findIndex((
+											page) => {
+											return value.page_name == page
+												.Name;
+										});
+										if (pageIndex > -1) {
+											$this.setData({
+												current: pageIndex
+											})
 										}
-									} else if (item
-										.action_type ==
-										"set_subtable_page_row"
-									) {
-										$this.viewActionSetRow(
-											item
-											.value)
-
-									} else if (item
-										.action_type ==
-										"set_subtable_page_ext_data"
-									) {
-										var value = item.value;
-										const pageData = $this
-											.pageDetail.find((
-												page) => {
-												return value
-													.page_name ==
-													page
-													.Name;
-											});
+									} else if (item.action_type ==
+										"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+										let value = item.value;
+										$this.viewActionRemoveRow(value)
+									} else if (item.action_type ==
+										"set_subtable_page_row") {
+										$this.viewActionSetRow(item.value)
+									} else if (item.action_type ==
+										"set_subtable_page_ext_data") {
+										let value = item.value;
+										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 ==
+									} else if (item.action_type ==
 										"clear_subpage_rows") {
 										var value = item.value;
-										const pageData = $this
-											.pageDetail.find((
-												page) => {
-												return value
-													.page_name ==
-													page
-													.Name;
-											});
-										if (pageData) {
-											pageData
-												.DefList = []
-											pageData
-												.ExtData = {}
+										const pageIndex = $this.pageDetail.findIndex((
+											page) => {
+											return value.page_name == page
+												.Name;
+										});
+										if (pageIndex > -1) {
+											const pageData = $this.pageDetail[
+												pageIndex]
+											pageData.DefList = []
+											pageData.ExtData = {}
+
+											$this.$set(this.pageDetail, pageIndex,
+												pageData)
 										}
-									} else if (item
-										.action_type ==
-										"set_dlg_current_edit_attr"
-									) {
-										if ($this
-											.focusOldFieldId ==
-											item.value)
+									} else if (item.action_type ==
+										"set_dlg_current_edit_attr") {
+										if ($this.focusOldFieldId == item.value)
 											$this.setData({
 												focusFieldId: ""
 											})
@@ -3183,58 +3186,56 @@
 											})
 										}
 										$this.$nextTick(() => {
-											$this
-												.setData({
-													focusFieldId: item
-														.value
-												})
+											$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 (item.action_type == 'set_dlg_attr_show') {
+										var data = item.value;
+										$this.setFormItemVisible(data)
 									}
 
 								});
-							} else {
-								if ($this.$data.After_OK_Event.ID !=
-									event
-									.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
 
-									$this.sava(pageParam, $this.$data
-										.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+								if ($this.After_OK_Event?.ID && $this.After_OK_Event.ID != event
+									.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+									$this.sava(pageParam, $this.After_OK_Event); //鎵ц纭畾鍚庝簨浠� 
 								}
-							}
-						} else {
-
-							if (result.info) {
+							} catch (ex) {
+								let actionList = (result.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 								uni.showModal({
-									title: this.translateSys(
-										"tip"),
-									content: result.info,
+									title: this.translateSys('tip'),
+									content: tip,
 									showCancel: false,
-									confirmText: this
-										.translateSys("cancel")
+									confirmText: this.translateSys('close')
 								});
+								console.log(ex)
+								return
 							}
 						}
 					}
 
-					pageParam.okLoading = false
 				}).catch(ex => {
-					pageParam.okLoading = false
-					let tip = typeof ex.errMsg == "string" ? ex.errMsg : 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") + "8.1",
-						content: this.translate(
-								"execute_after_ok_event_failed") +
-							this.translateSys(
-								"comma") +
-							tip,
+						content: this.translate("execute_after_ok_event_failed") +
+							this.translateSys("comma") + tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -3255,7 +3256,17 @@
 		},
 	};
 </script>
+<style>
+	.popup-content {
+		@include flex;
 
+	}
+
+	.popup-height {
+		@include height;
+		/* width: 200px; */
+	}
+</style>
 <style lang="scss">
 	.uni-page-modal-5601 {
 
@@ -3271,38 +3282,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: 8rpx;
-					font-size: 32rpx;
-					color: rgb(192, 196, 204);
-				}
-			}
-
-			.input-wrapper:hover {
-				border: 1px solid rgb(41, 121, 255);
-			}
-		}
 
 		.view-content {
 			display: flex;
@@ -3339,6 +3318,13 @@
 			flex-direction: column !important;
 		}
 
+		.tab-content {
+			display: flex;
+			width: 100%;
+			height: 100%;
+			flex-direction: column !important;
+		}
+
 		.view-bottom {
 			display: flex;
 			flex-direction: row;
@@ -3346,25 +3332,22 @@
 			padding: 10rpx 15rpx 30rpx 15rpx;
 
 			.btn-disabled {
-				background-color: #ddd;
-				color: #888;
+				background-color: #ddd !important;
+				color: #888 !important;
 			}
 
 			.btn-left {
 				padding: 20rpx;
 				line-height: 1.5;
-				border: none;
-				font-size: 38rpx;
 				font-weight: bold;
 				float: left;
 				display: inline-block;
+
 			}
 
 			.btn-one {
 				padding: 20rpx;
 				line-height: 1.5;
-				border: none;
-				font-size: 38rpx;
 				font-weight: bold;
 				float: left;
 				display: inline-block;
@@ -3375,8 +3358,6 @@
 			.btn-right {
 				padding: 20rpx;
 				line-height: 1.5;
-				border: none;
-				font-size: 38rpx;
 				font-weight: bold;
 				float: right;
 				display: inline-block;
@@ -3397,6 +3378,23 @@
 			}
 		}
 
+		.btn-warn {
+			background: #ff2d1e;
+			border: none;
+			color: #fff;
+		}
+
+		.btn-cancel {
+			background: #fff;
+			color: #000;
+		}
+
+		.btn-primary {
+			background: #27A6E1;
+			border: none;
+			color: #fff;
+		}
+
 		[nvue] uni-view {
 			position: relative;
 			border: 0 solid #000;
@@ -3405,7 +3403,7 @@
 
 		.uni-icon {
 			/* border: 1px solid red; */
-			width: 8%;
+			width: 30rpx;
 			font-family: uniicons;
 			font-size: 40rpx;
 			font-weight: 400;
@@ -3421,52 +3419,30 @@
 
 		.dv-panel {
 			background-color: #efefef;
-			padding: 20rpx 20rpx 10rpx 0px;
+			padding: 10rpx 10rpx 10rpx 0px;
 			border-radius: 12rpx;
 			margin: 10rpx 0 20rpx 0;
-			text-align: right;
 
-			.txt_title {
-				font-size: 28rpx;
-				text-align: right;
-				display: inline-block;
-			}
+			.dv-panel-form {
+				padding: 0px;
+				margin: 0;
 
-			input {
-				vertical-align: middle;
-				display: inline-block;
-				border: 1px solid #d5d5d5;
-				width: 68%;
-				height: 48rpx;
-				line-height: 28rpx;
-				background: #FFF;
-				border-radius: 7px !important;
-				color: #2d8cf0;
-				padding: 6rpx 8rpx 8rpx;
-				font-size: 28rpx;
-				font-family: inherit;
-				box-shadow: none !important;
-				transition-duration: 0.1s;
-				margin-top: 0rpx;
-			}
+				.uni-forms-item {
+					padding-bottom: 5rpx;
+					margin-bottom: 0;
 
-			input::-webkit-input-placeholder {
-				font-size: 10rpx;
-			}
+					.uni-forms-item__label {
+						height: 20px !important;
+						padding: 0 10rpx 0 0 !important;
+					}
+				}
 
-			.form-item-span {
-				vertical-align: text-top;
-				color: #2d8cf0;
-				white-space: normal;
-				word-break: break-all;
-				display: inline-block;
-				width: calc(100% - 100px);
 			}
 
 			.dv-panel-button {
 				width: 100%;
 				text-align: left;
-				min-height: 30rpx;
+				min-height: 16px;
 				padding-bottom: 10rpx;
 
 				checkbox {
@@ -3476,9 +3452,9 @@
 
 				button {
 					text-align: left;
-					line-height: 1.5;
+					line-height: 1.6;
 					border: none;
-					font-size: 30rpx;
+
 					margin-right: 10rpx;
 					display: inline-block;
 					float: right;
@@ -3488,15 +3464,6 @@
 
 		}
 
-		.dv-panel-input {
-			width: 100%;
-			display: inline-block;
-			text-align: left;
-
-			.dv-input {
-				margin-bottom: 2rpx;
-			}
-		}
 
 		.logo {
 			height: 100rpx;
@@ -3547,7 +3514,6 @@
 			background: #94D5EF;
 			display: block;
 			width: 100%;
-			font-size: 36rpx;
 			line-height: 80rpx;
 			font-weight: 500;
 		}
@@ -3566,8 +3532,6 @@
 			background: #FFF;
 			border-radius: 0 !important;
 			color: #2d8cf0;
-			/* padding: 10rpx 8rpx 12rpx; */
-			font-size: 34rpx;
 			font-family: inherit;
 			box-shadow: none !important;
 			transition-duration: 0.1s;
@@ -3591,30 +3555,36 @@
 			background-color: #f3f3f3 !important;
 		}
 
-		.demo-uni-row {
-			margin-bottom: 0px;
-			display: block;
-
-			.uni-input {
-				width: calc(100% - 120px);
-			}
-		}
-
-		::v-deep .uni-row {
-			margin-bottom: 0px;
-		}
-
-		.view-tabpage ::v-deep .uni-row {
-			margin-bottom: 5px;
-		}
-
 		.demo-uni-col {
 			height: 36px;
 			border-radius: 5px;
 		}
 
+		.view-popup {
+			position: relative;
+		}
+
+		.popup-content {
+			// @include flex;
+			align-items: center;
+			justify-content: center;
+			padding: 30rpx;
+			background-color: #fff;
+			/* height: 150px; */
+			/* border: 1px solid red; */
+		}
+
+		.popup-cont {
+			overflow-y: auto;
+			/* border: 1px solid red; */
+		}
+
+		.popup-height {
+			// @include height;
+			/* width: 200px; */
+		}
+
 		.popup-header {
-			font-size: 42rpx;
 			font-weight: bold;
 			margin: 20rpx 20rpx 0px 20rpx;
 		}
@@ -3626,7 +3596,7 @@
 		.popup-footer {
 			float: right;
 			position: absolute;
-			bottom: 0;
+			bottom: 10rpx;
 			right: 20rpx;
 		}
 
@@ -3639,7 +3609,6 @@
 			background: #27A6E1;
 			border: none;
 			color: #fff;
-			font-size: 38rpx;
 			font-weight: bold;
 			/* float: left; */
 			display: inline-block;
@@ -3650,10 +3619,11 @@
 			margin-top: 50rpx;
 			padding: 15rpx;
 			line-height: 1.5;
-			background: #27A6E1;
-			border: none;
-			color: #fff;
-			font-size: 38rpx;
+			// background: #27A6E1;
+			// border: none;
+			// color: #fff;
+			background: #fff;
+			color: #000;
 			font-weight: bold;
 			/* float: right; */
 			display: inline-block;
@@ -3661,4 +3631,10 @@
 
 
 	}
+
+	.uni-page-modal-5601.large-mode {
+		.dv-panel-button {
+			min-height: 32px !important;
+		}
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1