From fa73abee6209cd6f7c62c61c271826f7d413035d Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 11:32:17 +0800
Subject: [PATCH] event result_type
---
pages/modal/5601.vue | 790 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 567 insertions(+), 223 deletions(-)
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 8696077..924be99 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -1,7 +1,8 @@
<template>
- <view class="uni-page-modal-5601">
+ <view class="uni-page-modal-5601" :class="largeMode?'large-mode':''">
<!-- 琛ㄥご鏍峰紡 -->
- <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
+ <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>
@@ -17,7 +18,7 @@
<swiper class="view-tabpage" :current="current" @change="changeSwiper">
<!-- 瀛愮晫闈�-->
<swiper-item v-for="(pageData, pageIndex) in pageDetail" :key="pageIndex">
- <view class="uni-panel-content">
+ <view class="tab-content">
<view class="view-tab-content" :id="'tabpanel' + pageData.Name">
<image class="logo" v-if="pageData.DefList.length==0"
src="../../images/mobox_log_200x40.png">
@@ -27,7 +28,10 @@
@tap="onPanelClick(ii,style.form.htmlobjId)"
:id="'dvpanel'+style.form.htmlobjId"
:class="style.form.htmlobjId==active_id?'bk-active':''">
- <OIForm class="dv-panel-form" :form="style.form" viewMode></OIForm>
+ <OIForm class="dv-panel-form" :form="style.form"
+ :hiddenIds="style.hiddenIds ?style.hiddenIds :[] " viewMode @on-change="(item2)=>{
+ onDetailEnterChange(item2,style,pageIndex)
+ }"></OIForm>
<div class="dv-panel-button"
v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0">
@@ -139,6 +143,7 @@
data() {
return {
+ largeMode: getApp().globalData.largeMode || false,
title: this.translateSys("inventory"),
ClsID: '',
param: {},
@@ -365,21 +370,18 @@
Name: page.After_Delete?.Name
};
}
-
- if (evt.ID) {
- return [{
- Cls_Name: this.param?.master_cls?.name || "",
- Cls_ID: this.param?.master_cls?.id || "",
- FunCode: "Delete",
- ShowName: this.$t("sys.delete"),
- Style: "text",
- Prompt: false,
- NotTriggerSYSEvent: false,
- DataStateVerify: false,
- AttrVerify: false,
- AfterProcess_Event: evt,
- }];
- }
+ return [{
+ Cls_Name: this.param?.master_cls?.name || "",
+ Cls_ID: this.param?.master_cls?.id || "",
+ FunCode: "Delete",
+ ShowName: this.$t("sys.delete"),
+ Style: "text",
+ Prompt: false,
+ NotTriggerSYSEvent: false,
+ DataStateVerify: false,
+ AttrVerify: false,
+ AfterProcess_Event: evt,
+ }];
}
return [];
}
@@ -493,7 +495,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
+ }
}
this.setData({
head_styledef: styledefHead
@@ -627,9 +647,9 @@
// var $ele = e;
//console.log(e.target)
this.focusOldFieldId = item.fieldId
- getApp().onScan((result) => {
- console.log(result.decodedata);
- item.value = result.decodedata;
+ getApp().onScan(async (result) => {
+ console.log(result);
+ item.value = result;
var $this = this;
let newVal = item.value.trim()
if (newVal) {
@@ -637,16 +657,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) {
@@ -716,7 +734,7 @@
})
},
- onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
+ async onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
console.log(item);
let newVal = item.value
if (typeof item.value == "string") {
@@ -735,11 +753,12 @@
this.head_styledef.form.model[attr] = newVal;
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�- this.onChange(onChangeEvent);
+ await this.onChange(onChangeEvent);
}
}
},
+
classAttr_extButton(item) {
var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�@@ -770,7 +789,170 @@
this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
item);
},
+ onDetailEnterChange(item, style, pageIndex) {
+ let newVal = item.value
+ if (typeof item.value == "string") {
+ newVal = item.value.trim()
+ if (!newVal) {
+ item.oldvalue = newVal;
+ var attr = item.fieldId;
+ style.form.model[attr] = newVal;
+ return
+ }
+ }
+ if (item.oldvalue != newVal) {
+ item.oldvalue = newVal;
+ var attr = item.fieldId;
+ style.form.model[attr] = newVal;
+ var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+ this.runDetailChangeEvent(onChangeEvent, style, pageIndex)
+ }
+ }
+ },
+ async runDetailChangeEvent(event, style, pageIndex) {
+ try {
+ const detail_attr = {}
+ style.form.items.forEach(item2 => {
+ if (item2.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item2.setting.colList.forEach(col => {
+ if (col != null) detail_attr[col
+ .fieldId] = col.value;
+ });
+ } else
+ detail_attr[item2.fieldId] = item2.value;
+ });
+ var obj_attr = detail_attr
+ var input_param = Base64.encode(
+ JSON.stringify(
+ Object.keys(detail_attr).map((a) => ({
+ attr: a,
+ value: detail_attr[a] || "",
+ }))
+ )
+ );
+ var dataInfo = {
+ ed_type: 0,
+ start_transaction: true,
+ class_id: style.form.clsId,
+ class_name: '',
+ event_id: event.id,
+ event_name: '',
+ data_obj_id: '',
+ obj_attr: obj_attr,
+ prj_id: '',
+ ref_cls_id: '',
+ rel_obj_id: '',
+ user_login: '',
+ data_json: '',
+ compose_info: '',
+ ext_info: '',
+ global_attr: '',
+ input_param: input_param,
+ };
+ 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')
+ });
+ } 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/>') : '';
+ tip = tip || result.err_info
+ if (tip) uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+ if (result.result_type == 2) {
+
+ } else if (typeof result.result == 'string') {
+ if (result.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: result.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ var actionList = result.action || []
+ actionList.forEach(item => {
+ if (item.action_type == "set_dlg_attr") {
+ // value = {"attr":"xxx", "value":"xxx"}
+ var data = item.value;
+ this.setDetailFormValues(data, style, pageIndex)
+ } else if (item.action_type == 'set_dlg_attr_show') {
+ var data = item.value;
+ this.setDetailFormItemVisible(data, style, pageIndex)
+ }
+ });
+ } catch (ex) {
+ let actionList = (result.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
+ }
+ }
+
+ }
+
+ } catch (ex) {
+ console.log(ex)
+ var tip = typeof ex == "string" ? ex : ex.message;
+ uni.showModal({
+ title: this.translateSys("error") + "6.1",
+ content: this.translate(
+ 'execute_after_change_event_failed') + this
+ .translateSys(
+ "comma") +
+ this.translate('reason') + this.translateSys("colon") +
+ tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+
+ },
getDetailAttrList(pageData) {
const detailAttrList = [];
console.log(pageData)
@@ -891,52 +1073,66 @@
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')
});
+ } 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/>') : '';
+ tip = tip || result.err_info
+ if (tip) uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys(
+ 'close')
+ });
+ if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+ if (result.result_type == 2) {
- if (result.result_type == 0 && result.action) {
- result.action.forEach(item => {
+ } else if (typeof result.result == 'string') {
+ if (result.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: result.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ let actionList = result.action || []
+ actionList.forEach(item => {
if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓� $this.param.Show_Welcom_Page = false;
var value = item.value;
@@ -1043,34 +1239,29 @@
// value = {"attr":"xxx", "value":"xxx"}
var data = item.value;
$this.setFormValues(data)
+ } else if (item.action_type == 'set_dlg_attr_show') {
+ var data = item.value;
+ $this.setFormItemVisible(data)
}
});
- } else {
- if (result.info) {
- uni.showModal({
- title: this.translateSys(
- "error") + "4.3",
- content: result.info,
- showCancel: false,
- confirmText: this
- .translateSys('close')
- });
- }
+ } catch (ex) {
+ let actionList = (result.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
-
}
- }).catch(ex => {
- // console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
- uni.showModal({
- title: this.translateSys("error") + "4.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- });
+ }
+
}
} catch (ex) {
var tip = typeof ex == "string" ? ex : ex.message;
@@ -1442,11 +1633,11 @@
return;
}
var styleStr = JSON.stringify(pageData.StyleDef);
- var detailStyle = JSON.parse(styleStr);
- if (detailStyle.form) {
- data.content.forEach(cont => {
- detailStyle = JSON.parse(styleStr);
- detailStyle.SelBut_Checked = data.checkbox ?? true;
+
+ data.content.forEach(cont => {
+ var detailStyle = JSON.parse(styleStr);
+ if (detailStyle.form) {
+ // detailStyle.SelBut_Checked = data.checkbox ?? true;
detailStyle.form.objId = cont.id;
detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g,
@@ -1504,15 +1695,36 @@
}
// $this.setData({pageDetail:pageD})
$this.$set(this.pageDetail, pageIndex, pageData)
+ }
+ });
- });
- }
$this.$set(this.pageDetail, pageIndex, pageData)
+ },
+ setFormItemVisible(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);
+ }
+ });
+
+ this.setData({
+ head_styledef: head_styledef
+ })
},
setFormValues(attrs) {
const head_styledef = this.head_styledef
- if (JSON.stringify(attrs) == '{}') {
- return;
+ if (!Array.isArray(attrs)) {
+ return
}
console.log(attrs)
attrs.forEach(async (attr, key) => {
@@ -1591,13 +1803,113 @@
head_styledef: head_styledef
})
},
+ setDetailFormItemVisible(attrs, style, pageIndex) {
+ if (pageIndex < 0)
+ return
+ if (!Array.isArray(attrs)) {
+ return
+ }
+ const pageData = this.pageDetail[pageIndex]
+ if (!style.hiddenIds) {
+ style.hiddenIds = []
+ }
+ attrs.forEach((attr) => {
+ let index = style.hiddenIds.findIndex((id) => id == attr.attr);
+ if (attr.show) {
+ if (index > -1) style.hiddenIds.splice(index, 1);
+ } else {
+ if (index == -1) style.hiddenIds.push(attr.attr);
+ }
+ });
+ this.$set(this.pageDetail, pageIndex, pageData)
+ },
+ setDetailFormValues(attrs, style, pageIndex) {
+ if (pageIndex < 0)
+ return
+ if (!Array.isArray(attrs)) {
+ return
+ }
+
+ const pageData = this.pageDetail[pageIndex]
+ attrs.forEach(async (attr, key) => {
+ if (attr.choice_list) {
+ var dictItemList = [];
+ attr.choice_list.forEach(async (val, index) => {
+ dictItemList.push({
+ text: val,
+ value: val
+ });
+ });
+
+ style.form.items.forEach(async (attr_item, index) => {
+ if (attr_item.name != "Layout") {
+ if (attr_item.fieldId == attr.attr) {
+ if (attr_item.useDict) {
+ attr_item.dict = dictItemList;
+ } else {
+ attr_item.selections = dictItemList;
+ }
+ }
+ } else if (attr_item.name == "Layout") {
+ attr_item.setting.colList.forEach((col) => {
+ if (col) {
+ if (col.fieldId == attr.attr) {
+ if (col.useDict) {
+ col.dict = dictItemList;
+ } else {
+ col.selections = dictItemList;
+ }
+ }
+ }
+ });
+ }
+ });
+ }
+ if (!style.form.model[attr.attr]) {
+ style.form.model[attr.attr] = attr.value;
+ }
+ style.form.items.forEach(async (ele) => {
+ if (ele.name != "Layout") {
+ if (ele.fieldId == attr.attr) {
+ ele.value = attr.value;
+ ele.oldvalue = attr.value;
+ if (ele.name == "Input") {
+ if (attr.prompt) ele.placeholder = attr.prompt;
+ }
+ if (attr.enable !== undefined) {
+ if (attr.enable) ele.disabled = false;
+ else ele.disabled = true;
+ }
+ }
+ } else if (ele.name == "Layout") {
+ ele.setting.colList.forEach((col) => {
+ if (col) {
+ if (col.fieldId == attr.attr) {
+ 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;
+ }
+ }
+ }
+ });
+ }
+
+ })
+ //鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+ })
+ this.$set(this.pageDetail, pageIndex, pageData)
+ },
+
onClickItem(e) { //閫夋嫨椤电
// console.log(e);
this.current = e.currentIndex
},
- onDetail1EnterChange(item) { //鐮佺洏涓牱寮忓洖杞︿簨浠�- console.log(item);
- },
+
async del(pageData, style, event) {
//鑾峰彇琛ㄥご灞炴�
var head_attr = {};
@@ -1849,79 +2161,70 @@
.info
.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
-
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- var result = action.value;
- $this.setFormValues(result)
- } else if (action.action_type == 'set_dlg_attr_show') {
- var result = action.value;
- result.forEach(async (attr, key) => {
- $this.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;
- }
- }
- });
- }
- });
- });
- var head_styledef = JSON.parse(JSON.stringify($this.$data
- .head_styledef));
- $this.head_styledef = [];
- $this.head_styledef = head_styledef;
- // console.log($this.head_styledef);
- } else if (action.action_type == 'set_global_attr') {
- $this.global_attr = action.value || [];
- } else {
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
+ $this.setFormValues(data.result || [])
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys(
- "quotation_mark_left") +
- action
- .action_type + this.translateSys(
- "quotation_mark_right") + this
- .translate(
- "tip_action_unprocessed"),
+ title: this.translateSys('tip'),
+ content: data.result,
showCancel: false,
confirmText: this.translateSys('close')
});
}
}
- }
- console.log($this.head_styledef);
- if (data.result) {
- var result = data.result;
- $this.setFormValues(result)
+ try {
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ var result = action.value;
+ $this.setFormValues(result)
+ } else if (action.action_type == 'set_dlg_attr_show') {
+ var result = action.value;
+ $this.setFormItemVisible(result)
+
+ // console.log($this.head_styledef);
+ } else if (action.action_type == 'set_global_attr') {
+ $this.global_attr = action.value || [];
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translateSys(
+ "quotation_mark_left") +
+ action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this
+ .translate(
+ "tip_action_unprocessed"),
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
+ }
}
}
@@ -2031,16 +2334,28 @@
.info
.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: $this.translateSys('close')
});
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
- if (data != "") {
- var actions = data.action;
- if (actions) {
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: data.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ var actions = data.action || []
for (var i = 0; i < actions.length; i++) {
var action = actions[i];
console.log(action)
@@ -2218,18 +2533,22 @@
});
}
}
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
- } else {
- uni.showModal({
- title: $this.translateSys('tip') + "5.2",
- content: $this.translateSys("quotation_mark_left") +
- "before_click_button" + $this.translateSys(
- "quotation_mark_right") + $this.translateSys(
- "comma") + 'event_id' + eventid,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
}
+
}
}).catch(ex => {
@@ -2349,7 +2668,8 @@
const style = pageData.DefList[index];
//鍒犻櫎鐮佺洏涓牱寮忛潰鏉� pageData.DefList.splice(index, 1);
- this.del(pageData, style, btn.AfterProcess_Event);
+ if (btn.AfterProcess_Event.ID)
+ this.del(pageData, style, btn.AfterProcess_Event);
this.$set(this.pageDetail, pageIndex, pageData)
}
} else if (btn.FunCode == "Modify") {
@@ -2490,29 +2810,31 @@
this.After_OK_Event = pageData.After_ok;
// console.log(this.Before_OK_Event);
// console.log(this.After_OK_Event);
+ console.log("ok");
if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
this.sava(pageData, this.Before_OK_Event);
else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
this.sava(pageData, this.After_OK_Event);
},
sava(pageData, event) {
+
var $this = this;
- if (pageData.DefList.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate(
- "tip_no_data_first") +
- this.translateSys(
- "quotation_mark_left") + pageData.Name + this
- .translateSys(
- "quotation_mark_right") +
- this.translate(
- "tip_no_data_last"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- return false;
- }
+ // if (pageData.DefList.length == 0) {
+ // uni.showModal({
+ // title: this.translateSys("tip"),
+ // content: this.translate(
+ // "tip_no_data_first") +
+ // this.translateSys(
+ // "quotation_mark_left") + pageData.Name + this
+ // .translateSys(
+ // "quotation_mark_right") +
+ // this.translate(
+ // "tip_no_data_last"),
+ // showCancel: false,
+ // confirmText: this.translateSys('close')
+ // });
+ // return false;
+ // }
//鑾峰彇琛ㄥご灞炴�
var head_attr = {};
this.head_styledef.form.items.forEach(item => {
@@ -2607,7 +2929,7 @@
item_list: jsonlist,
ext_data: pageData.ExtData
})
- // console.log(jsonlist);
+
$this.runCustomEvent(pageData, event, input_param, list);
// jsonlist.forEach(async (json,key)=>{
// await $this.runCustomEvent(event,input_param,json,'1');
@@ -2638,6 +2960,7 @@
global_attr: '',
input_param: input_param,
};
+ console.log(dataInfo);
runCustomEvent(dataInfo).then(result => {
console.log(result);
if (result.ret != 0) {
@@ -2672,6 +2995,7 @@
var tip = result.info ? typeof result.info ==
'string' ? result.info : result.info
.join('<br/>') : '';
+ tip = tip || result.err_info
if (tip) uni.showModal({
title: this.translateSys('tip'),
content: tip,
@@ -2679,11 +3003,22 @@
confirmText: this.translateSys(
'close')
});
- if (result.result_type == 0) {
- if (result.action) {
- // uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")});
+ if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+ if (result.result_type == 2) {
- result.action.forEach(item => {
+ } else if (typeof result.result == 'string') {
+ if (result.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: result.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ let actionList = result.action || []
+ actionList.forEach(item => {
if (item.action_type ==
"insert_subtable_page_row") { //鐮佺洏涓� var value = item.value;
@@ -2840,26 +3175,32 @@
// value = {"attr":"xxx", "value":"xxx"}
var data = item.value;
$this.setFormValues(data)
+ } else if (item.action_type == 'set_dlg_attr_show') {
+ var data = item.value;
+ $this.setFormItemVisible(data)
}
});
- } else {
- if ($this.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+
+ if ($this.After_OK_Event?.ID && $this.After_OK_Event.ID != event
+ .ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
$this.sava(pageParam, $this.After_OK_Event); //鎵ц纭畾鍚庝簨浠�
}
- }
- } else {
-
- if (result.info) {
+ } catch (ex) {
+ let actionList = (result.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
uni.showModal({
- title: this.translateSys("tip"),
- content: result.info,
+ title: this.translateSys('tip'),
+ content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
+ console.log(ex)
+ return
}
- }
+ }if ([0, 2, 3, 4, -1].includes(result.result_type)) {
}
}).catch(ex => {
@@ -2917,7 +3258,7 @@
flex-direction: column;
}
-
+
.view-content {
display: flex;
flex: 1;
@@ -2953,6 +3294,12 @@
flex-direction: column !important;
}
+ .tab-content {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ flex-direction: column !important;
+ }
.view-bottom {
display: flex;
@@ -2968,7 +3315,6 @@
.btn-left {
padding: 20rpx;
line-height: 1.5;
- font-size: 38rpx;
font-weight: bold;
float: left;
display: inline-block;
@@ -2978,7 +3324,6 @@
.btn-one {
padding: 20rpx;
line-height: 1.5;
- font-size: 38rpx;
font-weight: bold;
float: left;
display: inline-block;
@@ -2989,7 +3334,6 @@
.btn-right {
padding: 20rpx;
line-height: 1.5;
- font-size: 38rpx;
font-weight: bold;
float: right;
display: inline-block;
@@ -3074,7 +3418,7 @@
.dv-panel-button {
width: 100%;
text-align: left;
- min-height: 30rpx;
+ min-height: 16px;
padding-bottom: 10rpx;
checkbox {
@@ -3086,7 +3430,7 @@
text-align: left;
line-height: 1.5;
border: none;
- font-size: 30rpx;
+
margin-right: 10rpx;
display: inline-block;
float: right;
@@ -3146,7 +3490,6 @@
background: #94D5EF;
display: block;
width: 100%;
- font-size: 36rpx;
line-height: 80rpx;
font-weight: 500;
}
@@ -3165,8 +3508,6 @@
background: #FFF;
border-radius: 0 !important;
color: #2d8cf0;
- /* padding: 10rpx 8rpx 12rpx; */
- font-size: 34rpx;
font-family: inherit;
box-shadow: none !important;
transition-duration: 0.1s;
@@ -3220,7 +3561,6 @@
}
.popup-header {
- font-size: 42rpx;
font-weight: bold;
margin: 20rpx 20rpx 0px 20rpx;
}
@@ -3245,7 +3585,6 @@
background: #27A6E1;
border: none;
color: #fff;
- font-size: 38rpx;
font-weight: bold;
/* float: left; */
display: inline-block;
@@ -3261,7 +3600,6 @@
// color: #fff;
background: #fff;
color: #000;
- font-size: 38rpx;
font-weight: bold;
/* float: right; */
display: inline-block;
@@ -3269,4 +3607,10 @@
}
+
+ .uni-page-modal-5601.large-mode {
+ .dv-panel-button {
+ min-height: 32px !important;
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1