From 25771d625083b441b1c92974dc6d26215e8c2fea Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期二, 11 六月 2024 14:42:37 +0800
Subject: [PATCH] test
---
pages/modal/5600.vue | 143 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 insertions(+), 44 deletions(-)
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 6953607..cdd720b 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -267,7 +267,7 @@
:class="item.disabled?'input-disabled':''"
v-model="item.value"
:localdata="item.dict"
- @change="onChange(item)"
+ @change="onEnterChange(item)"
:disabled="item.disabled"
:clear="false"
></uni-data-select>
@@ -891,50 +891,57 @@
//鍔犺浇姝ｅ湪鐮佺洏鍐呭
viewAceionRow(data,type){
// console.log(data);
- var styleStr = JSON.stringify(this.$data.detail1_styledef);
- if(type){ //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鐮佺洏鏁版嵁
- styleStr = JSON.stringify(this.$data.detail2_styledef);
- }else{
- if(data.page_name == this.$data.param.Sub_Page[1].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
- styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷�- }
- }
- var detailStyle = JSON.parse(styleStr);
- data.row.attrs.forEach(attr=>{
- detailStyle.form.items.forEach(ele=>{
- if(ele.name!='Layout'){
- if(ele.fieldId == attr.attr) ele.value = attr.value;
- } else if(ele.name=='Layout'){
- ele.setting.colList.forEach(col=>{
- if(col){
- if(col.fieldId == attr.attr) col.value = attr.value;
- }
- });
- }
- });
+ if(JSON.stringify(data.row) =='{}'){
+ return;
+ }
+ data.row.forEach(row=>{
+ var styleStr = JSON.stringify(this.$data.detail1_styledef);
+ if(type){ //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
+ styleStr = JSON.stringify(this.$data.detail2_styledef);
+ }else{
+ if(data.page_name == this.$data.param.Sub_Page[1].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+ styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷�+ }
+ }
+ var detailStyle = JSON.parse(styleStr);
+ detailStyle.form.objId = row.id;
+ detailStyle.form.htmlobjId = row.id?row.id.replace(/-/g,'').replace('{','').replace('}',''):'null';
+ detailStyle.form.attrs = row.attrs;
+ row.attrs.forEach(attr=>{
+ detailStyle.form.items.forEach(ele=>{
+ if(ele.name!='Layout'){
+ if(ele.fieldId == attr.attr) ele.value = attr.value;
+ } else if(ele.name=='Layout'){
+ ele.setting.colList.forEach(col=>{
+ if(col){
+ if(col.fieldId == attr.attr) col.value = attr.value;
+ }
+ });
+ }
+ });
+ });
+
+ if(type){ //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
+ this.$data.detail2StyleDefList.push(detailStyle);
+ // console.log(this.$data.detail2StyleDefList);
+ }else{
+ if(data.page_name == this.$data.param.Sub_Page[1].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+ this.$data.detail2StyleDefList.push(detailStyle);
+ // console.log(this.$data.detail2StyleDefList);
+ }else{
+ this.$data.detail1StyleDefList.push(detailStyle);
+ this.activelist.push({active:false});
+ // console.log(this.$data.detail1StyleDefList);
+ }
+ }
});
- if(type){ //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鐮佺洏鏁版嵁
- detailStyle.form.objId = data.row.id;
- this.$data.detail2StyleDefList.push(detailStyle);
- // console.log(this.$data.detail2StyleDefList);
- }else{
- if(data.page_name == this.$data.param.Sub_Page[1].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
- detailStyle.form.objId = data.row.id;
- this.$data.detail2StyleDefList.push(detailStyle);
- // console.log(this.$data.detail2StyleDefList);
- }else{
- detailStyle.form.htmlobjId = data.row.id?data.row.id.replace(/-/g,'').replace('{','').replace('}',''):'null';
- detailStyle.form.objId = data.row.id;
- detailStyle.form.attrs = data.row.attrs;
- this.$data.detail1StyleDefList.push(detailStyle);
- this.activelist.push({active:false});
- // console.log(this.$data.detail1StyleDefList);
- }
- }
},
//鍔犺浇宸茬爜鐩樺唴瀹� viewAceionContent(data){
var $this = this;
+ if(JSON.stringify(data.content) =='{}'){
+ return;
+ }
data.content.forEach(cont=>{
var styleStr = JSON.stringify($this.$data.detail2_styledef);
if(data.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄爜鐩樹腑
@@ -944,6 +951,7 @@
detailStyle.SelBut_Checked = data.checkbox??true;
detailStyle.form.objId = cont.id;
detailStyle.form.htmlobjId = cont.id?cont.id.replace(/-/g,'').replace('{','').replace('}',''):'null';
+ detailStyle.form.attrs = cont.attrs;
cont.attrs.forEach(attr=>{
detailStyle.form.items.forEach(ele=>{
if(ele.name!='Layout'){
@@ -957,13 +965,60 @@
}
});
});
- detailStyle.form.attrs = cont.attrs;
- if(data.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄爜鐩樹腑
- $this.$data.detail1StyleDefList.push(detailStyle); //鐮佺洏涓�+ if(data.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+ //濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+ if(data.clear == false){
+ var isflag = true;
+ $this.detail1StyleDefList.forEach((style,index)=>{
+ if(style.form.objId == detailStyle.form.objId){
+ cont.attrs.forEach(attr=>{
+ style.form.items.forEach(ele=>{
+ if(ele.name!='Layout'){
+ if(ele.fieldId == attr.attr) ele.value = attr.value;
+ } else if(ele.name=='Layout'){
+ ele.setting.colList.forEach(col=>{
+ if(col){
+ if(col.fieldId == attr.attr) col.value = attr.value;
+ }
+ });
+ }
+ });
+ });
+ isflag = false;
+ }
+ });
+ if(isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+ }else{
+ $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+ }
$this.activelist.push({active:false});
// console.log($this.$data.detail1StyleDefList);
}else{
- $this.$data.detail2StyleDefList.push(detailStyle); //宸茬爜鐩�+ if(data.clear == false){
+ //濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+ var isflag = true;
+ $this.detail2StyleDefList.forEach((style,index)=>{
+ if(style.form.objId == detailStyle.form.objId){
+ cont.attrs.forEach(attr=>{
+ style.form.items.forEach(ele=>{
+ if(ele.name!='Layout'){
+ if(ele.fieldId == attr.attr) ele.value = attr.value;
+ } else if(ele.name=='Layout'){
+ ele.setting.colList.forEach(col=>{
+ if(col){
+ if(col.fieldId == attr.attr) col.value = attr.value;
+ }
+ });
+ }
+ });
+ });
+ isflag = false;
+ }
+ });
+ if(isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+ }else{
+ $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+ }
// console.log($this.$data.detail2StyleDefList);
}
});
--
Gitblit v1.9.1