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 ++-
pages/modal/5601.vue | 352 ++++++++++++++++++++++++--------------------------
pages/modal/3037_2.vue | 4
pages/modal/3200.vue | 2
manifest.json | 4
5 files changed, 191 insertions(+), 199 deletions(-)
diff --git a/manifest.json b/manifest.json
index 95c8de2..a74b4bb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.56",
- "versionCode" : 1156,
+ "versionName" : "1.1.57",
+ "versionCode" : 1157,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
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;
+ }
}
}
});
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index cbcff22..9966a43 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -263,7 +263,7 @@
$this.head_styledef.form
.model[ele.fieldId] = itemName;
}
- $this.head_styledef.form.items[index].dict = selections.map((a) => {
+ $this.head_styledef.form.items[index].selections = selections.map((a) => {
return {
value: a.value,
text: a.label
@@ -323,7 +323,7 @@
if (itemName) {
$this.detail1_styledef.form.items[ele.fieldId] = itemName;
}
- $this.detail1_styledef.form.items[index].dict = selections.map((a) => {
+ $this.detail1_styledef.form.items[index].selections = selections.map((a) => {
return {
value: a.value,
text: a.label
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 6b3eadf..f07e6d6 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -341,7 +341,7 @@
$this.head_styledef.form
.model[ele.fieldId] = itemName;
}
- $this.head_styledef.form.items[index].dict = selections.map((a) => {
+ $this.head_styledef.form.items[index].selections = selections.map((a) => {
return {
value: a.value,
text: a.label
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 5dbc622..1dca303 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -624,7 +624,7 @@
// var $ele = e;
//console.log(e.target)
this.focusOldFieldId = item.fieldId
- getApp().onScan((result) => {
+ getApp().onScan(async (result) => {
console.log(result.decodedata);
item.value = result.decodedata;
var $this = this;
@@ -634,16 +634,14 @@
var attr = item.fieldId;
this.head_styledef.form.model[attr] = newVal;
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- var onSuffixClickCallbackEvent = item.bind
- .onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�- var onSuffixClickEvent = item.bind
- .onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� var isflag = false;
-
+ if (item.changeEventRunding)
+ return
+ item.changeEventRunding = true
if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�- $this.onChange(onChangeEvent);
+ await this.onChange(onChangeEvent);
}
-
+ item.changeEventRunding = false
//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
var findd = false
for (let i in $this.head_styledef.form.items) {
@@ -713,7 +711,7 @@
})
},
- onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
+ async onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
console.log(item);
let newVal = item.value
if (typeof item.value == "string") {
@@ -732,7 +730,7 @@
this.head_styledef.form.model[attr] = newVal;
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�- this.onChange(onChangeEvent);
+ await this.onChange(onChangeEvent);
}
}
@@ -888,186 +886,176 @@
global_attr: '',
input_param: input_param,
};
- runCustomEvent(dataInfo).then(result => {
- console.log(result);
- if (result.ret != 0) {
- var tip = result.err_info ? typeof result
- .err_info == 'string' ? result
- .err_info : result.err_info.join('<br/>') :
- '';
- if (result.ret == 801) {
- if (this.param.Only_Script_Error) {
- let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(pos +
- 1);
- }
- uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- } else uni.showModal({
- title: this.translateSys('tip'),
- content: tip + ',' + this
- .translateSys('tip') + ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
- } else {
- var tip = result.info ? typeof result.info ==
- 'string' ? result.info :
- result.info.join('<br/>') : '';
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
+ const result = await runCustomEvent(dataInfo)
+ 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(
'close')
});
-
- if (result.result_type == 0 && result.action) {
- result.action.forEach(item => {
- if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�- $this.param.Show_Welcom_Page = false;
- var value = item.value;
- $this.viewAceionRow(value);
- } else if (item.action_type ==
- "set_subtable_page_content") { //宸茬爜鐩�- $this.param.Show_Welcom_Page = false;
- var value = item.value;
- const pageData = $this.pageDetail.find((page) => {
- return value.page_name == page.Name;
- });
- if (value.clear_confirm != false && value.clear == true &&
- pageData && pageData.DefList.length > 0
- ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate(
- "are_you_sure_clear_first") +
- this.translateSys(
- "quotation_mark_left") +
- value.page_name +
- this.translateSys(
- "quotation_mark_right") +
- this.translate(
- "are_you_sure_clear_last"),
- cancelText: $this.translateSys('ok'),
- confirmText: $this.translateSys('cancel'),
- success: function(res) {
- if (res.cancel) {
- if (pageData)
- pageData.DefList = [];
- $this.viewAceionContent(value);
- } else if (res.confirm) {
- if (pageData)
- pageData.DefList = [];
- $this.viewAceionContent(value);
- }
- }
- });
- } else {
- if (pageData)
- pageData.DefList = [];
- $this.viewAceionContent(value);
- }
- } else if (item.action_type == "select_subtable_page") {
- var value = item.value;
- const pageIndex = $this.pageDetail.findIndex((page) => {
- return value.page_name == page.Name;
- });
- if (pageIndex > -1) {
- $this.setData({
- current: pageIndex
- })
- }
- } else if (item.action_type == "select_subtable_page_row") {
- // value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
- var value = item.value;
- $this.viewActionSelectRow(value)
- } else if (item.action_type ==
- "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- var value = item.value;
- $this.viewActionRemoveRow(value)
- } else if (item.action_type == "set_subtable_page_row") {
- $this.viewActionSetRow(item.value)
-
- } else if (item.action_type == "set_subtable_page_ext_data") {
- var value = item.value;
- const pageData = $this.pageDetail.find((page) => {
- return value.page_name == page.Name;
- });
- if (pageData)
- pageData.ExtData = value.ext_data
-
- } else if (item.action_type == "clear_subpage_rows") {
- var value = item.value;
- const pageIndex = $this.pageDetail.findIndex((page) => {
- return value.page_name == page.Name;
- });
- if (pageIndex > -1) {
- const pageData = $this.pageDetail[pageIndex]
- pageData.DefList = []
- pageData.ExtData = {}
-
- $this.$set(this.pageDetail, pageIndex, pageData)
- }
-
- } else if (item.action_type == "set_dlg_current_edit_attr") {
-
- if ($this.focusOldFieldId == item.value) {
- $this.setData({
- focusFieldId: ""
- })
- } else {
- $this.setData({
- focusFieldId: $this.focusOldFieldId
- })
- }
- $this.$nextTick(() => {
- $this.setData({
- focusFieldId: item.value
- })
- });
- } else if (item.action_type == "set_dlg_attr") {
- // value = {"attr":"xxx", "value":"xxx"}
- var data = item.value;
- $this.setFormValues(data)
- }
- });
- } else {
-
- if (result.info) {
- uni.showModal({
- title: this.translateSys(
- "error") + "4.3",
- content: result.info,
- showCancel: false,
- confirmText: this
- .translateSys('close')
- });
- }
- }
-
- }
-
- }).catch(ex => {
- // console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
- uni.showModal({
- title: this.translateSys("error") + "4.1",
+ } else uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip + ',' + this
+ .translateSys('tip') + ':' +
+ result
+ .ret,
+ showCancel: false,
+ confirmText: this.translateSys(
+ 'close')
+ });
+ return false;
+ } else {
+ var tip = result.info ? typeof result.info ==
+ 'string' ? result.info :
+ result.info.join('<br/>') : '';
+ if (tip) uni.showModal({
+ title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('close')
+ confirmText: this.translateSys(
+ 'close')
});
- });
+
+ if (result.result_type == 0 && result.action) {
+ result.action.forEach(item => {
+ if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+ $this.param.Show_Welcom_Page = false;
+ var value = item.value;
+ $this.viewAceionRow(value);
+ } else if (item.action_type ==
+ "set_subtable_page_content") { //宸茬爜鐩�+ $this.param.Show_Welcom_Page = false;
+ var value = item.value;
+ const pageData = $this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
+ });
+ if (value.clear_confirm != false && value.clear == true &&
+ pageData && pageData.DefList.length > 0
+ ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: this.translate(
+ "are_you_sure_clear_first") +
+ this.translateSys(
+ "quotation_mark_left") +
+ value.page_name +
+ this.translateSys(
+ "quotation_mark_right") +
+ this.translate(
+ "are_you_sure_clear_last"),
+ cancelText: $this.translateSys('ok'),
+ confirmText: $this.translateSys('cancel'),
+ success: function(res) {
+ if (res.cancel) {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
+ } else if (res.confirm) {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
+ }
+ }
+ });
+ } else {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
+ }
+ } else if (item.action_type == "select_subtable_page") {
+ var value = item.value;
+ const pageIndex = $this.pageDetail.findIndex((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageIndex > -1) {
+ $this.setData({
+ current: pageIndex
+ })
+ }
+ } else if (item.action_type == "select_subtable_page_row") {
+ // value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
+ var value = item.value;
+ $this.viewActionSelectRow(value)
+ } else if (item.action_type ==
+ "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ var value = item.value;
+ $this.viewActionRemoveRow(value)
+ } else if (item.action_type == "set_subtable_page_row") {
+ $this.viewActionSetRow(item.value)
+
+ } else if (item.action_type == "set_subtable_page_ext_data") {
+ var value = item.value;
+ const pageData = $this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageData)
+ pageData.ExtData = value.ext_data
+
+ } else if (item.action_type == "clear_subpage_rows") {
+ var value = item.value;
+ const pageIndex = $this.pageDetail.findIndex((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageIndex > -1) {
+ const pageData = $this.pageDetail[pageIndex]
+ pageData.DefList = []
+ pageData.ExtData = {}
+
+ $this.$set(this.pageDetail, pageIndex, pageData)
+ }
+
+ } else if (item.action_type == "set_dlg_current_edit_attr") {
+
+ if ($this.focusOldFieldId == item.value) {
+ $this.setData({
+ focusFieldId: ""
+ })
+ } else {
+ $this.setData({
+ focusFieldId: $this.focusOldFieldId
+ })
+ }
+ $this.$nextTick(() => {
+ $this.setData({
+ focusFieldId: item.value
+ })
+ });
+ } else if (item.action_type == "set_dlg_attr") {
+ // value = {"attr":"xxx", "value":"xxx"}
+ var data = item.value;
+ $this.setFormValues(data)
+ }
+ });
+ } else {
+
+ if (result.info) {
+ uni.showModal({
+ title: this.translateSys(
+ "error") + "4.3",
+ content: result.info,
+ showCancel: false,
+ confirmText: this
+ .translateSys('close')
+ });
+ }
+ }
+
+ }
+
}
} catch (ex) {
var tip = typeof ex == "string" ? ex : ex.message;
--
Gitblit v1.9.1