From b1233b1089142611698e913e565ec232334ba261 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期三, 14 五月 2025 08:37:16 +0800
Subject: [PATCH] form selections

---
 pages/modal/3018_2.vue |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index cb8a253..3a2d39d 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -275,7 +275,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
@@ -311,7 +311,7 @@
 													styledefHead.form
 														.model[col.fieldId] = itemName;
 												}
-												col.dict = selections.map((a) => {
+												col.selections = selections.map((a) => {
 													return {
 														value: a.value,
 														text: a.label
@@ -444,10 +444,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,
@@ -470,9 +468,7 @@
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
-									if ($this
-										.focusOldFieldId ==
-										action.value) {
+									if ($this.focusOldFieldId == action.value) {
 										$this.setData({
 											focusFieldId: ""
 										})
@@ -1470,7 +1466,7 @@
 				const $this = this
 				const head_styledef = this.head_styledef
 				for (var i = 0; i < data.length; i++) {
-					const attr = 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];
@@ -1486,7 +1482,11 @@
 											"value": val
 										});
 									}
-									item.dict = dictItemList;
+									if (item.useDict) {
+										item.dict = dictItemList;
+									} else {
+										item.selections = dictItemList;
+									}
 								}
 							} else if (item.name == 'Layout') {
 								item.setting.colList.forEach(col => {
@@ -1502,7 +1502,11 @@
 													"value": val
 												});
 											}
-											col.dict = dictItemList;
+											if (col.useDict) {
+												col.dict = dictItemList;
+											} else {
+												col.selections = dictItemList;
+											}
 										}
 									}
 								});

--
Gitblit v1.9.1