~jt/MES-PDA.git

			@@ -22,188 +22,199 @@
			</view>
			</view>

			<scroll-view :scroll-top="scrollTop" :scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower"
			@scroll="scroll">
			<view class="view-content" id="tabpanel">
			<view class="dv-panel dv-panel-bkcolor" v-for="(style,ii) in detail1StyleDefList"
			@click="onPanelClick(ii)" :id="'panel'+style.form.htmlobjId"
			:class="activelist[ii].active==true?'bk-active':''">
			<div class="dv-panel-button" v-if="param.ListPage.CheckBox==true">
			<checkbox-group>
			<label>
			<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
			</label>
			</checkbox-group>
			</div>
			<!-- HTML页面类型显示 -->
			<div class="dv-listHtml-Panel" v-if="ListHtml_Panel" v-html="ListHtml_Panel[ii]" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
			param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
			param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
			<!-- <div class="dv_panel_content">
			<div class="dv_panel_attr">
			<label>No：</label>
			<span>TA240129-00001</span>
			</div>
			<div class="dv_panel_attr">
			<div class="dv_box_node">
			<p><span>毛料线边</span></p>
			<label>L002-1</label>
			</div>
			<i class="mobox-normal-right"></i>
			<div class="dv_box_node">
			<p><span>毛料线边</span></p>
			<label>L003-3</label>
			</div>
			</div>
			</div> -->
			</div>
			<!-- 自定义表单类型显示 -->
			<div class="dv-panel-input" v-if="!ListHtml_Panel" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
			param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
			param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
			<div 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>
			<!-- 文本框/数字框 -->
			<view class="dv_input"
			v-if="(item.name=='Input' \|\| item.name=='InputNumber') && !item.disabled">
			<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
			@change="onChange(item)"></text>
			<input class="uni-input" :class="item.disabled?'input-disabled':''"
			:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
			v-model="item.value" :disabled="item.disabled"
			:placeholder="item.placeholder"
			:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix \|\| item.setting.suffix?'87%':'96%'}"
			:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
			<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
			@click="onChange(item)"></text>
			</view>
			<!-- 下拉框-单选 item.useDict?item.dict:item.selections-->
			<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
			:class="item.disabled?'input-disabled':''" v-model="item.value"
			:localdata="item.dict" @change="onChange(item)" :disabled="item.disabled"
			:clear="false"></uni-data-select>
			<!-- 多行文本 -->
			<view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
			<textarea class="uni-input" :value="item.value"
			:class="item.disabled?'input-disabled':''" :placeholder="item.placeholder"
			@blur="onModelValue(item)" style="height:60px;" :style="{'width':'96%'}"
			:disabled="item.disabled"></textarea>
			</view>
			<!-- 复选框 -->
			<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
			:class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
			:data-ischeck="item.value" :disabled="item.disabled"
			:style="{'margin-left':'10rpx'}">
			<label>
			<checkbox :value="item.value" :checked="item.value" />
			<text>{{item.label}}</text>
			</label>
			</checkbox-group>
			<!-- Switch开关 -->
			<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
			:style="{'margin-left':'10rpx'}" />
			<!-- 日期时间 -->
			<view class="input-wrapper"
			v-if="(item.name=='TimePicker' \|\| item.name=='DatePicker') && !item.disabled">
			<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
			<view class="picker">{{item.value}}</view>
			</picker>
			</view>
			</view>
			<!-- 栅格布局 -->
			<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
			<uni-col v-for="(cols,key) in item.setting.colList"
			:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
			<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>
			<view class="dv_input"
			v-if="(cols.name=='Input' \|\| cols.name=='InputNumber') && !cols.disabled">
			<text v-if="cols.setting.prefix" class="uni-icon"
			:class="[cols.setting.prefix]"
			@change="onChange(cols)"></text>
			<input class="uni-input" :class="cols.disabled?'input-disabled':''"
			:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
			v-model="cols.value" :disabled="cols.disabled"
			:placeholder="cols.placeholder"
			:style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix \|\| cols.setting.suffix?'87%':'96%'}"
			:focus="focusMateria" @focus="ontap(cols)" @blur="onevent(cols)" />
			<text v-if="cols.setting.suffix" class="uni-icon"
			:class="[cols.setting.suffix]"
			@click="onChange(cols)"></text>
			</view>
			<!-- 下拉框-单选 cols.useDict?cols.dict:cols.selections-->
			<uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled"
			:class="cols.disabled?'input-disabled':''" v-model="cols.value"
			:localdata="cols.dict" @change="onChange(cols)"
			:disabled="cols.disabled" :clear="false"></uni-data-select>
			<!-- 多行文本 -->
			<view class="input-wrapper" v-if="cols.name=='Textarea' && !cols.disabled">
			<textarea class="uni-input" :value="cols.value"
			:class="cols.disabled?'input-disabled':''"
			:placeholder="cols.placeholder" @blur="onModelValue(cols)"
			style="height:60px;" :style="{'width':'96%'}"
			:disabled="cols.disabled"></textarea>
			</view>
			<!-- 复选框 -->
			<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
			:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
			@change="onModelValue(cols)" :data-ischeck="cols.value"
			:style="{'margin-left':'10rpx'}">
			<label>
			<checkbox :value="cols.value" :checked="cols.value" />
			<text>{{cols.label}}</text>
			</label>
			</checkbox-group>
			<!-- Switch开关 -->
			<switch v-if="cols.name=='Switch'"
			:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
			v-model="cols.value" @change="onModelValue(cols)"
			:style="{'margin-left':'10rpx'}" />
			<!-- 日期时间 -->
			<view class="input-wrapper"
			v-if="(cols.name=='TimePicker' \|\| cols.name=='DatePicker') && !cols.disabled">
			<picker mode="date" class="date_iput"
			:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
			:value="cols.value" @change="onModelValue(cols)">
			<view class="picker">{{cols.value}}</view>
			</picker>
			</view>

			</view>
			</uni-col>
			</uni-row>
			<view class="v-scroll-view">
			<scroll-view :scroll-top="scrollTop" :scroll-y="true" class="scroll-y" @scrolltolower="scrolltolower"
			@scroll="scroll">
			<view class="view-content" id="tabpanel">
			<view class="dv-panel dv-panel-bkcolor" v-for="(style,ii) in detail1StyleDefList" :key="ii"
			@click="onPanelClick(ii)" :id="'panel'+style.form.htmlobjId"
			:class="activeItem == style?'bk-active':''">
			<div class="dv-panel-button" v-if="param.ListPage.CheckBox==true">
			<checkbox-group>
			<label>
			<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
			</label>
			</checkbox-group>
			</div>
			</div>
			<div class="dv-panel-button" v-if="param.ListPage.Click_View==true">
			<a @click="onViewPageClick(style)"><i class="mobox-normal-right-arrow" /></a>
			</div>
			<div class="dv-panel-buticon" v-if="param.ListPage.ListItem_Button">
			<view class="btn-padding" v-for="(btn,key) in param.ListPage.ListItem_Button">
			<a @click="onBtnClick(btn,style)" :title="btn.ShowName" v-if="btn.Style=='img'">
			<i :class="btn.Img" />
			</a>
			<button type="default" @click="onBtnClick(btn,style)" class="btn-padding"
			v-else-if="btn.Style=='text'">{{btn.ShowName}}</button>
			</view>
			</div>
			<!-- HTML页面类型显示 -->
			<div class="dv-listHtml-Panel" v-if="ListHtml_Panel" v-html="ListHtml_Panel[ii]" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
			param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
			param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">

			</div>
			<div class="dv-panel-input" v-if="!ListHtml_Panel" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
			param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
			param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
			<div 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>
			<!-- 文本框/数字框 -->
			<view class="dv_input"
			v-if="(item.name=='Input' \|\| item.name=='InputNumber') && !item.disabled">
			<text v-if="item.setting.prefix" class="uni-icon"
			:class="[item.setting.prefix]" @change="onChange(item)"></text>
			<input class="uni-input" :class="item.disabled?'input-disabled':''"
			:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
			v-model="item.value" :disabled="item.disabled"
			:placeholder="item.placeholder"
			:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix \|\| item.setting.suffix?'87%':'96%'}"
			:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
			<text v-if="item.setting.suffix" class="uni-icon"
			:class="[item.setting.suffix]" @click="onChange(item)"></text>
			</view>
			<!-- 下拉框-单选 item.useDict?item.dict:item.selections-->
			<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
			:class="item.disabled?'input-disabled':''" v-model="item.value"
			:localdata="item.dict" @change="onChange(item)" :disabled="item.disabled"
			:clear="false"></uni-data-select>
			<!-- 多行文本 -->
			<view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
			<textarea class="uni-input" :value="item.value"
			:class="item.disabled?'input-disabled':''"
			:placeholder="item.placeholder" @blur="onModelValue(item)"
			style="height:60px;" :style="{'width':'96%'}"
			:disabled="item.disabled"></textarea>
			</view>
			<!-- 复选框 -->
			<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
			:class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
			:data-ischeck="item.value" :disabled="item.disabled"
			:style="{'margin-left':'10rpx'}">
			<label>
			<checkbox :value="item.value" :checked="item.value" />
			<text>{{item.label}}</text>
			</label>
			</checkbox-group>
			<!-- 单选框 -->
			<radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
			:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
			:style="{'margin-left':'10rpx'}" @change="onModelValue(item)">
			<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 v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
			:style="{'margin-left':'10rpx'}" />
			<!-- 日期时间 -->
			<view class="input-wrapper"
			v-if="(item.name=='TimePicker' \|\| item.name=='DatePicker') && !item.disabled">
			<picker mode="date" class="date_iput"
			:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
			:value="item.value" @change="onModelValue(item)">
			<view class="picker">{{item.value}}</view>
			</picker>
			</view>
			</view>
			<!-- 栅格布局 -->
			<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
			<uni-col v-for="(cols,key) in item.setting.colList"
			:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
			<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>
			<view class="dv_input"
			v-if="(cols.name=='Input' \|\| cols.name=='InputNumber') && !cols.disabled">
			<text v-if="cols.setting.prefix" class="uni-icon"
			:class="[cols.setting.prefix]"
			@change="onChange(cols)"></text>
			<input class="uni-input" :class="cols.disabled?'input-disabled':''"
			:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
			v-model="cols.value" :disabled="cols.disabled"
			:placeholder="cols.placeholder"
			:style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix \|\| cols.setting.suffix?'87%':'96%'}"
			:focus="focusMateria" @focus="ontap(cols)"
			@blur="onevent(cols)" />
			<text v-if="cols.setting.suffix" class="uni-icon"
			:class="[cols.setting.suffix]"
			@click="onChange(cols)"></text>
			</view>
			<!-- 下拉框-单选 cols.useDict?cols.dict:cols.selections-->
			<uni-data-select id="dv_select"
			v-if="cols.name=='Select' && !cols.disabled"
			:class="cols.disabled?'input-disabled':''" v-model="cols.value"
			:localdata="cols.dict" @change="onChange(cols)"
			:disabled="cols.disabled" :clear="false"></uni-data-select>
			<!-- 多行文本 -->
			<view class="input-wrapper"
			v-if="cols.name=='Textarea' && !cols.disabled">
			<textarea class="uni-input" :value="cols.value"
			:class="cols.disabled?'input-disabled':''"
			:placeholder="cols.placeholder" @blur="onModelValue(cols)"
			style="height:60px;" :style="{'width':'96%'}"
			:disabled="cols.disabled"></textarea>
			</view>
			<!-- 复选框 -->
			<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
			:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
			@change="onModelValue(cols)" :data-ischeck="cols.value"
			:style="{'margin-left':'10rpx'}">
			<label>
			<checkbox :value="cols.value" :checked="cols.value" />
			<text>{{cols.label}}</text>
			</label>
			</checkbox-group>
			<!-- 单选框 -->
			<radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
			:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
			:style="{'margin-left':'10rpx'}" @change="onModelValue(cols)">
			<label v-for="(cols2) in cols.selections" :key="cols2.value">
			<radio :value="cols2.value"
			:checked="cols2.value === cols.value" />
			<text>{{cols2.label}}</text>
			</label>
			</radio-group>
			<!-- Switch开关 -->
			<switch v-if="cols.name=='Switch'"
			:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
			v-model="cols.value" @change="onModelValue(cols)"
			:style="{'margin-left':'10rpx'}" />
			<!-- 日期时间 -->
			<view class="input-wrapper"
			v-if="(cols.name=='TimePicker' \|\| cols.name=='DatePicker') && !cols.disabled">
			<picker mode="date" class="date_iput"
			:class="cols.disabled?'input-disabled':''"
			:disabled="item.disabled" :value="cols.value"
			@change="onModelValue(cols)">
			<view class="picker">{{cols.value}}</view>
			</picker>
			</view>

			</view>
			</uni-col>
			</uni-row>
			</div>
			</div>
			<div class="dv-panel-button" v-if="param.ListPage.Click_View==true">
			<a @click="onViewPageClick(style)"><i class="mobox-normal-right-arrow" /></a>
			</div>
			<div class="dv-panel-buticon" v-if="param.ListPage.ListItem_Button">
			<view class="btn-padding" v-for="(btn,key) in param.ListPage.ListItem_Button">
			<a @click="onBtnClick(btn,style)" :title="btn.ShowName" v-if="btn.Style=='img'">
			<i :class="btn.Img" />
			</a>
			<button type="default" @click="onBtnClick(btn,style)" class="btn-padding"
			v-else-if="btn.Style=='text'">{{btn.ShowName}}</button>
			</view>
			</div>
			</view>
			</view>
			</view>
			</scroll-view>
			</scroll-view>
			</view>
			</view>

			<view class="view-floor">
			<button type="default" @click="cancel" class="btn_cancel"
			:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">关闭</button>
			<button type="default" @click="Refresh" class="btn_refresh"
			:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">刷新</button>
			:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("close")}}</button>
			<button type="default" @click="Refresh" class="btn_refresh" :class="refreshing?'btn_disabled':''"
			:disabled="refreshing"
			:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("refresh")}}</button>
			<view class="uni-padding-wrap" v-if="param.ListPage.Page_Button.length>0">
			<view class="uni-btn-v">
			<a @tap="actionSheetTap">
			@@ -218,6 +229,17 @@
			<script>
			import Base64 from '../../components/js-base64/base64.js'
			import classUtils from "@/js/utils.js"
			import {
			appGetInfo,
			dictGetInfo
			} from "@/api/mobox.js"
			import {
			getUIStyleInfo,
			runCustomEvent,
			dataObjQuery,
			dataObjDel
			} from "@/api/data.js"

			export default {
			modules: {
			Base64,
			@@ -255,11 +277,10 @@
			},
			detail1_styledef: {},
			detail1StyleDefList: [],
			detail2_styledef: {},
			detail2StyleDefList: [],
			items: [],
			active_id: '',
			activelist: [],
			//activelist: [],
			activeItem: {},
			where: '',
			wheres: '',
			orderby: '',
			@@ -281,6 +302,7 @@
			name: ""
			}
			},
			refreshing: false
			};
			},
			async onLoad(options) {
			@@ -290,7 +312,39 @@
			}); //设置顶部标题
			this.$data.title = options.titlename;
			this.$data.param = JSON.parse(options.param);
			this.initial();


			this.styledef = {};
			this.head_styledef = {
			form: {
			items: []
			}
			};
			this.detail1_styledef = {};
			this.detail1StyleDefList = [];
			this.ListHtml_Panel = "";
			this.ListPageHtml_Show = {
			name: "",
			event: {
			id: "",
			name: ""
			}
			};
			this.items = [];
			this.active_id = '';
			this.activeItem = {};
			//this.activelist = [];

			if (this.param.ListPage.ListItem_UIDef?.ui_type == "HTML页面") {
			// HTML页面
			//获取数据类的HTML页面
			await this.Html_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id, options
			.paramValue);
			} else {
			await this.Detail1_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);

			await this.initial(options.paramValue);
			}
			// this.isFilter=true;
			// if(this.param.ShowFilter)
			// this.isFilter=false;
			@@ -320,43 +374,62 @@
			// this.focusMateria=true;
			},
			methods: {
			//初始化
			async initial() {
			this.styledef = {};
			this.head_styledef = {
			form: {
			items: []
			}
			};
			this.detail1_styledef = {};
			this.detail1StyleDefList = [];
			this.detail2_styledef = {};
			this.detail2StyleDefList = [];
			this.items = [];
			this.active_id = '';
			this.activelist = [];
			this.ListHtml_Panel = "";
			this.ListPageHtml_Show = {
			name: "",
			event: {
			id: "",
			name: ""
			}
			};
			//
			setData: function(obj) {
			let that = this;
			let keys = [];
			let val, data;

			Object.keys(obj).forEach(function(key) {
			keys = key.split(".");
			val = obj[key];
			data = that.$data;
			keys.forEach(function(key2, index) {
			if (index + 1 == keys.length) {
			that.$set(data, key2, val);
			} else {
			if (!data[key2]) {
			that.$set(data, key2, {});
			}
			}
			data = data[key2];
			});
			});
			},

			//初始化
			async initial(paramValue) {
			this.refreshing = true
			this.isFilter = true;
			if (this.param.ShowFilter)
			this.isFilter = false;
			//获取数据类的自定义表单参数
			if (this.param.Query_Panel) {
			this.Head_UIStyleGetInfo(this.param.DataCls.id, this.param.Query_Panel.id);
			}
			if (this.param.ListPage.ListItem_UIDef?.ui_type == "HTML页面") {
			// HTML页面
			//获取数据类的HTML页面
			await this.Html_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);
			} else {
			await this.Detail1_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);
			await this.Head_UIStyleGetInfo(this.param.DataCls.id, this.param.Query_Panel.id);
			//传入参数值
			if (paramValue) {
			const attrs = paramValue.attrs \|\| [];
			(this.$data.head_styledef?.form?.items \|\| []).forEach(async (ele, index) => {
			if (ele.name != "Layout") {
			attrs.forEach(async (ele2, index2) => {
			if (ele.fieldId == ele2.name) {
			ele.value = ele2.value;
			}
			});
			} else {
			ele.setting.colList.forEach(async (col) => {
			if (col) {
			attrs.forEach(async (ele2,
			index2) => {
			if (col.fieldId == ele2.name) {
			col.value = ele2.value;
			}
			});
			}
			});
			}
			})
			}
			}
			this.orderby = this.param.Order ? this.param.Order : 'T_CREATE Desc';
			if (this.param.Query_Event) {
			@@ -366,8 +439,11 @@
			this.pageindex = 1;
			this.page_size = 3;
			this.query_id = "";
			this.detail1StyleDefList = [];
			await this.loadDataGetList();
			}
			this.refreshing = false

			},
			//滚动到底部后懒加载数据
			async scrolltolower(e) {
			@@ -389,26 +465,26 @@
			this.old.scrollTop = e.detail.scrollTop
			},
			async Head_UIStyleGetInfo(class_id, style_id) { //获取自定义表单样式
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			// console.log(dataInfo);
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var styledef = "";
			if (ret.result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			.style_def);
			}
			$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
			// this.form = this.head_styledef.form.model;
			// console.log($this.$data.head_styledef);
			try {
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			// console.log(dataInfo);
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			$this.$data.head_styledef = result.style_def ? JSON.parse(styledef) : {};
			// this.form = this.head_styledef.form.model;
			// console.log($this.$data.head_styledef);
			if ($this.head_styledef.form?.items) {
			$this.head_styledef.form.items.forEach(async (ele, index) => {
			console.log(ele.useDict);
			if (ele.useDict == true) { //判断useDict是否使用字典
			@@ -416,106 +492,83 @@
			}
			});

			} else {
			uni.showModal({
			title: this.translateSys("error") + "1",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}).catch(ex => {
			} catch (ex) {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "1.1",
			content: ex.errMsg,
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});
			}

			},
			async Detail1_UIstyleGetInfo(class_id, style_id) { //获取自定义表单样式
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			console.log(ret);
			if (ret.err_code == 0) {
			var styledef = "";
			if (ret.result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			.style_def);
			}
			$this.$data.detail1_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
			$this.$data.detail1_styledef.SelBut_Checked = false;
			// console.log($this.$data.detail1_styledef);
			// $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
			// var aa = JSON.stringify(this.detail1_styledef);
			// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
			// console.log($this.$data.detail1StyleDefList);

			} else {
			uni.showModal({
			title: this.translateSys("error") + "2",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			try {
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			// console.log(dataInfo);
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			}).catch(ex => {
			$this.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
			$this.$data.detail1_styledef.SelBut_Checked = false;
			} catch (ex) {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "2.1",
			content: ex.errMsg,
			title: this.translateSys("error") + "1.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});
			}


			},
			async Html_UIstyleGetInfo(class_id, style_id) { //获取自定义表单样式
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var styledef = "";
			if (ret.result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			.style_def);
			}
			$this.ListPageHtml_Show = ret.result.style_def ? JSON.parse(styledef) : {};
			// console.log($this.ListPageHtml_Show);
			} else {
			uni.showModal({
			title: this.translateSys("error") + "10",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			async Html_UIstyleGetInfo(class_id, style_id, paramValue) { //获取自定义表单样式
			try {
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			// console.log(dataInfo);
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			}).catch(ex => {
			// console.log(styledef);
			$this.ListPageHtml_Show = result.style_def ? JSON.parse(styledef) : {};
			// console.log($this.ListPageHtml_Show);

			$this.initial(paramValue);
			} catch (ex) {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "10.1",
			content: ex.errMsg,
			title: this.translateSys("error") + "1.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});

			}
			},
			async DictGetInfo(dict, index, type) { //Mobox3得到得到字典信息字典项列表
			this.data = [];
			@@ -524,45 +577,31 @@
			dict_id: dict.id,
			dict_name: dict.name
			};
			// console.log(dataInfo);
			this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => {
			console.log(success);
			if (success.err_code == 0) {
			if (type == 'mast') {
			var list = [];
			var itemName = '';
			success.result.dict_item_list.forEach((item) => {
			if (item.is_default == '1')
			itemName = item.name;
			list.push({
			text: item.value,
			value: item.name,
			});
			try {
			const result = await dictGetInfo(dataInfo)
			if (type == 'mast') {
			var list = [];
			var itemName = '';
			(result.dict_item_list \|\| []).forEach((item) => {
			if (item.is_default == '1')
			itemName = item.name;
			list.push({
			text: item.name,
			value: item.id,
			});
			//有默认值，显示默认值
			if (itemName) {
			$this.head_styledef.form.items[index].value = itemName;
			var attr = $this.head_styledef.form.items[index].fieldId;
			$this.head_styledef.form.model[attr] = itemName;
			}
			$this.head_styledef.form.items[index].dict = list;
			var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
			$this.head_styledef = [];
			$this.head_styledef = head_styledef;
			} else {
			// $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result;
			// this.$store.commit("subClassAttrList", $this.$data.subClassAttrList);
			}

			} else {
			uni.showModal({
			title: this.translateSys("error") + "3.1",
			content: success.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			//有默认值，显示默认值
			if (itemName) {
			$this.head_styledef.form.items[index].value = itemName;
			var attr = $this.head_styledef.form.items[index].fieldId;
			$this.head_styledef.form.model[attr] = itemName;
			}
			$this.head_styledef.form.items[index].dict = list;
			var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
			$this.head_styledef = [];
			$this.head_styledef = head_styledef;
			}
			}).catch(ex => {
			} catch (ex) {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "3",
			@@ -570,7 +609,7 @@
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});
			}
			},

			// 执行查询事件
			@@ -584,87 +623,73 @@
			class_id: clsid,
			event_id: eventid,
			};
			this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var result = ret.result;
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info == 'string' ? result
			.err_info : result.err_info.join('<br/>') : '';
			if (result.ret == 801) uni.showModal({
			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"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			var result = await runCustomEvent(dataInfo)
			// console.log(result);

			if (result.result_type == 0 && result.action) {
			result.action.forEach(item => {
			if (item.action_type == "set_query_condition") {
			var value = item.value;
			$this.wheres = value.condition;
			$this.orderby = value.order ? value.order : $this
			.orderby;
			$this.pageindex = 1;
			$this.query_id = "";
			$this.detail1StyleDefList = [];
			$this.loadDataGetList();
			}

			});
			} else {
			// this.detail2StyleDefList=[];
			if (result.info) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}
			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);
			}

			} else {
			uni.showModal({
			title: this.translateSys("error") + "4",
			content: ret.err_msg,
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "4.1",
			content: ex.errMsg,
			} 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"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});

			if (result.result_type == 0 && result.action) {
			result.action.forEach(item => {
			if (item.action_type == "set_query_condition") {
			var value = item.value;
			$this.wheres = value.condition;
			$this.orderby = value.order ? value.order : $this
			.orderby;
			$this.pageindex = 1;
			$this.query_id = "";
			$this.detail1StyleDefList = [];
			$this.loadDataGetList();
			}

			});
			} else {
			if (result.info) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}
			}
			}
			} catch (ex) {
			var tip = typeof ex == "string" ? ex : ex.message;
			uni.showModal({
			title: this.translateSys("error") + "4.2",
			content: this.translate("execute_query_event_failed") + this.translateSys("comma") +
			content: this.translate("execute_query_event_failed") + this.translateSys(
			"comma") +
			tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			@@ -698,120 +723,133 @@
			page: this.pageindex,
			query_id: this.query_id,
			};
			this.$store.dispatch('dataObjQuery', dataInfo).then(ret => {
			console.log(ret);
			dataObjQuery(dataInfo).then(result => {
			console.log(result);
			uni.hideLoading();
			if (ret.err_code == 0) {
			// var list=[];
			$this.query_id = '';
			if (ret.result) {
			$this.page_count = ret.result.page_count;
			if (ret.result.page_count > 1) $this.query_id = ret.result.query_id;
			if ($this.ListPageHtml_Show.event.id) {
			ret.result.obj_list.forEach((obj) => {
			var info = {
			id: obj.id,
			};
			obj.attr_list.forEach((attr) => {
			info[attr.name] = attr.value;
			});
			var detailStyle = {
			SelBut_Checked: false,
			form: {},
			info: info
			};
			detailStyle.form.htmlobjId = obj.id ? obj.id.replace(/-/g, '')
			.replace('{', '').replace('}', '') : 'null';
			detailStyle.form.objId = obj.id;
			detailStyle.form.attrs = obj.attr_list;
			$this.detail1StyleDefList.push(detailStyle);
			$this.activelist.push({
			active: false
			});

			// var list=[];
			$this.query_id = '';
			if (result) {
			$this.page_count = result.page_count;
			if (result.page_count > 1) $this.query_id = result.query_id;
			// console.log($this.ListPageHtml_Show.event);
			if ($this.ListPageHtml_Show.event.id) {
			const detail1StyleDefList = $this.detail1StyleDefList
			result.obj_list.forEach((obj) => {
			var info = {
			id: obj.id,
			};
			obj.attr_list.forEach((attr) => {
			info[attr.name] = attr.value;
			});
			// console.log(this.detail1StyleDefList);
			var jsonlist = [];
			$this.detail1StyleDefList.forEach(attr => {
			jsonlist.push({
			id: attr.info.id,
			attrs: Object.keys(attr.info).map((a) => ({
			attr: a,
			value: attr.info[a] \|\| "",
			}))
			});
			var detailStyle = {
			SelBut_Checked: false,
			form: {},
			info: info
			};
			detailStyle.form.htmlobjId = obj.id ? obj.id.replace(
			/-/g, '')
			.replace('{', '').replace('}', '') : 'null';
			detailStyle.form.objId = obj.id;
			detailStyle.form.attrs = obj.attr_list;
			detail1StyleDefList.push(detailStyle);
			// $this.activelist.push({
			// active: false
			// });
			});
			// console.log(this.detail1StyleDefList);

			$this.setData({
			detail1StyleDefList: detail1StyleDefList
			})

			var jsonlist = [];
			$this.detail1StyleDefList.forEach(attr => {
			jsonlist.push({
			id: attr.info.id,
			attrs: Object.keys(attr.info).map((a) => ({
			attr: a,
			value: attr.info[a] \|\| "",
			}))
			});
			// console.log(jsonlist);
			var data_json = Base64.encode(JSON.stringify(jsonlist));
			var eventid = $this.ListPageHtml_Show.event.id;
			if (!$this.ListPageHtml_Show.event.id.includes('{'))
			eventid = '{' + $this.ListPageHtml_Show.event.id + '}';
			//HTML页面事件
			$this.runCustomEvent({
			ed_type: 0,
			start_transaction: true,
			class_id: $this.param.DataCls.id,
			event_id: eventid,
			data_json,
			});
			} else {
			// $this.detail1StyleDefList=[];
			ret.result.obj_list.forEach((obj) => {
			var styleStr = JSON.stringify($this.detail1_styledef);
			var detailStyle = JSON.parse(styleStr);
			// var info ={
			// S_ID:obj.id,
			// };
			obj.attr_list.forEach((attr) => {
			// info[attr.name]=attr.value;
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.name) ele
			.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(
			});
			// console.log(jsonlist);
			var data_json = Base64.encode(JSON.stringify(jsonlist));
			var eventid = $this.ListPageHtml_Show.event.id;
			if (!$this.ListPageHtml_Show.event.id.includes('{'))
			eventid = '{' + $this.ListPageHtml_Show.event.id + '}';
			//HTML页面事件
			$this.runCustomEvent({
			ed_type: 0,
			start_transaction: true,
			class_id: $this.param.DataCls.id,
			event_id: eventid,
			data_json,
			});
			} else {
			// $this.detail1StyleDefList=[];
			const detail1StyleDefList = []
			result.obj_list.forEach((obj) => {
			var styleStr = JSON.stringify($this.detail1_styledef);
			var detailStyle = JSON.parse(styleStr);
			// var info ={
			// S_ID:obj.id,
			// };
			obj.attr_list.forEach((attr) => {
			// info[attr.name]=attr.value;
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr
			.name) ele
			.value = attr.value;
			} else if (ele.name ==
			'Layout') {
			ele.setting.colList
			.forEach(
			col => {
			if (col) {
			if (col.fieldId ==
			attr.name) col
			.value = attr
			if (col
			.fieldId ==
			attr
			.name)
			col
			.value =
			attr
			.value;
			}
			});
			}
			});
			}
			});

			detailStyle.form.htmlobjId = obj.id ? obj.id.replace(/-/g, '')
			.replace('{', '').replace('}', '') : 'null';
			detailStyle.form.objId = obj.id;
			detailStyle.form.attrs = obj.attr_list;
			$this.detail1StyleDefList.push(detailStyle);
			$this.activelist.push({
			active: false
			});
			//list.push(info);
			});
			}

			// 解决view层不同步的问题
			// $this.scrollTop = $this.old.scrollTop;
			$this.isScroll = false;
			setTimeout(function() {
			$this.isScroll = true;
			}, 1000);
			// console.log($this.detail1StyleDefList);
			detailStyle.form.htmlobjId = obj.id ? obj.id.replace(
			/-/g, '')
			.replace('{', '').replace('}', '') : 'null';
			detailStyle.form.objId = obj.id;
			detailStyle.form.attrs = obj.attr_list;
			detail1StyleDefList.push(detailStyle);
			// $this.activelist.push({
			// active: false
			// });
			//list.push(info);
			});
			$this.setData({
			detail1StyleDefList: detail1StyleDefList
			})
			}



			} else {
			uni.showModal({
			title: this.translateSys("error") + "5",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			// 解决view层不同步的问题
			// $this.scrollTop = $this.old.scrollTop;
			$this.isScroll = false;
			setTimeout(function() {
			$this.isScroll = true;
			}, 1000);
			// console.log($this.detail1StyleDefList);
			}




			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			@@ -847,7 +885,8 @@
			this.styledef = style;
			var $this = this;
			uni.navigateTo({
			url: '../modal/3200_view?param=' + JSON.stringify(this.param) + "&titlename=" +
			url: '../modal/3200_view?param=' + JSON.stringify(this.param) +
			"&titlename=" +
			this.title + "&style=" + JSON.stringify(style),
			events: {
			// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
			@@ -864,7 +903,8 @@
			obj_attr[attr.name] = attr.value;
			});
			// console.log(obj_attr);
			var input_param = Base64.encode(JSON.stringify(obj_attr));
			var input_param = Base64.encode(JSON.stringify(
			obj_attr));
			$this.runCustomEvent({
			ed_type: 0,
			start_transaction: true,
			@@ -880,7 +920,8 @@
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			}
			}
			@@ -923,7 +964,8 @@
			if (btn.Prompt) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: btn.PromptContent \|\| this.translate("are_you_sure"),
			content: btn.PromptContent \|\| this.translate(
			"are_you_sure"),
			success: function(res) {
			if (res.confirm) {
			that.onButtonClicked(btn);
			@@ -950,9 +992,24 @@
			if (btn.FunCode == "Add" \|\| btn.FunCode == "Modify") {
			if (btn.Edit_dlg.Model == "small") {
			this.showAddSmallDialog(btn, style, enviroment);
			} else {
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translateSys("unrealized"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			} else if (btn.FunCode == "Delete") {
			this.DeleteObj(btn, style, enviroment);
			// } else if (btn.FunCode == "TriggerEvent") {
			// this.triggerEvent(btn, style, enviroment);
			} else if (btn.FunCode == "TriggerEvent") {
			this.TriggerEvent(btn, style, enviroment);
			// } else if (btn.FunCode == "TriggerEvent") {
			// this.triggerEvent(btn, style, enviroment);
			} else if (btn.FunCode == "RelatedFunction") {
			this.RelatedFunction(btn, style, enviroment);
			// } else if (btn.FunCode == "TriggerEvent") {
			// this.triggerEvent(btn, style, enviroment);
			} else {
			@@ -984,7 +1041,8 @@
			};
			var $this = this;
			uni.navigateTo({
			url: '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg.Name +
			url: '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn
			.Edit_dlg.Name +
			"&type=addDataObj",
			events: {
			// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
			@@ -1005,7 +1063,8 @@
			success: function(res) {
			if (res.confirm) {
			var objID = style.form.objId;
			if (!style.form.objId.includes('{')) objID = '{' + style.form.objId + '}';
			if (!style.form.objId.includes('{')) objID = '{' + style.form
			.objId + '}';

			var dataInfo = {
			class_id: btn.Cls_ID,
			@@ -1013,40 +1072,37 @@
			obj_id: objID
			};
			// console.log(dataInfo);
			$this.$store.dispatch('dataObjDel', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			//执行后处理事件
			$this.AfterProcess_Event(btn.clsId, btm.AfterProcess_Event,
			enviroment);
			//清除当前列表数据
			$this.detail1StyleDefList.forEach((ele, index) => {
			if (ele.form.objId == objID) {
			$this.detail1StyleDefList.splice(index, 1);
			}
			});
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate("delete_success"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});

			} else {
			uni.showModal({
			title: this.translateSys("error") + "6.1",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			dataObjDel(dataInfo).then(ret => {
			//执行后处理事件
			$this.AfterProcess_Event(btn.clsId, btm
			.AfterProcess_Event,
			enviroment);
			//清除当前列表数据
			$this.detail1StyleDefList.forEach((ele,
			index) => {
			if (ele.form.objId == objID) {
			$this.detail1StyleDefList
			.splice(index, 1);
			}
			});
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			"delete_success"),
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			});
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "6",
			title: this.translateSys("error") +
			"6",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			});
			} else if (res.cancel) {
			@@ -1055,6 +1111,192 @@
			}
			});

			},
			//执行事件
			async TriggerEvent(btn, style, enviroment) { //执行触发事件
			try {
			let obj_attr = {
			S_ID: this.styledef.form.objId
			};
			style.form.attrs.forEach((attr) => {
			obj_attr[attr.name] = attr.value;
			});

			if (!this.ListPageHtml_Show.event.id) {
			//判断没有HTML页面事件
			this.head_styledef.form.items.forEach(async (ele, index) => {
			if (ele.name != "Layout") {
			if (!obj_attr[ele.fieldId]) {
			obj_attr[ele.fieldId] = ele.value;
			}
			} else if (ele.name == "Layout") {
			ele.setting.colList.forEach(async (col, key) => {
			if (col) {
			if (!obj_attr[col.fieldId]) {
			obj_attr[col.fieldId] = col
			.value;
			}
			}
			});
			}
			});
			}

			const dataInfo = {
			ed_type: 0,
			start_transaction: true,
			class_id: btn.clsId,
			event_id: btn.event.id,
			data_obj_id: this.styledef.form.objId,
			obj_attr: obj_attr,
			}
			var result = await runCustomEvent(dataInfo)
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info ==
			'string' ?
			result
			.err_info : result.err_info.join('<br/>') : '';
			if (result.ret == 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"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});

			}
			} catch (ex) {
			var tip = typeof ex == "string" ? ex : ex.message;
			uni.showModal({
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			this.showError(ex);
			}
			},
			//跳转
			async RelatedFunction(btn, style, enviroment) {

			try {
			const defCode = btn.Related_Function?.Def_Code
			var $this = this;
			if (
			defCode == "3018" \|\|
			defCode == "3037" \|\|
			defCode == "3200" \|\|
			defCode == "3201" \|\|
			defCode == "5600" \|\|
			defCode == "5601" \|\|
			defCode == "5602"
			) {

			let name = defCode
			if (defCode == "3018" \|\| defCode == "3037")
			name = defCode + "_2"
			var json = {
			app_id: [btn.Related_Function.ID],
			};
			console.log("RelatedFunction2", json);
			const result = await appGetInfo(json)
			if ((result \|\| []).length > 0) {
			var app = result[0];
			var param = "";
			var appName = app.list_name \|\| app.name
			.Name;
			var paramStr = app.param
			if (paramStr) {
			//mobox2的param是json字符串
			param = paramStr.replace(/\\/g, "");
			//mobox3的param是base64字符串
			if (!paramStr.includes('"')) param = Base64.decode(
			paramStr);
			}
			if (!param) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			'tip_no_app_param'),
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			});
			return;
			}

			uni.navigateTo({
			url: '../modal/' + name + '?param=' +
			param + "&titlename=" +
			appName +
			"&type=relatedFunction&paramValue=" +
			JSON.stringify(style
			.form),
			events: {
			relatedFunction: function(data) {
			console.log(data);
			$this.Refresh();
			},
			}
			});
			} else {
			uni.showModal({
			title: this.translateSys("error"),
			content: this.translate(
			"function_not_exist"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}

			} else {
			uni.showModal({
			title: this.translateSys("error"),
			content: this.translate("cannot_related_function"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});

			}
			} catch (ex) {
			console.log(ex);
			let exStr = JSON.stringify(ex)
			if (exStr == "{}")
			exStr = ex
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
			uni.showModal({
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return undefined
			}
			},
			//执行后处理事件
			async AfterProcess_Event(clsId, afterProcess_Event, enviroment) {
			@@ -1094,8 +1336,10 @@
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
			var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickEvent = item.bind.onSuffixClickEvent; //后图标点击回调
			var onSuffixClickCallbackEvent = item.bind
			.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickEvent = item.bind
			.onSuffixClickEvent; //后图标点击回调
			var isflag = false;

			if (onChangeEvent.id) { //内容变化后事件
			@@ -1103,7 +1347,8 @@
			} else {
			$this.where = '';
			if (item.value)
			$this.where = item.fieldId + " like '%" + item.value + "%'";
			$this.where = item.fieldId + " like '%" + item
			.value + "%'";
			$this.query_id = '';
			$this.pageindex = 1;
			$this.detail1StyleDefList = [];
			@@ -1134,7 +1379,8 @@
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
			var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickCallbackEvent = item.bind
			.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickEvent = item.bind.onSuffixClickEvent; //后图标点击回调
			var isflag = false;

			@@ -1191,82 +1437,114 @@
			global_attr: '',
			input_param: input_param,
			};
			this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var result = ret.result;
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info == 'string' ? result
			.err_info : result.err_info.join('<br/>') : '';
			if (result.ret == 801) uni.showModal({
			title: this.translateSys("tip"),
			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")
			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"),
			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"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			});

			if (result.result_type == 0 && result.action) {
			result.action.forEach(item => {
			if (item.action_type == "set_dlg_attr") {
			// value = {"attr":"xxx", "value":"xxx"}
			var data = item.value;
			$this.$data.head_styledef.form.items.forEach(async (
			ele, index) => {
			data.forEach(async (ele2, index) => {
			if (ele.fieldId == ele2
			.attr) {
			ele.value = ele2
			.value;
			}
			if (result.result_type == 0 && result
			.action) {
			result.action.forEach(item => {
			if (item.action_type ==
			"set_dlg_attr") {
			// value = {"attr":"xxx", "value":"xxx"}
			var data = item.value;
			$this.$data
			.head_styledef.form
			.items
			.forEach(
			async (
			ele,
			index
			) => {
			data.forEach(
			async (ele2,
			index
			) => {
			if (ele
			.fieldId ==
			ele2
			.attr
			) {
			ele.value =
			ele2
			.value;
			}
			});
			});
			});
			}
			});
			} else {
			// this.detail2StyleDefList=[];
			if (result.info) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			});
			} else {
			if (result.info) {
			uni.showModal({
			title: this
			.translateSys(
			"tip"),
			content: result.info,
			showCancel: false,
			confirmText: this
			.translateSys(
			"cancel")
			});
			}
			}

			} else {
			uni.showModal({
			title: this.translateSys("error") + "8",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}


			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "8.1",
			title: this.translateSys("error") +
			"8.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			});
			}
			@@ -1274,9 +1552,12 @@
			var tip = typeof ex == "string" ? ex : ex.message;
			uni.showModal({
			title: this.translateSys("error") + "8.2",
			content: this.translate('execute_after_change_event_failed') + this.translateSys(
			content: this.translate(
			'execute_after_change_event_failed') + this
			.translateSys(
			"comma") +
			this.translate('reason') + this.translateSys("colon") + tip,
			this.translate('reason') + this.translateSys(
			"colon") + tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			@@ -1286,123 +1567,184 @@
			//点中表单
			onPanelClick(value) { //点击面板高亮显示
			// console.log(value);
			this.activelist.forEach(ele => {
			ele.active = false;
			});
			this.activelist[value].active = true;
			this.setData({
			activeItem: this.detail1StyleDefList[value]
			})
			// this.activelist.forEach(ele => {
			// ele.active = false;
			// });
			// this.activelist[value].active = true;
			},

			//事件处理
			async runCustomEvent(dataInfo) {
			try {
			var $this = this;
			this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
			console.log(ret);
			if (ret.err_code == 0) {
			var result = ret.result;
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info == 'string' ? result
			.err_info : result.err_info.join('<br/>') : '';
			if (result.ret == 801) uni.showModal({
			title: this.translateSys("tip"),
			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")
			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"),
			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"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			});

			if (result.result_type == 0 && result.action) {
			result.action.forEach(item => {
			if (item.action_type == "goback_to_pre_page") { //返回上一页
			var value = item.value;
			uni.navigateBack({
			delta: 1, //返回层数，2则上上页
			});
			} else if (item.action_type == "hidden_button") { //隐藏按钮
			var value = item.value;
			value.forEach(btn => {
			var index = $this.param.ListPage.Page_Button
			.findIndex(button => button.ShowName ==
			btn)
			if (index > -1)
			$this.param.ListPage.Page_Button.splice(
			index, 1)
			})
			// } else if(item.action_type == "refresh_cur_row"){ //
			// var value = item.value;
			} else if (item.action_type == "set_panel_html") { //显示Html页面
			// var value = item.value;
			$this.ListHtml_Panel = item.value;
			// $this.detail1StyleDefList.forEach((ele,index)=>{
			// ele.ListHtml_Panel = item.value[index];
			// });
			if (result.result_type == 0 && result
			.action) {
			result.action.forEach(item => {
			if (item.action_type ==
			"goback_to_pre_page"
			) { //返回上一页
			var value = item.value;
			uni.navigateBack({
			delta: 1, //返回层数，2则上上页
			});
			} else if (item
			.action_type ==
			"hidden_button"
			) { //隐藏按钮
			var value = item.value;
			value.forEach(btn => {
			var index =
			$this
			.param
			.ListPage
			.Page_Button
			.findIndex(
			button =>
			button
			.ShowName ==
			btn
			)
			if (index >
			-1)
			$this
			.param
			.ListPage
			.Page_Button
			.splice(
			index,
			1)
			})
			// } else if(item.action_type == "refresh_cur_row"){ //
			// var value = item.value;
			} else if (item
			.action_type ==
			"set_panel_html"
			) { //显示Html页面
			// var value = item.value;
			$this.ListHtml_Panel =
			item.value;
			// $this.detail1StyleDefList.forEach((ele,index)=>{
			// ele.ListHtml_Panel = item.value[index];
			// });

			} else {
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translateSys(
			"quotation_mark_left") + item
			.action_type + this.translateSys(
			"quotation_mark_right") + this
			.translate(
			"tip_action_unprocessed"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			});
			} else {
			// this.detail2StyleDefList=[];
			if (result.info) {
			} else {
			uni.showModal({
			title: this.translateSys("tip"),
			content: result.info,
			title: this
			.translateSys(
			"tip"
			),
			content: this
			.translateSys(
			"quotation_mark_left"
			) +
			item
			.action_type +
			this
			.translateSys(
			"quotation_mark_right"
			) +
			this
			.translate(
			"tip_action_unprocessed"
			),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this
			.translateSys(
			"cancel"
			)
			});
			}
			});
			} else {
			if (result.info) {
			uni.showModal({
			title: this
			.translateSys(
			"tip"),
			content: result.info,
			showCancel: false,
			confirmText: this
			.translateSys(
			"cancel")
			});
			}
			}

			} else {
			uni.showModal({
			title: this.translateSys("error") + "9",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}


			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "9.1",
			title: this.translateSys("error") +
			"9.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			});
			} catch (ex) {
			var tip = typeof ex == "string" ? ex : ex.message;
			uni.showModal({
			title: this.translateSys("error") + "9.2",
			content: this.translate('execute_event_failed') + this.translateSys(
			content: this.translate('execute_event_failed') +
			this.translateSys(
			"comma") +
			this.translate('reason') + this.translateSys("colon") + tip,
			this.translate('reason') + this.translateSys(
			"colon") + tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			@@ -1442,42 +1784,77 @@
			toWhereBase64String(list) {
			if (typeof list == 'string') list = [list]
			var sql = []
			var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
			var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=',
			'>', ' like'
			]
			list.forEach(ls => {
			var where = ls.trim()
			if (where.startsWith('(') && where.endsWith(')')) where = where.replace(/^\(/, '').replace(
			/\)$/, '')
			if (where.startsWith('(') && where.endsWith(')'))
			where = where.replace(
			/^\(/,
			'').replace(
			/\)$/, '')
			if (where.toLowerCase().includes(' and ')) {
			// 二级and放在第一级数组中
			where.split(/ and /i).forEach(li => {
			var l = li.trim()
			if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(
			if (l.startsWith('(') && l.endsWith(
			')')) l = l.replace(
			/^\(/,
			'').replace(
			/\)$/, '')
			var sep = ''
			for (var i = 0; i < seps.length; i++) {
			if (l.toLowerCase().includes(seps[i])) {
			if (l.toLowerCase().includes(seps[
			i])) {
			sep = seps[i]
			break
			}
			}
			if (sep) {
			var values = l.split(new RegExp(sep, 'i'))
			var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
			var values = l.split(new RegExp(
			sep, 'i'))
			var field = values[0]?.trim()
			.replace(/^\[/, '')
			.replace(
			/\]$/, '')
			var value = ''
			var op = sep.trim()

			if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes(
			'select ') && values[1]?.toLowerCase().includes(' from ')) {
			value = l.replace(field, '').replace(/^\s(in\|not in)\s/i, '').trim()
			if (value.startsWith('(') && value.endsWith(')')) value = value
			.replace(/^$/, '').replace(/$$/, '').trim()
			if ([' in', ' not in'].includes(
			sep) && values[1]
			?.toLowerCase().includes(
			'select ') && values[1]
			?.toLowerCase()
			.includes(
			' from ')) {
			value = l.replace(field, '')
			.replace(
			/^\s(in\|not in)\s/i,
			'').trim()
			if (value.startsWith('(') &&
			value.endsWith(')'))
			value = value
			.replace(/^\(/, '')
			.replace(/\)$/, '').trim()
			} else {
			value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
			value = values[1]?.trim()
			.replace(/^\'/, '')
			.replace(
			/\'$/, '')

			if (['in', 'not in'].includes(op)) {
			value = value.replace(/^$/, '').replace(/$$/, '')
			value = value.split(',').map(v => v.trim().replace(/^\'/, '')
			.replace(/\'$/, ''))
			if (['in', 'not in'].includes(
			op)) {
			value = value.replace(
			/^\(/, '').replace(
			/\)$/,
			'')
			value = value.split(',')
			.map(v => v.trim()
			.replace(
			/^\'/, '')
			.replace(/\'$/, '')
			)
			}
			}
			sql.push([{
			@@ -1492,33 +1869,63 @@
			var s = []
			where.split(/ or /i).forEach(li => {
			var l = li.trim()
			if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(
			if (l.startsWith('(') && l.endsWith(
			')')) l = l.replace(
			/^\(/,
			'').replace(
			/\)$/, '')
			var sep = ''
			for (var i = 0; i < seps.length; i++) {
			if (l.toLowerCase().includes(seps[i])) {
			if (l.toLowerCase().includes(seps[
			i])) {
			sep = seps[i]
			break
			}
			}
			if (sep) {
			var values = l.split(new RegExp(sep, 'i'))
			var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
			var values = l.split(new RegExp(
			sep, 'i'))
			var field = values[0]?.trim()
			.replace(/^\[/, '')
			.replace(
			/\]$/, '')
			var value = ''
			var op = sep.trim()

			if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes(
			'select ') && values[1]?.toLowerCase().includes(' from ')) {
			value = l.replace(field, '').replace(/^\s(in\|not in)\s/i, '').trim()
			if (value.startsWith('(') && value.endsWith(')')) value = value
			.replace(/^$/, '').replace(/$$/, '').trim()
			if ([' in', ' not in'].includes(
			sep) && values[1]
			?.toLowerCase().includes(
			'select ') && values[1]
			?.toLowerCase()
			.includes(
			' from ')) {
			value = l.replace(field, '')
			.replace(
			/^\s(in\|not in)\s/i,
			'').trim()
			if (value.startsWith('(') &&
			value.endsWith(')'))
			value = value
			.replace(/^\(/, '')
			.replace(/\)$/, '').trim()
			} else {
			value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
			value = values[1]?.trim()
			.replace(/^\'/, '')
			.replace(
			/\'$/, '')

			if (['in', 'not in'].includes(op)) {
			value = value.replace(/^$/, '').replace(/$$/, '')
			value = value.split(',').map(v => v.trim().replace(/^\'/, '')
			.replace(/\'$/, ''))
			if (['in', 'not in'].includes(
			op)) {
			value = value.replace(
			/^\(/, '').replace(
			/\)$/,
			'')
			value = value.split(',')
			.map(v => v.trim()
			.replace(
			/^\'/, '')
			.replace(/\'$/, '')
			)
			}
			}
			sql.push([{
			@@ -1533,7 +1940,10 @@
			var li = where
			// 单一查询条件直接放在第一级数组中
			var l = li.trim()
			if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^$/, '').replace(/$$/, '')
			if (l.startsWith('(') && l.endsWith(')')) l = l
			.replace(/^\(/, '')
			.replace(
			/\)$/, '')
			var sep = ''
			for (var i = 0; i < seps.length; i++) {
			if (l.toLowerCase().includes(seps[i])) {
			@@ -1543,22 +1953,35 @@
			}
			if (sep) {
			var values = l.split(new RegExp(sep, 'i'))
			var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
			var field = values[0]?.trim().replace(/^\[/,
			'').replace(/\]$/, '')
			var value = ''
			var op = sep.trim()

			if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes('select ') &&
			values[1]?.toLowerCase().includes(' from ')) {
			value = l.replace(field, '').replace(/^\s(in\|not in)\s/i, '').trim()
			if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '')
			if ([' in', ' not in'].includes(sep) && values[
			1]?.toLowerCase()
			.includes('select ') &&
			values[1]?.toLowerCase().includes(' from ')
			) {
			value = l.replace(field, '').replace(
			/^\s(in\|not in)\s/i, '')
			.trim()
			if (value.startsWith('(') && value
			.endsWith(')')) value = value
			.replace(/^\(/, '')
			.replace(/\)$/, '').trim()
			} else {
			value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
			value = values[1]?.trim().replace(/^\'/,
			'').replace(/\'$/, '')

			if (['in', 'not in'].includes(op)) {
			value = value.replace(/^$/, '').replace(/$$/, '')
			value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/,
			''))
			value = value.replace(/^\(/, '')
			.replace(/\)$/, '')
			value = value.split(',').map(v => v
			.trim().replace(/^\'/,
			'')
			.replace(/\'$/,
			''))
			}
			}
			sql.push([{
			@@ -1590,8 +2013,13 @@
			},
			};
			</script>
			<style lang="scss">
			<style lang="less">
			.uni-page-modal-3200 {
			display: flex;
			flex-direction: column;
			height: calc(100vh - 30rpx);
			padding: 15rpx 0;

			.v-headStyle:first-child {
			margin-top: 15rpx;
			}
			@@ -1659,13 +2087,21 @@
			}

			.v-content {
			height: 945rpx;
			overflow: hide;
			flex: 1;
			display: flex;
			width: 100%;
			flex-direction: column;
			min-height: 100px;
			overflow: hidden;
			/* border:0.1px solid red; */
			}

			.view-content {
			width: 100%;
			display: flex;
			margin-top: 10rpx;
			flex-direction: column;

			}

			.dv-panel-bkcolor {
			@@ -1696,10 +2132,11 @@
			}

			.dv-panel-buticon .btn-padding {
			padding: 0rpx 20rpx;
			padding: 10rpx 20rpx;
			display: inline-block;
			vertical-align: middle;
			}


			.dv-panel-buticon a i {
			font-size: 38rpx;
			@@ -1778,7 +2215,8 @@
			}

			.view-floor {
			padding: 0 20rpx;
			width: calc(100% - 20rpx);
			padding: 10rpx;
			/* border:1px solid red; */
			}

			@@ -1809,6 +2247,11 @@
			float: left;
			display: inline-block;
			margin-right: 20rpx;
			}

			button.btn_disabled {
			background-color: #ddd;
			color: #888;
			}

			.bk-active {
			@@ -1888,7 +2331,14 @@
			border-radius: 10rpx;
			}

			.scroll-Y {
			.v-scroll-view {
			flex: 1;
			overflow: hidden;
			width: 98%;
			}

			.scroll-y {
			width: 100%;
			height: 100%;
			}