From 310ab72840d7c7025273ac79363107a1f9e4bc8e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 18 七月 2025 17:34:47 +0800
Subject: [PATCH] test

---
 pages/modal/3018_2.vue |  893 +++++++++++++++++++---------------------------------------
 1 files changed, 294 insertions(+), 599 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 29fca4f..c888cad 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -1,168 +1,18 @@
 <template>
-	<view class="uni-page-modal-3018-2">
+	<view class="uni-page-modal-3018-2" :class="largeMode?'large-mode':''">
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<uni-forms ref="baseForm" label-align="right">
-				<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
-					<!-- 鏅�甯冨眬 -->
-					<uni-forms-item v-if="item.name != 'Layout'&& item.show==true"
-						:label="item.label ? item.label +'锛�:'' " :label-width="item.labelWidth+'px'">
-						<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> -->
-						<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-						<uni-data-select id="dv_select" v-if="item.name=='Select'"
-							:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
-							:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
-							@change="onEnterChange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
-						<!-- 鏂囨湰妗�鏁板瓧妗�-->
-						<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':''"
-								:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
-								v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder"
-								:style="{'padding-left':item.setting.prefix?0 : '8rpx','right':item.setting.suffix?0 : '8rpx'}"
-								: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)">&#xe568;</text>
-						</view>
-						<!-- 澶氳鏂囨湰 -->
-						<view class="input-wrapper" v-if="item.name=='Textarea' ">
-							<textarea class="uni-input" :class="item.disabled?'input-disabled':''" v-model="item.value"
-								:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
-								@blur="onEnterChange(item)" @click="onClick(item)" :data-index="index"
-								style="height:60px;" :style="{'width':'96%'}" :disabled="item.disabled"></textarea>
+			<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>
-						<!-- 澶嶉�妗�-->
-						<checkbox-group class="check_rememberPwd" 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 class="check_rememberPwd" 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="onModelValue(item)" />
-						<!-- 鏃ユ湡鏃堕棿 -->
-						<!-- <view class="input-wrapper" v-if="(item.name=='TimePicker' || item.name=='DatePicker')">
-							<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> -->
-						<OIDatePicker v-if="item.name=='DatePicker'" :class="item.disabled?'input-disabled':''"
-							:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
-							:defaultToday="item.setting.defaultToday" :format="item.setting.format"
-							@change="onModelValue(item)" />
-						<OIDatePickerRange v-if="item.name=='DatePickerRange'" :rangeSeparator="item.setting.separator"
-							:format="item.setting.format" :class="item.disabled?'input-disabled':''"
-							:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
-							@change="onModelValue(item)" />
-						<OITimePicker v-if="item.name=='TimePicker'" :class="item.disabled?'input-disabled':''"
-							:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
-							@change="onModelValue(item)" />
-					</uni-forms-item>
-					<!-- 鏍呮牸甯冨眬 -->
-					<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">
-							<uni-forms-item v-if="cols!=null  && cols.show==true"
-								:label="cols.label? cols.label +'锛�:''" :label-width="cols.labelWidth+'px'">
-								<view class="input-wrapper" v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
-									<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
-										@click="classAttr_extButton(cols)">&#xe568;</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="{'padding-left':cols.setting.prefix?0 : '8px','right':cols.setting.suffix?0 : '8px'}"
-										:focus="focusFieldId == cols.fieldId" @focus="ontap(cols)"
-										@click="onClick(cols)" @keyup.enter="onEnterChange(cols)"
-										@blur="onEnterChange(cols)" :maxlength="-1" />
-									<text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]"
-										@click="classAttr_extButton(cols)">&#xe568;</text>
-								</view>
-								<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
-								<uni-data-select id="dv_select" v-if="cols.name=='Select' "
-									:class="cols.disabled?'input-disabled':''" v-model="cols.value"
-									:localdata="cols.dict" @change="onEnterChange(cols)" :disabled="cols.disabled"
-									:clear="false"></uni-data-select>
-								<!-- 澶氳鏂囨湰 -->
-								<view class="input-wrapper" v-if="cols.name=='Textarea' ">
-									<textarea class="uni-input" v-model="cols.value"
-										:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
-										:focus="focusFieldId == cols.fieldId" @blur="onEnterChange(cols)"
-										@click="onClick(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="cols.disabled"
-									@change="onCheckBoxValue" :data-attr="cols.fieldId" :data-index="index"
-									:data-iindex="key">
-									<label v-for="(cols2) in cols.selections" :key="cols2.value">
-										<checkbox :value="cols2.value" :checked="cols.value.includes(cols2.value)" />
-										<text>{{cols2.label}}</text>
-									</label>
-								</checkbox-group>
-								<!-- 鍗曢�妗�-->
-								<radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
-									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
-									@change="onRadioBoxValue" :data-attr="cols.fieldId" :data-index="index"
-									:data-iindex="key">
-									<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="cols.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="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
-										<view class="picker">{{cols.value}}</view>
-									</picker>
-								</view> -->
-								<OIDatePicker v-if="cols.name=='DatePicker'" :class="cols.disabled?'input-disabled':''"
-									:disabled="cols.disabled" v-model="cols.value" :placeholder="cols.placeholder"
-									:defaultToday="cols.setting.defaultToday" :format="cols.setting.format"
-									@change="onModelValue(cols)" />
-								<OIDatePickerRange v-if="cols.name=='DatePickerRange'"
-									:rangeSeparator="cols.setting.separator" :format="cols.setting.format"
-									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
-									v-model="cols.value" :placeholder="cols.placeholder" @change="onModelValue(cols)" />
-								<OITimePicker v-if="cols.name=='TimePicker'" :class="cols.disabled?'input-disabled':''"
-									:disabled="cols.disabled" v-model="cols.value" :placeholder="cols.placeholder"
-									@change="onModelValue(cols)" />
-							</uni-forms-item>
-							<uni-forms-item v-else label=""></uni-forms-item>
-
-						</uni-col>
-					</uni-row>
-				</view>
-			</uni-forms>
 		</view>
 		<view class="view-bottom">
 			<view class="uni-padding-wrap" v-if="dropdownBtns.length>0">
 				<view class="uni-btn-v">
 					<a @tap="clickDropdownBtns">
-						<Icon class="mobox-normal-more" />
+						<text class="mobox-normal-more" />
 					</a>
 				</view>
 			</view>
@@ -202,13 +52,12 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from '@/js/Base64.js';
 	import utils from "@/js/utils.js"
 	import dayjs from "dayjs";
-	import OIDatePicker from '@/components/oi-date-time-picker/oi-date-picker.vue'
-	import OIDatePickerRange from '@/components/oi-date-time-picker/oi-date-picker-range.vue'
-	import OITimePicker from '@/components/oi-date-time-picker/oi-time-picker.vue'
-
+	import OIForm from '@/components/oi-form/index.vue'
 	import {
 		appGetInfo,
 		dictGetInfo
@@ -218,18 +67,16 @@
 		runCustomEvent,
 		dataObjCreate
 	} from "@/api/data.js"
+	import buttonClickMixin from '@/mixins/button-click.js';
 
 	export default {
-		modules: {
-			Base64,
-		},
+		mixins: [buttonClickMixin],
 		components: {
-			OIDatePicker,
-			OIDatePickerRange,
-			OITimePicker
+			OIForm,
 		},
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys('add2'),
 				btnName: "",
 				param: {},
@@ -238,7 +85,6 @@
 				edit_select_compose_event: "", //閫夋嫨缁勬垚瀵硅薄鏃惰皟鐢� 				edit_compose_cls_id: "",
 				global_attr: [],
-				refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 				scanCodeVal: "",
 				popupType: "center",
 				check_list: {},
@@ -262,7 +108,7 @@
 			if (e.index == 0) {
 				const $this = this
 				uni.scanCode({
-					scanType: ["qrCode"],
+					scanType: ["qrCode", 'barCode'],
 					success: function(res) {
 
 						if ($this.focusFieldId) {
@@ -305,7 +151,6 @@
 					edit_select_compose_event: "", //閫夋嫨缁勬垚瀵硅薄鏃惰皟鐢� 					edit_compose_cls_id: "",
 					global_attr: [],
-					refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 					scanCodeVal: "",
 					popupType: "center",
 					check_list: {},
@@ -331,10 +176,10 @@
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.param = JSON.parse(options.param);
-			this.$data.title = this.$data.param.Add_BtnName ? this.$data.param.Add_BtnName : options
+			this.param = JSON.parse(options.param);
+			this.title = this.param.Add_BtnName ? this.param.Add_BtnName : options
 				.titlename; //璁剧疆鎸夐挳鏂囧瓧
-			this.$data.btnName = this.$data.param.Add_BtnName || ""
+			this.btnName = this.param.Add_BtnName || ""
 			this.loadData(options.paramValue)
 		},
 		computed: {
@@ -374,7 +219,7 @@
 				//浼犲叆鍙傛暟鍊� 				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) {
@@ -432,7 +277,7 @@
 										if (itemName) {
 											styledefHead.form.model[ele.fieldId] = itemName;
 										}
-										ele.dict = selections.map((a) => {
+										ele.selections = selections.map((a) => {
 											return {
 												value: a.value,
 												text: a.label
@@ -468,7 +313,7 @@
 													styledefHead.form
 														.model[col.fieldId] = itemName;
 												}
-												col.dict = selections.map((a) => {
+												col.selections = selections.map((a) => {
 													return {
 														value: a.value,
 														text: a.label
@@ -489,6 +334,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
 						}
 
 					}
@@ -601,10 +465,8 @@
 						});
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
-							.info
-							.join(
-								'<br/>') : '';
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('<br/>') : '';
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
@@ -623,13 +485,11 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									$this.hideFormItems(result)
-									// console.log($this.$data.head_styledef);
+									// console.log($this.head_styledef);
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
-									if ($this
-										.focusOldFieldId ==
-										action.value) {
+									if ($this.focusOldFieldId == action.value) {
 										$this.setData({
 											focusFieldId: ""
 										})
@@ -685,60 +545,26 @@
 
 
 			ontap(item) { //鎵爜鍔熻兘
-				// console.log("ontap",item);
-				// 鎵撳紑钃濈墮閫傞厤鍣�-				// uni.openBluetoothAdapter({
-				//   success: function() {
-				// 	// 寮�鎼滅储钃濈墮璁惧
-				// 	uni.startBluetoothDevicesDiscovery({
-				// 	  success: function() {
-				// 		// 鐩戝惉鎵惧埌鏂拌澶囩殑浜嬩欢
-				// 		uni.onBluetoothDeviceFound(function(devices) {
-				// 		  // 杩欓噷鍙互杩囨护鍑篟FID鑺墖锛岃繛鎺ュ苟璇诲彇鏁版嵁
-				// 		  console.log(devices[0].deviceId);
-				// 		})
-				// 	  }
-				// 	})
-				//   }
-				// });
-				// 鐩戝惉NFC鍔熻兘鏄惁鍙敤
-				// uni.getNFCAdapterState({
-				//   success: function(res) {
-				// 	console.log(res);
-				//     if (res.errCode === 0) {
-				//       // NFC鍔熻兘鍙敤锛屽紑濮嬬洃鍚�-				//       uni.onNFCStart((res) => {
-				//         if (res.errCode === 0) {
-				//           // 寮�NFC鏍囩妫�祴
-				//           uni.makeNFCReaderStart({
-				//             success: function() {
-				//               // 鐩戝惉NFC鏍囩
-				//               uni.onNFCTagDiscovered(function(res) {
-				// 										  console.log(res);
-				//                 // 杩欓噷鍙互澶勭悊NFC鏍囩鏁版嵁
-				//               })
-				//             }
-				//           })
-				//         }
-				//       })
-				//     }
-				//   }
-				// })
+
 				this.focusOldFieldId = item.fieldId
 				getApp().onScan((result) => {
 					console.log(result);
 					// uni.hideKeyboard();
-					this.onScanValue(item, result.decodedata)
+					this.onScanValue(item, result)
 				})
 			},
 			onScanValue(item, value) {
 				const $this = this;
 				//console.log("onScanValue", item);
-				if (item.oldvalue != value) {
-					item.oldvalue = value;
-					item.value = value;
+				item.value = 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] = value;
+					$this.head_styledef.form.model[attr] = newVal;
 					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠� 					if (eventid) {
 						var obj_attr = this.head_styledef.form.model;
@@ -755,70 +581,67 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.DataCls.id,
+							clsid: this.param.DataCls.id,
 							objid: "",
 							attr: req,
 							dataJson: [],
 						}
 						this.DataObjRunCustomEvent(info, '');
 					}
-					if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�-						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
-						var findd = false
-						for (let i in $this.head_styledef.form.items) {
-							const ele = $this.head_styledef.form.items[i]
+					//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂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
-										}
-
-									}
-
-								}
-							} else {
-								if (findd) {
-									let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-										return (col.name == 'Input' || col.name == 'InputNumber');
-									})
-									if (curIndex > -1) {
+						if (ele.name != "Layout") {
+							if (ele.name == 'Input' || ele.name == 'InputNumber') {
+								if (attr == ele.fieldId) {
+									findd = true
+								} else {
+									if (findd) {
 										$this.setData({
-											focusFieldId: ele.setting.colList[curIndex]
-												.fieldId
+											focusFieldId: ele.fieldId
 										})
 										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
-										}
-									}
 								}
 
 							}
+						} 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
+									})
+									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
+									}
+								}
+							}
+
 						}
 					}
 
@@ -829,12 +652,22 @@
 				this.focusFieldId = item.fieldId
 			},
 			onEnterChange(item) {
-				console.log("onEnterChange", item);
-				if (item.oldvalue != item.value) {
-					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; //鍐呭鍙樺寲鍚庝簨浠�+					// this.onScanValue(this.head_styledef.form.items[2].setting.colList[0], "test")
 					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� 						this.onChange(onChangeEvent);
 					}
@@ -859,7 +692,7 @@
 						rclsid: '',
 						robjid: '',
 						userlogin: '',
-						clsid: this.$data.param.DataCls.id,
+						clsid: this.param.DataCls.id,
 						objid: "",
 						attr: req,
 						dataJson: []
@@ -869,67 +702,6 @@
 
 			},
 
-			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);
-						}
-					}
-
-				}
-
-			},
-			onModelValue(item) {
-				var attr = item.fieldId;
-				this.head_styledef.form.model[attr] = item.value;
-			},
 			classAttr_extButton(item) {
 				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�@@ -952,11 +724,12 @@
 					});
 					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,
+				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent
+					.id,
 					item);
 			},
 			popupChange(e) {
@@ -966,15 +739,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) { //寮规鍙栨秷
@@ -982,7 +755,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++) {
@@ -996,7 +769,7 @@
 						});
 					}
 				}
-				if (!$this.$data.popupParam) {
+				if (!$this.popupParam) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: "popupParam涓虹┖锛�,
@@ -1014,7 +787,7 @@
 					});
 					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",
@@ -1022,12 +795,12 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: $this.$data.param.DataCls.id,
+					clsid: $this.param.DataCls.id,
 					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();
 			},
 
@@ -1035,18 +808,18 @@
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
+						cls_id: this.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 					}
 				};
 				if (data_attr) {
 					enviroment.edit_dlg = {
 						type: 'small', //灏忕獥鍙�-						class_id: this.$data.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
+						class_id: this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
 					}
 					if (data_attr) {
 						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1065,11 +838,12 @@
 				//     edtype: info.edtype, eventid: info.eventid, projectid: info.projectid.replace('{','').replace('}',''),
 				//     rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
 				//     attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: "",
-				// 	global_attr: JSON.stringify(this.$data.global_attr), dataJson:JSON.stringify(info.dataJson)
+				// 	global_attr: JSON.stringify(this.global_attr), dataJson:JSON.stringify(info.dataJson)
 				// }
 				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var input_param = Base64.encode(JSON.stringify(info.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.$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 = {};
@@ -1117,14 +891,16 @@
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							content: tip + ',' + this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1146,9 +922,9 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									$this.hideFormItems(result)
-									// console.log($this.$data.head_styledef);
+									// console.log($this.head_styledef);
 								} else if (action.action_type == 'set_global_attr') {
-									$this.$data.global_attr = action.value || [];
+									$this.global_attr = action.value || [];
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
@@ -1188,63 +964,7 @@
 						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;
-												}
-											}
-										});
-									}
-								}
-
-								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;
-										}
-									}
-								}
-							}
+							$this.setFormValues(data.result)
 						}
 					}
 
@@ -1280,18 +1000,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 = {
@@ -1299,7 +1007,8 @@
 					class_id: $this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
 				}
 				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify($this
+					.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				req.forEach(item2 => {
 					obj_attr[item2.attr] = item2.value;
@@ -1354,14 +1063,16 @@
 							});
 						} else uni.showModal({
 							title: $this.translateSys("tip"),
-							content: tip + ',' + $this.translateSys('tip') + ':' + data
+							content: tip + ',' + $this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1385,13 +1096,17 @@
 										var d = dialog({
 											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
 												$this.translateSys("tip"),
-											content: $this.translateSys("quotation_mark_left") +
-												action.action_type + $this.translateSys(
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action.action_type + $this
+												.translateSys(
 													"quotation_mark_right") +
-												$this.translate("tip_action_unprocessed")
+												$this.translate(
+													"tip_action_unprocessed")
 										});
 										d.show();
-									} else if (action.action_type == 'open_select_userdlg') {
+									} else if (action.action_type ==
+										'open_select_userdlg') {
 										var style = val.style;
 										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
 										var param = {
@@ -1419,7 +1134,7 @@
 														rclsid: '',
 														robjid: '',
 														userlogin: '',
-														clsid: $this.$data.param
+														clsid: $this.param
 															.DataCls
 															.id,
 														objid: "",
@@ -1427,13 +1142,15 @@
 														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info,
+													$this.DataObjRunCustomEvent(
+														info,
 														param
 														.data_attr);
 												}
 											}
 										});
-									} else if (action.action_type == 'open_data_query_dlg') {
+									} else if (action.action_type ==
+										'open_data_query_dlg') {
 										var d = dialog({
 											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
 												$this.translateSys("tip"),
@@ -1453,7 +1170,8 @@
 											$this.setData({
 												check_list: val.config
 											})
-											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+											if (val.config.appear_style ==
+												'sideslip') //鍒ゆ柇鏄惁鏄晶婊� 												$this.setData({
 													popupType: "right"
 												})
@@ -1473,7 +1191,8 @@
 												popupParam: popupParam
 											})
 										}
-									} else if (action.action_type == 'open_project_query_dlg') {
+									} else if (action.action_type ==
+										'open_project_query_dlg') {
 										//console.log(action.value.select_range);
 										//console.log(action.value.mulit_select);
 										var priRel = '-1';
@@ -1483,7 +1202,8 @@
 											priRel = '1';
 										else if (action.value.select_range == '鎴戝垱寤虹殑')
 											priRel = '2';
-										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+										else if (action.value.select_range == '鎴戝弬涓庣殑' ||
+											action
 											.value
 											.select_range == '鎴戝弬鍔犵殑')
 											priRel = '3';
@@ -1497,7 +1217,8 @@
 											req: req
 										}
 										uni.navigateTo({
-											url: '../selPrj/index?relation=' + priRel +
+											url: '../selPrj/index?relation=' +
+												priRel +
 												'&param=' +
 												JSON.stringify(param_),
 											events: {
@@ -1508,8 +1229,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();
@@ -1517,7 +1238,8 @@
 														var info = {
 															eventid: callback_eventid,
 															edtype: "2",
-															projectid: data[0].ID,
+															projectid: data[0]
+																.ID,
 															rclsid: "",
 															robjid: "",
 															userlogin: "",
@@ -1529,8 +1251,9 @@
 															dataJson: [],
 														}
 
-														$this.DataObjRunCustomEvent(
-															info);
+														$this
+															.DataObjRunCustomEvent(
+																info);
 													}
 												}
 											}
@@ -1540,12 +1263,14 @@
 											title: $this.translateSys("tip"),
 											content: $this.translateSys(
 													"quotation_mark_left") +
-												action.action_type + $this.translateSys(
+												action.action_type + $this
+												.translateSys(
 													"quotation_mark_right") + $this
 												.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
-											confirmText: $this.translateSys('close')
+											confirmText: $this.translateSys(
+												'close')
 										});
 									}
 								}
@@ -1553,9 +1278,11 @@
 						} else {
 							uni.showModal({
 								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys("quotation_mark_left") +
+								content: $this.translateSys(
+										"quotation_mark_left") +
 									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this.translateSys(
+										"quotation_mark_right") + $this
+									.translateSys(
 										"comma") + 'event_id' + eventid,
 								showCancel: false,
 								confirmText: $this.translateSys('close')
@@ -1603,24 +1330,18 @@
 
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.param.DataCls.id,
+						cls_id: this.param.DataCls.id,
 					}
 				};
 				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 
-				// console.log(obj_attr);
-				// var dataInfo={
-				//     class_id: this.$data.param.DataCls.id, data_obj_id: '', masterclsid: '',
-				//     req: JSON.stringify(req), upfile: JSON.stringify([]), post_data: JSON.stringify({}),
-				//     compose: JSON.stringify([]), refdatastore: JSON.stringify([]), extinfo: JSON.stringify(enviroment), 
-				// 	not_trigger_sys_event: ''
-				// };
+
 				var dataInfo = {
-					class_id: this.$data.param.DataCls.id,
+					class_id: this.param.DataCls.id,
 					class_name: '',
 					master_cls_id: '',
 					master_obj_id: '',
@@ -1655,7 +1376,8 @@
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							content: tip + ',' + this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: this.translateSys('close')
@@ -1663,7 +1385,8 @@
 						this.saving = false
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1683,12 +1406,13 @@
 						}
 
 
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+								url: '../modal/3018_2?param=' + JSON.stringify(this
+										.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -1749,16 +1473,17 @@
 			},
 			setFormValues(data) {
 				const $this = this
+				const head_styledef = this.head_styledef
 				for (var i = 0; i < data.length; i++) {
-					if (data[i].choice_list) {
-						for (var c = 0; c < $this.head_styledef.form.items
-							.length; c++) {
-							var attr = $this.head_styledef.form.items[c];
-							if (attr.name != 'Layout') {
-								if (attr.fieldId == data[i].attr) {
+					const attr = data[i]
+					if (attr.choice_list) {
+						for (var c = 0; c < head_styledef.form.items.length; c++) {
+							const item = head_styledef.form.items[c];
+							if (item.name != 'Layout') {
+								if (item.fieldId == attr.attr) {
 									var dictItemList = [];
-									for (var d in data[i].choice_list) {
-										var val = data[i].choice_list[d];
+									for (var d in attr.choice_list) {
+										var val = attr.choice_list[d];
 										dictItemList.push({
 											"CN_S_NAME": val,
 											"CN_S_VALUE": val,
@@ -1766,20 +1491,19 @@
 											"value": val
 										});
 									}
-									attr.dict = dictItemList;
+									if (item.useDict) {
+										item.dict = dictItemList;
+									} else {
+										item.selections = dictItemList;
+									}
 								}
-							} else if (attr.name == 'Layout') {
-								attr.setting.colList.forEach(col => {
+							} else if (item.name == 'Layout') {
+								item.setting.colList.forEach(col => {
 									if (col) {
-										if (col.fieldId == data[
-												i]
-											.attr) {
+										if (col.fieldId == attr.attr) {
 											var dictItemList = [];
-											for (var d in data[i]
-													.choice_list) {
-												var val = data[i]
-													.choice_list[
-														d];
+											for (var d in attr.choice_list) {
+												var val = attr.choice_list[d];
 												dictItemList.push({
 													"CN_S_NAME": val,
 													"CN_S_VALUE": val,
@@ -1787,8 +1511,11 @@
 													"value": val
 												});
 											}
-											col.dict =
-												dictItemList;
+											if (col.useDict) {
+												col.dict = dictItemList;
+											} else {
+												col.selections = dictItemList;
+											}
 										}
 									}
 								});
@@ -1796,115 +1523,74 @@
 
 						}
 					}
-					for (var c = 0; c < $this.$data.head_styledef.form
-						.items
-						.length; c++) {
-						var attr = $this.$data.head_styledef.form.items[c];
-						// console.log(attr[j].Name+'=='+data[i].attr);
+					for (var c = 0; c < head_styledef.form.items.length; c++) {
+						const item = head_styledef.form.items[c];
+						// console.log(attr[j].Name+'=='+attr.attr);
 						//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-						if ($this.head_styledef.form.model[data[i]
-								.attr] ==
-							undefined) {
-							$this.head_styledef.form.model[data[i]
-									.attr] =
-								data[i]
-								.value;
+						if (head_styledef.form.model[attr.attr] == undefined) {
+							head_styledef.form.model[attr.attr] = attr.value;
 						}
 						//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-						if (attr.name != 'Layout') {
-							if (attr.fieldId == data[i].attr) {
-								attr.value = '';
-								attr.oldvalue = '';
-								attr.value = data[i].value;
-								attr.oldvalue = data[i].value;
-								$this.head_styledef.form.model[attr
-										.fieldId] =
-									data[
-										i].value;
+						if (item.name != 'Layout') {
+							if (item.fieldId == attr.attr) {
+								item.value = '';
+								item.oldvalue = '';
+								item.value = attr.value;
+								item.oldvalue = attr.value;
+								head_styledef.form.model[item.fieldId] = attr.value;
+								if (item.name == "Input") {
+									if (attr.prompt) item.placeholder = attr.prompt;
+								}
+								if (attr.enable !== undefined) {
+									if (attr.enable) item.disabled = false;
+									else item.disabled = true;
+								}
 							}
-						} else if (attr.name == 'Layout') {
-							attr.setting.colList.forEach(col => {
+						} else if (item.name == 'Layout') {
+							item.setting.colList.forEach(col => {
 								if (col) {
-									if (col.fieldId == data[i]
-										.attr) {
+									if (col.fieldId == attr.attr) {
 										col.value = '';
 										col.oldvalue = '';
-										col.value = data[i]
-											.value;
-										col.oldvalue = data[i]
-											.value;
-										$this.head_styledef.form
-											.model[
-												col
-												.fieldId] = data[
-												i]
-											.value;
+										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;
+										}
 									}
 								}
 							});
-						}
-					}
-					var length = 0;
-					if (!$this.$data.refdatastore.filter(function(s) {
-							return data[i].attr == s.attr
-						}).length) {
-						length = 1;
-						$this.$data.refdatastore.push(data[i]);
-					}
-					if (length == 0) {
-						for (var j = 0; j < $this.$data.refdatastore
-							.length; j++) {
-							if ($this.$data.refdatastore[j].attr == data[
-									i]
-								.attr) {
-								$this.$data.refdatastore[j].value = data[
-										i]
-									.value;
-							}
 						}
 					}
 				}
 
 			},
-			hideFormItems(data) {
-				const $this = this
-				data.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;
-													}
-												}
-											});
-								}
-							});
+			hideFormItems(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);
+					}
 				});
-				var head_styledef = JSON.parse(JSON.stringify($this.$data
-					.head_styledef));
-				$this.$data.head_styledef = [];
-				$this.$data.head_styledef = head_styledef;
+
+				this.setData({
+					head_styledef: head_styledef
+				})
 			},
+
 			afterOK() {
 				this.saving = true
 				const $this = this
@@ -1917,11 +1603,12 @@
 						value: obj_attr[a],
 					})),
 				};
-				if (!this.after_ok.id.includes('{')) this.after_ok.id = '{' + this.after_ok.id + '}';
+				if (!this.after_ok.id.includes('{')) this.after_ok.id = '{' + this.after_ok.id +
+					'}';
 				var dataInfo = {
 					ed_type: "0",
 					start_transaction: true,
-					class_id: this.$data.param.DataCls.id,
+					class_id: this.param.DataCls.id,
 					class_name: '',
 					event_id: this.after_ok.id,
 					event_name: '',
@@ -1957,7 +1644,8 @@
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							content: tip + ',' + this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: this.translateSys('close')
@@ -1965,7 +1653,8 @@
 						this.saving = false
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1975,12 +1664,13 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+								url: '../modal/3018_2?param=' + JSON.stringify(this
+										.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -2130,14 +1820,16 @@
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							content: tip + ',' + this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -2147,12 +1839,13 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+								url: '../modal/3018_2?param=' + JSON.stringify(this
+										.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -2217,7 +1910,8 @@
 					cls_name: btn.Cls_Name,
 					Edit_dlg: btn.Edit_dlg
 				};
-				const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg
+				const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn
+					.Edit_dlg
 					.Name +
 					"&type=addDataObj"
 				var $this = this;
@@ -2229,9 +1923,10 @@
 							console.log(resData);
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this
+								url: '../modal/3018_2?param=' + JSON.stringify(
+										this
 										.$data.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 
 						},

--
Gitblit v1.9.1