From ec63534e04c68e067dcb0380e56f2e5312de24a3 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 27 九月 2024 17:18:41 +0800
Subject: [PATCH] 字典取值判断附加值还是名称
---
pages/modal/3200.vue | 1560 +++++++++++++++++++++++++++++------------------------------
1 files changed, 768 insertions(+), 792 deletions(-)
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 71ac1bf..88d33e9 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -50,10 +50,9 @@
<view v-if="item.name!='Layout'">
<text class="txt_title"
:style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
- <span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
- <!-- 鏂囨湰妗�鏁板瓧妗�-->
+ <!-- 鏂囨湰妗�鏁板瓧妗�-->
<view class="dv_input"
- v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
+ v-if="(item.name=='Input' || item.name=='InputNumber')">
<text v-if="item.setting.prefix" class="uni-icon"
:class="[item.setting.prefix]" @change="onChange(item)"></text>
<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -66,12 +65,12 @@
:class="[item.setting.suffix]" @click="onChange(item)"></text>
</view>
<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
- <uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+ <uni-data-select id="dv_select" v-if="item.name=='Select'"
:class="item.disabled?'input-disabled':''" v-model="item.value"
:localdata="item.dict" @change="onChange(item)" :disabled="item.disabled"
:clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
- <view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
+ <view class="input-wrapper" v-if="item.name=='Textarea'">
<textarea class="uni-input" :value="item.value"
:class="item.disabled?'input-disabled':''"
:placeholder="item.placeholder" @blur="onModelValue(item)"
@@ -88,6 +87,15 @@
<text>{{item.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
+ :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
+ :style="{'margin-left':'10rpx'}" @change="onModelValue(item)">
+ <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 v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
@@ -109,7 +117,6 @@
<view v-if="cols!=null">
<text class="txt_title"
:style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
- <span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
<view class="dv_input"
v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
<text v-if="cols.setting.prefix" class="uni-icon"
@@ -128,13 +135,13 @@
</view>
<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
<uni-data-select id="dv_select"
- v-if="cols.name=='Select' && !cols.disabled"
+ v-if="cols.name=='Select'"
:class="cols.disabled?'input-disabled':''" v-model="cols.value"
:localdata="cols.dict" @change="onChange(cols)"
:disabled="cols.disabled" :clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
<view class="input-wrapper"
- v-if="cols.name=='Textarea' && !cols.disabled">
+ v-if="cols.name=='Textarea'">
<textarea class="uni-input" :value="cols.value"
:class="cols.disabled?'input-disabled':''"
:placeholder="cols.placeholder" @blur="onModelValue(cols)"
@@ -151,6 +158,16 @@
<text>{{cols.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
+ :style="{'margin-left':'10rpx'}" @change="onModelValue(cols)">
+ <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="item.disabled"
@@ -193,7 +210,8 @@
<view class="view-floor">
<button type="default" @click="cancel" class="btn_cancel"
:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("close")}}</button>
- <button type="default" @click="Refresh" class="btn_refresh"
+ <button type="default" @click="Refresh" class="btn_refresh" :class="refreshing?'btn_disabled':''"
+ :disabled="refreshing"
:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("refresh")}}</button>
<view class="uni-padding-wrap" v-if="param.ListPage.Page_Button.length>0">
<view class="uni-btn-v">
@@ -209,6 +227,17 @@
<script>
import Base64 from '../../components/js-base64/base64.js'
import classUtils from "@/js/utils.js"
+ import {
+ appGetInfo,
+ dictGetInfo
+ } from "@/api/mobox.js"
+ import {
+ getUIStyleInfo,
+ runCustomEvent,
+ dataObjQuery,
+ dataObjDel
+ } from "@/api/data.js"
+
export default {
modules: {
Base64,
@@ -271,6 +300,7 @@
name: ""
}
},
+ refreshing: false
};
},
async onLoad(options) {
@@ -367,6 +397,7 @@
//鍒濆鍖� async initial(paramValue) {
+ this.refreshing = true
this.isFilter = true;
if (this.param.ShowFilter)
this.isFilter = false;
@@ -409,6 +440,7 @@
this.detail1StyleDefList = [];
await this.loadDataGetList();
}
+ this.refreshing = false
},
//婊氬姩鍒板簳閮ㄥ悗鎳掑姞杞芥暟鎹�@@ -431,139 +463,110 @@
this.old.scrollTop = e.detail.scrollTop
},
async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�- var $this = this;
- var dataInfo = {
- class_id: class_id,
- ui_style_id: style_id,
- };
- // console.log(dataInfo);
- this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
- // console.log(ret);
- if (ret.err_code == 0) {
- var styledef = "";
- if (ret.result.style_def) {
- //mobox2鐨剆tyle_def鏄痡son瀛楃涓�- styledef = ret.result.style_def.replace(/\\/g, "");
- //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�- if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
- .style_def);
- }
- $this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
- // this.form = this.head_styledef.form.model;
- // console.log($this.$data.head_styledef);
- if ($this.head_styledef.form?.items) {
- $this.head_styledef.form.items.forEach(async (ele, index) => {
- console.log(ele.useDict);
- if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
- await this.DictGetInfo(ele.bind.dict, index, 'mast');
- }
- });
-
- }
-
- } else {
- uni.showModal({
- title: this.translateSys("error") + "1",
- content: ret.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ try {
+ var $this = this;
+ var dataInfo = {
+ class_id: class_id,
+ ui_style_id: style_id,
+ };
+ // console.log(dataInfo);
+ const result = await getUIStyleInfo(dataInfo)
+ var styledef = "";
+ if (result.style_def) {
+ //mobox2鐨剆tyle_def鏄痡son瀛楃涓�+ styledef = result.style_def.replace(/\\/g, "");
+ //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+ if (!result.style_def.includes('"')) styledef = Base64.decode(result
+ .style_def);
}
- }).catch(ex => {
+ $this.$data.head_styledef = result.style_def ? JSON.parse(styledef) : {};
+ // this.form = this.head_styledef.form.model;
+ // console.log($this.$data.head_styledef);
+ if ($this.head_styledef.form?.items) {
+ $this.head_styledef.form.items.forEach(async (ele, index) => {
+ console.log(ele.useDict);
+ if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ await this.DictGetInfo(ele.bind.dict, index, 'mast');
+ }
+ });
+
+ }
+ } catch (ex) {
// console.log(ex);
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
title: this.translateSys("error") + "1.1",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
- });
+ }
},
async Detail1_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�- var $this = this;
- var dataInfo = {
- class_id: class_id,
- ui_style_id: style_id,
- };
- this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
- console.log(ret);
- if (ret.err_code == 0) {
- var styledef = "";
- if (ret.result.style_def) {
- //mobox2鐨剆tyle_def鏄痡son瀛楃涓�- styledef = ret.result.style_def.replace(/\\/g, "");
- //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�- if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
- .style_def);
- }
- $this.$data.detail1_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
- $this.$data.detail1_styledef.SelBut_Checked = false;
- // console.log($this.$data.detail1_styledef);
- // $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
- // var aa = JSON.stringify(this.detail1_styledef);
- // $this.$data.detail1StyleDefList.push(JSON.parse(aa));
- // console.log($this.$data.detail1StyleDefList);
-
- } else {
- uni.showModal({
- title: this.translateSys("error") + "2",
- content: ret.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ try {
+ var $this = this;
+ var dataInfo = {
+ class_id: class_id,
+ ui_style_id: style_id,
+ };
+ // console.log(dataInfo);
+ const result = await getUIStyleInfo(dataInfo)
+ var styledef = "";
+ if (result.style_def) {
+ //mobox2鐨剆tyle_def鏄痡son瀛楃涓�+ styledef = result.style_def.replace(/\\/g, "");
+ //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+ if (!result.style_def.includes('"')) styledef = Base64.decode(result
+ .style_def);
}
- }).catch(ex => {
+ $this.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
+ $this.$data.detail1_styledef.SelBut_Checked = false;
+ } catch (ex) {
// console.log(ex);
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
- title: this.translateSys("error") + "2.1",
- content: ex.errMsg,
+ title: this.translateSys("error") + "1.1",
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
- });
+ }
+
},
async Html_UIstyleGetInfo(class_id, style_id, paramValue) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�- var $this = this;
- var dataInfo = {
- class_id: class_id,
- ui_style_id: style_id,
- };
- this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
- // console.log(ret);
- if (ret.err_code == 0) {
- var styledef = "";
- if (ret.result.style_def) {
- //mobox2鐨剆tyle_def鏄痡son瀛楃涓�- styledef = ret.result.style_def.replace(/\\/g, "");
- //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�- if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
- .style_def);
- }
- // console.log(styledef);
- $this.ListPageHtml_Show = ret.result.style_def ? JSON.parse(styledef) : {};
- // console.log($this.ListPageHtml_Show);
-
- $this.initial(paramValue);
- } else {
- uni.showModal({
- title: this.translateSys("error") + "10",
- content: ret.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ try {
+ var $this = this;
+ var dataInfo = {
+ class_id: class_id,
+ ui_style_id: style_id,
+ };
+ // console.log(dataInfo);
+ const result = await getUIStyleInfo(dataInfo)
+ var styledef = "";
+ if (result.style_def) {
+ //mobox2鐨剆tyle_def鏄痡son瀛楃涓�+ styledef = result.style_def.replace(/\\/g, "");
+ //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+ if (!result.style_def.includes('"')) styledef = Base64.decode(result
+ .style_def);
}
- }).catch(ex => {
+ // console.log(styledef);
+ $this.ListPageHtml_Show = result.style_def ? JSON.parse(styledef) : {};
+ // console.log($this.ListPageHtml_Show);
+
+ $this.initial(paramValue);
+ } catch (ex) {
// console.log(ex);
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
- title: this.translateSys("error") + "10.1",
- content: ex.errMsg,
+ title: this.translateSys("error") + "1.1",
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
- });
-
+ }
},
async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛� this.data = [];
@@ -573,16 +576,16 @@
dict_name: dict.name
};
try {
- const success = await this.getDictInfo(dataInfo)
+ const result = await dictGetInfo(dataInfo)
if (type == 'mast') {
var list = [];
var itemName = '';
- success.result.dict_item_list.forEach((item) => {
+ (result.dict_item_list || []).forEach((item) => {
if (item.is_default == '1')
- itemName = item.name;
+ itemName = item.value ? item.value : item.name
list.push({
- text: item.value,
- value: item.name,
+ text: item.value ? item.value : item.name,
+ value: item.id,
});
});
//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
@@ -595,9 +598,6 @@
var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
$this.head_styledef = [];
$this.head_styledef = head_styledef;
- } else {
- // $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result;
- // this.$store.commit("subClassAttrList", $this.$data.subClassAttrList);
}
} catch (ex) {
// console.log(ex);
@@ -608,107 +608,6 @@
confirmText: this.translateSys("cancel")
});
}
- },
- getDictInfo(info) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�- const loginInfo = this.$store.getters.loginid
- const mobxoSApi = this.$store.getters.getMobxoSApi
- return new Promise((resolve, reject) => {
- uni.request({
- url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
- data: info,
- method: 'POST',
- dataType: "json",
- success: (_res) => {
- // console.log(_res);
- var ret = _res.data
- if (typeof ret == 'string') {
- try {
- try {
- try {
- ret = JSON.parse(ret.replace(/\\"/g, '"'));
- } catch (ex) {
- ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
- }
- } catch (ex) {
- ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
- '<br>').replace(/[\t]/g, ' '));
- }
- } catch (ex) {
- console.log(ret)
- return reject('灏唃etDictInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
- }
- }
- if (ret.err_code == 0) {
- resolve(ret);
- } else {
- reject({
- "errMsg": ret.err_msg
- });
- }
-
- if (ret.err_code == 0) {
- resolve(ret);
- } else {
- reject({
- "errMsg": ret.err_msg
- });
- }
- },
- fail: (err) => {
- // console.log(err);
- reject(err);
- }
- })
-
- })
-
- },
- getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�- const loginInfo = this.$store.getters.loginid
- const dataSApi = this.$store.getters.getDataSApi
- return new Promise((resolve, reject) => {
- uni.request({
- url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
- .session_id,
- data: info,
- method: 'POST',
- dataType: "json",
- success: (_res) => {
- // console.log(_res);
- var ret = _res.data
- if (typeof ret == 'string') {
- try {
- try {
- try {
- ret = JSON.parse(ret.replace(/\\"/g, '"'));
- } catch (ex) {
- ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
- }
- } catch (ex) {
- ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
- '<br>').replace(/[\t]/g, ' '));
- }
- } catch (ex) {
- console.log(ret)
- return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
- }
- }
- if (ret.err_code == 0) {
- resolve(ret);
- } else {
- reject({
- "errMsg": ret.err_msg || ret.errMsg
- });
- }
- },
- fail: (err) => {
- // console.log(err);
- reject(err);
- }
- })
-
- })
-
},
// 鎵ц鏌ヨ浜嬩欢
@@ -722,91 +621,73 @@
class_id: clsid,
event_id: eventid,
};
- this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
- // console.log(ret);
- if (ret.err_code == 0) {
- var result = ret.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("cancel")
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + result
- .ret,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- 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("cancel")
- });
+ var result = await runCustomEvent(dataInfo)
+ // console.log(result);
- if (result.result_type == 0 && result.action) {
- result.action.forEach(item => {
- if (item.action_type == "set_query_condition") {
- var value = item.value;
- $this.wheres = value.condition;
- $this.orderby = value.order ? value.order : $this
- .orderby;
- $this.pageindex = 1;
- $this.query_id = "";
- $this.detail1StyleDefList = [];
- $this.loadDataGetList();
- }
-
- });
- } else {
- if (result.info) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: result.info,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- }
- }
+ 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);
}
-
- } else {
uni.showModal({
- title: this.translateSys("error") + "4",
- content: ret.err_msg,
+ title: this.translateSys("tip"),
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
- }
- }).catch(ex => {
- // console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "4.1",
- content: ex.errMsg,
+ } else uni.showModal({
+ title: this.translateSys("tip"),
+ content: tip + ',' + this.translateSys('tip') + ':' + result
+ .ret,
showCancel: false,
confirmText: this.translateSys("cancel")
});
- });
+ 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("cancel")
+ });
+
+ if (result.result_type == 0 && result.action) {
+ result.action.forEach(item => {
+ if (item.action_type == "set_query_condition") {
+ var value = item.value;
+ $this.wheres = value.condition;
+ $this.orderby = value.order ? value.order : $this
+ .orderby;
+ $this.pageindex = 1;
+ $this.query_id = "";
+ $this.detail1StyleDefList = [];
+ $this.loadDataGetList();
+ }
+
+ });
+ } else {
+ if (result.info) {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: result.info,
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
+ }
+ }
+ }
}
} catch (ex) {
var tip = typeof ex == "string" ? ex : ex.message;
uni.showModal({
title: this.translateSys("error") + "4.2",
- content: this.translate("execute_query_event_failed") + this.translateSys("comma") +
+ content: this.translate("execute_query_event_failed") + this.translateSys(
+ "comma") +
tip,
showCancel: false,
confirmText: this.translateSys("cancel")
@@ -840,131 +721,133 @@
page: this.pageindex,
query_id: this.query_id,
};
- this.$store.dispatch('dataObjQuery', dataInfo).then(ret => {
- console.log(ret);
+ dataObjQuery(dataInfo).then(result => {
+ console.log(result);
uni.hideLoading();
- if (ret.err_code == 0) {
- // var list=[];
- $this.query_id = '';
- if (ret.result) {
- $this.page_count = ret.result.page_count;
- if (ret.result.page_count > 1) $this.query_id = ret.result.query_id;
- // console.log($this.ListPageHtml_Show.event);
- if ($this.ListPageHtml_Show.event.id) {
- const detail1StyleDefList = $this.detail1StyleDefList
- ret.result.obj_list.forEach((obj) => {
- var info = {
- id: obj.id,
- };
- obj.attr_list.forEach((attr) => {
- info[attr.name] = attr.value;
- });
- var detailStyle = {
- SelBut_Checked: false,
- form: {},
- info: info
- };
- detailStyle.form.htmlobjId = obj.id ? obj.id.replace(/-/g, '')
- .replace('{', '').replace('}', '') : 'null';
- detailStyle.form.objId = obj.id;
- detailStyle.form.attrs = obj.attr_list;
- detail1StyleDefList.push(detailStyle);
- // $this.activelist.push({
- // active: false
- // });
- });
- // console.log(this.detail1StyleDefList);
- $this.setData({
- detail1StyleDefList: detail1StyleDefList
- })
+ // var list=[];
+ $this.query_id = '';
+ if (result) {
+ $this.page_count = result.page_count;
+ if (result.page_count > 1) $this.query_id = result.query_id;
+ // console.log($this.ListPageHtml_Show.event);
+ if ($this.ListPageHtml_Show.event.id) {
+ const detail1StyleDefList = $this.detail1StyleDefList
+ result.obj_list.forEach((obj) => {
+ var info = {
+ id: obj.id,
+ };
+ obj.attr_list.forEach((attr) => {
+ info[attr.name] = attr.value;
+ });
+ var detailStyle = {
+ SelBut_Checked: false,
+ form: {},
+ info: info
+ };
+ detailStyle.form.htmlobjId = obj.id ? obj.id.replace(
+ /-/g, '')
+ .replace('{', '').replace('}', '') : 'null';
+ detailStyle.form.objId = obj.id;
+ detailStyle.form.attrs = obj.attr_list;
+ detail1StyleDefList.push(detailStyle);
+ // $this.activelist.push({
+ // active: false
+ // });
+ });
+ // console.log(this.detail1StyleDefList);
- var jsonlist = [];
- $this.detail1StyleDefList.forEach(attr => {
- jsonlist.push({
- id: attr.info.id,
- attrs: Object.keys(attr.info).map((a) => ({
- attr: a,
- value: attr.info[a] || "",
- }))
- });
+ $this.setData({
+ detail1StyleDefList: detail1StyleDefList
+ })
+
+ var jsonlist = [];
+ $this.detail1StyleDefList.forEach(attr => {
+ jsonlist.push({
+ id: attr.info.id,
+ attrs: Object.keys(attr.info).map((a) => ({
+ attr: a,
+ value: attr.info[a] || "",
+ }))
});
- // console.log(jsonlist);
- var data_json = Base64.encode(JSON.stringify(jsonlist));
- var eventid = $this.ListPageHtml_Show.event.id;
- if (!$this.ListPageHtml_Show.event.id.includes('{'))
- eventid = '{' + $this.ListPageHtml_Show.event.id + '}';
- //HTML椤甸潰浜嬩欢
- $this.runCustomEvent({
- ed_type: 0,
- start_transaction: true,
- class_id: $this.param.DataCls.id,
- event_id: eventid,
- data_json,
- });
- } else {
- // $this.detail1StyleDefList=[];
- const detail1StyleDefList = []
- ret.result.obj_list.forEach((obj) => {
- var styleStr = JSON.stringify($this.detail1_styledef);
- var detailStyle = JSON.parse(styleStr);
- // var info ={
- // S_ID:obj.id,
- // };
- obj.attr_list.forEach((attr) => {
- // info[attr.name]=attr.value;
- detailStyle.form.items.forEach(ele => {
- if (ele.name != 'Layout') {
- if (ele.fieldId == attr.name) ele
- .value = attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(
+ });
+ // console.log(jsonlist);
+ var data_json = Base64.encode(JSON.stringify(jsonlist));
+ var eventid = $this.ListPageHtml_Show.event.id;
+ if (!$this.ListPageHtml_Show.event.id.includes('{'))
+ eventid = '{' + $this.ListPageHtml_Show.event.id + '}';
+ //HTML椤甸潰浜嬩欢
+ $this.runCustomEvent({
+ ed_type: 0,
+ start_transaction: true,
+ class_id: $this.param.DataCls.id,
+ event_id: eventid,
+ data_json,
+ });
+ } else {
+ // $this.detail1StyleDefList=[];
+ const detail1StyleDefList = []
+ result.obj_list.forEach((obj) => {
+ var styleStr = JSON.stringify($this.detail1_styledef);
+ var detailStyle = JSON.parse(styleStr);
+ // var info ={
+ // S_ID:obj.id,
+ // };
+ obj.attr_list.forEach((attr) => {
+ // info[attr.name]=attr.value;
+ detailStyle.form.items.forEach(ele => {
+ if (ele.name != 'Layout') {
+ if (ele.fieldId == attr
+ .name) ele
+ .value = attr.value;
+ } else if (ele.name ==
+ 'Layout') {
+ ele.setting.colList
+ .forEach(
col => {
if (col) {
- if (col.fieldId ==
- attr.name) col
- .value = attr
+ if (col
+ .fieldId ==
+ attr
+ .name)
+ col
+ .value =
+ attr
.value;
}
});
- }
- });
+ }
});
-
- detailStyle.form.htmlobjId = obj.id ? obj.id.replace(/-/g, '')
- .replace('{', '').replace('}', '') : 'null';
- detailStyle.form.objId = obj.id;
- detailStyle.form.attrs = obj.attr_list;
- detail1StyleDefList.push(detailStyle);
- // $this.activelist.push({
- // active: false
- // });
- //list.push(info);
});
- $this.setData({
- detail1StyleDefList: detail1StyleDefList
- })
- }
- // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�- // $this.scrollTop = $this.old.scrollTop;
- $this.isScroll = false;
- setTimeout(function() {
- $this.isScroll = true;
- }, 1000);
- // console.log($this.detail1StyleDefList);
+ detailStyle.form.htmlobjId = obj.id ? obj.id.replace(
+ /-/g, '')
+ .replace('{', '').replace('}', '') : 'null';
+ detailStyle.form.objId = obj.id;
+ detailStyle.form.attrs = obj.attr_list;
+ detail1StyleDefList.push(detailStyle);
+ // $this.activelist.push({
+ // active: false
+ // });
+ //list.push(info);
+ });
+ $this.setData({
+ detail1StyleDefList: detail1StyleDefList
+ })
}
-
-
- } else {
- uni.showModal({
- title: this.translateSys("error") + "5",
- content: ret.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�+ // $this.scrollTop = $this.old.scrollTop;
+ $this.isScroll = false;
+ setTimeout(function() {
+ $this.isScroll = true;
+ }, 1000);
+ // console.log($this.detail1StyleDefList);
}
+
+
+
+
}).catch(ex => {
// console.log(ex);
uni.showModal({
@@ -1000,7 +883,8 @@
this.styledef = style;
var $this = this;
uni.navigateTo({
- url: '../modal/3200_view?param=' + JSON.stringify(this.param) + "&titlename=" +
+ url: '../modal/3200_view?param=' + JSON.stringify(this.param) +
+ "&titlename=" +
this.title + "&style=" + JSON.stringify(style),
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
@@ -1017,7 +901,8 @@
obj_attr[attr.name] = attr.value;
});
// console.log(obj_attr);
- var input_param = Base64.encode(JSON.stringify(obj_attr));
+ var input_param = Base64.encode(JSON.stringify(
+ obj_attr));
$this.runCustomEvent({
ed_type: 0,
start_transaction: true,
@@ -1033,7 +918,8 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys(
+ "cancel")
});
}
}
@@ -1076,7 +962,8 @@
if (btn.Prompt) {
uni.showModal({
title: this.translateSys("tip"),
- content: btn.PromptContent || this.translate("are_you_sure"),
+ content: btn.PromptContent || this.translate(
+ "are_you_sure"),
success: function(res) {
if (res.confirm) {
that.onButtonClicked(btn);
@@ -1152,7 +1039,8 @@
};
var $this = this;
uni.navigateTo({
- url: '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg.Name +
+ url: '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn
+ .Edit_dlg.Name +
"&type=addDataObj",
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
@@ -1173,7 +1061,8 @@
success: function(res) {
if (res.confirm) {
var objID = style.form.objId;
- if (!style.form.objId.includes('{')) objID = '{' + style.form.objId + '}';
+ if (!style.form.objId.includes('{')) objID = '{' + style.form
+ .objId + '}';
var dataInfo = {
class_id: btn.Cls_ID,
@@ -1181,40 +1070,37 @@
obj_id: objID
};
// console.log(dataInfo);
- $this.$store.dispatch('dataObjDel', dataInfo).then(ret => {
- // console.log(ret);
- if (ret.err_code == 0) {
- //鎵ц鍚庡鐞嗕簨浠�- $this.AfterProcess_Event(btn.clsId, btm.AfterProcess_Event,
- enviroment);
- //娓呴櫎褰撳墠鍒楄〃鏁版嵁
- $this.detail1StyleDefList.forEach((ele, index) => {
- if (ele.form.objId == objID) {
- $this.detail1StyleDefList.splice(index, 1);
- }
- });
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("delete_success"),
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- } else {
- uni.showModal({
- title: this.translateSys("error") + "6.1",
- content: ret.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- }
+ dataObjDel(dataInfo).then(ret => {
+ //鎵ц鍚庡鐞嗕簨浠�+ $this.AfterProcess_Event(btn.clsId, btm
+ .AfterProcess_Event,
+ enviroment);
+ //娓呴櫎褰撳墠鍒楄〃鏁版嵁
+ $this.detail1StyleDefList.forEach((ele,
+ index) => {
+ if (ele.form.objId == objID) {
+ $this.detail1StyleDefList
+ .splice(index, 1);
+ }
+ });
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translate(
+ "delete_success"),
+ showCancel: false,
+ confirmText: this.translateSys(
+ "cancel")
+ });
}).catch(ex => {
// console.log(ex);
uni.showModal({
- title: this.translateSys("error") + "6",
+ title: this.translateSys("error") +
+ "6",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys(
+ "cancel")
});
});
} else if (res.cancel) {
@@ -1245,7 +1131,8 @@
ele.setting.colList.forEach(async (col, key) => {
if (col) {
if (!obj_attr[col.fieldId]) {
- obj_attr[col.fieldId] = col.value;
+ obj_attr[col.fieldId] = col
+ .value;
}
}
});
@@ -1261,66 +1148,46 @@
data_obj_id: this.styledef.form.objId,
obj_attr: obj_attr,
}
- this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
- // console.log(ret);
- if (ret.err_code == 0) {
- var result = ret.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("cancel")
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- 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("cancel")
- });
-
+ var result = await runCustomEvent(dataInfo)
+ 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);
}
- } else {
uni.showModal({
- title: this.translateSys("error") + "8",
- content: ret.err_msg,
+ title: this.translateSys("tip"),
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
- }
-
- }).catch(ex => {
- // console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "8.1",
- content: ex.errMsg,
+ } else uni.showModal({
+ title: this.translateSys("tip"),
+ content: tip + ',' + this.translateSys('tip') +
+ ':' +
+ result
+ .ret,
showCancel: false,
confirmText: this.translateSys("cancel")
});
- });
+ 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("cancel")
+ });
+
+ }
} catch (ex) {
var tip = typeof ex == "string" ? ex : ex.message;
uni.showModal({
@@ -1334,95 +1201,99 @@
},
//璺宠浆
async RelatedFunction(btn, style, enviroment) {
- const defCode = btn.Related_Function?.Def_Code
- var $this = this;
- if (
- defCode == "3018" ||
- defCode == "3037" ||
- defCode == "3200" ||
- defCode == "3201" ||
- defCode == "5600" ||
- defCode == "5601" ||
- defCode == "5602"
- ) {
- let name = defCode
- if (defCode == "3018" || defCode == "3037")
- name = defCode + "_2"
- var json = {
- app_id: [btn.Related_Function.ID],
- };
- console.log("RelatedFunction2", json);
- this.$store.dispatch('appGetInfo', json).then(success => {
- console.log(success);
- if (success.err_code == 0) {
- if ((success.result || []).length > 0) {
- const app = success.result[0]
- var param = "";
- var appName = app.list_name || app.name
- .Name;
- var paramStr = app.param
- if (paramStr) {
- //mobox2鐨刾aram鏄痡son瀛楃涓�- param = paramStr.replace(/\\/g, "");
- //mobox3鐨刾aram鏄痓ase64瀛楃涓�- if (!paramStr.includes('"')) param = Base64.decode(paramStr);
- }
- if (!param) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('tip_no_app_param'),
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- return;
- }
+ try {
+ const defCode = btn.Related_Function?.Def_Code
+ var $this = this;
+ if (
+ defCode == "3018" ||
+ defCode == "3037" ||
+ defCode == "3200" ||
+ defCode == "3201" ||
+ defCode == "5600" ||
+ defCode == "5601" ||
+ defCode == "5602"
+ ) {
- uni.navigateTo({
- url: '../modal/' + name + '?param=' + param + "&titlename=" +
- appName +
- "&type=relatedFunction¶mValue=" + JSON.stringify(style
- .form),
- events: {
- relatedFunction: function(data) {
- console.log(data);
- $this.Refresh();
- },
- }
- });
- } else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate("function_not_exist"),
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ let name = defCode
+ if (defCode == "3018" || defCode == "3037")
+ name = defCode + "_2"
+ var json = {
+ app_id: [btn.Related_Function.ID],
+ };
+ console.log("RelatedFunction2", json);
+ const result = await appGetInfo(json)
+ if ((result || []).length > 0) {
+ var app = result[0];
+ var param = "";
+ var appName = app.list_name || app.name
+ .Name;
+ var paramStr = app.param
+ if (paramStr) {
+ //mobox2鐨刾aram鏄痡son瀛楃涓�+ param = paramStr.replace(/\\/g, "");
+ //mobox3鐨刾aram鏄痓ase64瀛楃涓�+ if (!paramStr.includes('"')) param = Base64.decode(
+ paramStr);
}
+ if (!param) {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translate(
+ 'tip_no_app_param'),
+ showCancel: false,
+ confirmText: this.translateSys(
+ "cancel")
+ });
+ return;
+ }
+
+ uni.navigateTo({
+ url: '../modal/' + name + '?param=' +
+ param + "&titlename=" +
+ appName +
+ "&type=relatedFunction¶mValue=" +
+ JSON.stringify(style
+ .form),
+ events: {
+ relatedFunction: function(data) {
+ console.log(data);
+ $this.Refresh();
+ },
+ }
+ });
} else {
uni.showModal({
title: this.translateSys("error"),
- content: success.msg,
+ content: this.translate(
+ "function_not_exist"),
showCancel: false,
confirmText: this.translateSys("cancel")
});
}
- }).catch(ex => {
- console.log(ex);
+
+ } else {
uni.showModal({
title: this.translateSys("error"),
- content: ex.errMsg,
+ content: this.translate("cannot_related_function"),
showCancel: false,
confirmText: this.translateSys("cancel")
});
- });
- } else {
+
+ }
+ } catch (ex) {
+ console.log(ex);
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error"),
- content: this.translate("cannot_related_function"),
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
-
+ return undefined
}
},
//鎵ц鍚庡鐞嗕簨浠�@@ -1465,7 +1336,8 @@
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� var onSuffixClickCallbackEvent = item.bind
.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�- var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�+ var onSuffixClickEvent = item.bind
+ .onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� var isflag = false;
if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�@@ -1473,7 +1345,8 @@
} else {
$this.where = '';
if (item.value)
- $this.where = item.fieldId + " like '%" + item.value + "%'";
+ $this.where = item.fieldId + " like '%" + item
+ .value + "%'";
$this.query_id = '';
$this.pageindex = 1;
$this.detail1StyleDefList = [];
@@ -1504,7 +1377,8 @@
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+ var onSuffixClickCallbackEvent = item.bind
+ .onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� var isflag = false;
@@ -1561,58 +1435,75 @@
global_attr: '',
input_param: input_param,
};
- this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
- // console.log(ret);
- if (ret.err_code == 0) {
- var result = ret.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("cancel")
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- 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"),
+ 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("cancel")
+ confirmText: this
+ .translateSys("cancel")
});
+ } else uni.showModal({
+ title: this.translateSys(
+ "tip"),
+ content: tip + ',' + this
+ .translateSys('tip') +
+ ':' +
+ result
+ .ret,
+ showCancel: false,
+ confirmText: this.translateSys(
+ "cancel")
+ });
+ 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(
+ "cancel")
+ });
- if (result.result_type == 0 && result.action) {
- result.action.forEach(item => {
- if (item.action_type == "set_dlg_attr") {
- // value = {"attr":"xxx", "value":"xxx"}
- var data = item.value;
- $this.$data.head_styledef.form.items
- .forEach(
- async (
- ele, index) => {
- data.forEach(async (ele2,
- index) => {
+ if (result.result_type == 0 && result
+ .action) {
+ result.action.forEach(item => {
+ if (item.action_type ==
+ "set_dlg_attr") {
+ // value = {"attr":"xxx", "value":"xxx"}
+ var data = item.value;
+ $this.$data
+ .head_styledef.form
+ .items
+ .forEach(
+ async (
+ ele,
+ index
+ ) => {
+ data.forEach(
+ async (ele2,
+ index
+ ) => {
if (ele
.fieldId ==
ele2
@@ -1623,36 +1514,35 @@
.value;
}
});
- });
- }
- });
- } else {
- if (result.info) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: result.info,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ });
}
+ });
+ } else {
+ if (result.info) {
+ uni.showModal({
+ title: this
+ .translateSys(
+ "tip"),
+ content: result.info,
+ showCancel: false,
+ confirmText: this
+ .translateSys(
+ "cancel")
+ });
}
}
-
- } else {
- uni.showModal({
- title: this.translateSys("error") + "8",
- content: ret.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
}
+
+
}).catch(ex => {
// console.log(ex);
uni.showModal({
- title: this.translateSys("error") + "8.1",
+ title: this.translateSys("error") +
+ "8.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys(
+ "cancel")
});
});
}
@@ -1660,10 +1550,12 @@
var tip = typeof ex == "string" ? ex : ex.message;
uni.showModal({
title: this.translateSys("error") + "8.2",
- content: this.translate('execute_after_change_event_failed') + this
+ content: this.translate(
+ 'execute_after_change_event_failed') + this
.translateSys(
"comma") +
- this.translate('reason') + this.translateSys("colon") + tip,
+ this.translate('reason') + this.translateSys(
+ "colon") + tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
@@ -1686,137 +1578,171 @@
async runCustomEvent(dataInfo) {
try {
var $this = this;
- this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
- console.log(ret);
- if (ret.err_code == 0) {
- var result = ret.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("cancel")
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') +
- ':' +
- result.ret,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- 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"),
+ 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("cancel")
+ confirmText: this
+ .translateSys("cancel")
});
+ } else uni.showModal({
+ title: this.translateSys(
+ "tip"),
+ content: tip + ',' + this
+ .translateSys('tip') +
+ ':' +
+ result.ret,
+ showCancel: false,
+ confirmText: this.translateSys(
+ "cancel")
+ });
+ 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(
+ "cancel")
+ });
- if (result.result_type == 0 && result.action) {
- result.action.forEach(item => {
- if (item.action_type ==
- "goback_to_pre_page") { //杩斿洖涓婁竴椤�- var value = item.value;
- uni.navigateBack({
- delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
- });
- } else if (item.action_type ==
- "hidden_button") { //闅愯棌鎸夐挳
- var value = item.value;
- value.forEach(btn => {
- var index = $this.param
- .ListPage
- .Page_Button
- .findIndex(button => button
- .ShowName ==
- btn)
- if (index > -1)
- $this.param.ListPage
- .Page_Button.splice(
- index, 1)
- })
- // } else if(item.action_type == "refresh_cur_row"){ //
- // var value = item.value;
- } else if (item.action_type ==
- "set_panel_html") { //鏄剧ずHtml椤甸潰
- // var value = item.value;
- $this.ListHtml_Panel = item.value;
- // $this.detail1StyleDefList.forEach((ele,index)=>{
- // ele.ListHtml_Panel = item.value[index];
- // });
+ if (result.result_type == 0 && result
+ .action) {
+ result.action.forEach(item => {
+ if (item.action_type ==
+ "goback_to_pre_page"
+ ) { //杩斿洖涓婁竴椤�+ var value = item.value;
+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ } else if (item
+ .action_type ==
+ "hidden_button"
+ ) { //闅愯棌鎸夐挳
+ var value = item.value;
+ value.forEach(btn => {
+ var index =
+ $this
+ .param
+ .ListPage
+ .Page_Button
+ .findIndex(
+ button =>
+ button
+ .ShowName ==
+ btn
+ )
+ if (index >
+ -1)
+ $this
+ .param
+ .ListPage
+ .Page_Button
+ .splice(
+ index,
+ 1)
+ })
+ // } else if(item.action_type == "refresh_cur_row"){ //
+ // var value = item.value;
+ } else if (item
+ .action_type ==
+ "set_panel_html"
+ ) { //鏄剧ずHtml椤甸潰
+ // var value = item.value;
+ $this.ListHtml_Panel =
+ item.value;
+ // $this.detail1StyleDefList.forEach((ele,index)=>{
+ // ele.ListHtml_Panel = item.value[index];
+ // });
- } else {
- uni.showModal({
- title: this.translateSys(
- "tip"),
- content: this.translateSys(
- "quotation_mark_left"
- ) +
- item
- .action_type + this
- .translateSys(
- "quotation_mark_right"
- ) +
- this
- .translate(
- "tip_action_unprocessed"
- ),
- showCancel: false,
- confirmText: this.translateSys(
- "cancel")
- });
- }
- });
- } else {
- if (result.info) {
+ } else {
uni.showModal({
- title: this.translateSys("tip"),
- content: result.info,
+ title: this
+ .translateSys(
+ "tip"
+ ),
+ content: this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ item
+ .action_type +
+ this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ this
+ .translate(
+ "tip_action_unprocessed"
+ ),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this
+ .translateSys(
+ "cancel"
+ )
});
}
+ });
+ } else {
+ if (result.info) {
+ uni.showModal({
+ title: this
+ .translateSys(
+ "tip"),
+ content: result.info,
+ showCancel: false,
+ confirmText: this
+ .translateSys(
+ "cancel")
+ });
}
}
-
- } else {
- uni.showModal({
- title: this.translateSys("error") + "9",
- content: ret.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
}
+
+
}).catch(ex => {
// console.log(ex);
uni.showModal({
- title: this.translateSys("error") + "9.1",
+ title: this.translateSys("error") +
+ "9.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys(
+ "cancel")
});
});
} catch (ex) {
var tip = typeof ex == "string" ? ex : ex.message;
uni.showModal({
title: this.translateSys("error") + "9.2",
- content: this.translate('execute_event_failed') + this.translateSys(
+ content: this.translate('execute_event_failed') +
+ this.translateSys(
"comma") +
- this.translate('reason') + this.translateSys("colon") + tip,
+ this.translate('reason') + this.translateSys(
+ "colon") + tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
@@ -1856,58 +1782,77 @@
toWhereBase64String(list) {
if (typeof list == 'string') list = [list]
var sql = []
- var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
+ var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=',
+ '>', ' like'
+ ]
list.forEach(ls => {
var where = ls.trim()
- if (where.startsWith('(') && where.endsWith(')')) where = where.replace(
- /^\(/,
- '').replace(
- /\)$/, '')
+ if (where.startsWith('(') && where.endsWith(')'))
+ where = where.replace(
+ /^\(/,
+ '').replace(
+ /\)$/, '')
if (where.toLowerCase().includes(' and ')) {
// 浜岀骇and鏀惧湪绗竴绾ф暟缁勪腑
where.split(/ and /i).forEach(li => {
var l = li.trim()
- if (l.startsWith('(') && l.endsWith(')')) l = l.replace(
+ if (l.startsWith('(') && l.endsWith(
+ ')')) l = l.replace(
/^\(/,
'').replace(
/\)$/, '')
var sep = ''
for (var i = 0; i < seps.length; i++) {
- if (l.toLowerCase().includes(seps[i])) {
+ if (l.toLowerCase().includes(seps[
+ i])) {
sep = seps[i]
break
}
}
if (sep) {
- var values = l.split(new RegExp(sep, 'i'))
- var field = values[0]?.trim().replace(/^\[/, '')
+ var values = l.split(new RegExp(
+ sep, 'i'))
+ var field = values[0]?.trim()
+ .replace(/^\[/, '')
.replace(
/\]$/, '')
var value = ''
var op = sep.trim()
- if ([' in', ' not in'].includes(sep) && values[1]
+ if ([' in', ' not in'].includes(
+ sep) && values[1]
?.toLowerCase().includes(
- 'select ') && values[1]?.toLowerCase()
+ 'select ') && values[1]
+ ?.toLowerCase()
.includes(
' from ')) {
- value = l.replace(field, '').replace(
- /^\s*(in|not in)\s*/i, '').trim()
- if (value.startsWith('(') && value.endsWith(')'))
+ value = l.replace(field, '')
+ .replace(
+ /^\s*(in|not in)\s*/i,
+ '').trim()
+ if (value.startsWith('(') &&
+ value.endsWith(')'))
value = value
- .replace(/^\(/, '').replace(/\)$/, '').trim()
+ .replace(/^\(/, '')
+ .replace(/\)$/, '').trim()
} else {
- value = values[1]?.trim().replace(/^\'/, '')
+ value = values[1]?.trim()
+ .replace(/^\'/, '')
.replace(
/\'$/, '')
- if (['in', 'not in'].includes(op)) {
- value = value.replace(/^\(/, '').replace(/\)$/,
+ if (['in', 'not in'].includes(
+ op)) {
+ value = value.replace(
+ /^\(/, '').replace(
+ /\)$/,
'')
- value = value.split(',').map(v => v.trim()
- .replace(
- /^\'/, '')
- .replace(/\'$/, ''))
+ value = value.split(',')
+ .map(v => v.trim()
+ .replace(
+ /^\'/, '')
+ .replace(/\'$/, '')
+ )
}
}
sql.push([{
@@ -1922,47 +1867,63 @@
var s = []
where.split(/ or /i).forEach(li => {
var l = li.trim()
- if (l.startsWith('(') && l.endsWith(')')) l = l.replace(
+ if (l.startsWith('(') && l.endsWith(
+ ')')) l = l.replace(
/^\(/,
'').replace(
/\)$/, '')
var sep = ''
for (var i = 0; i < seps.length; i++) {
- if (l.toLowerCase().includes(seps[i])) {
+ if (l.toLowerCase().includes(seps[
+ i])) {
sep = seps[i]
break
}
}
if (sep) {
- var values = l.split(new RegExp(sep, 'i'))
- var field = values[0]?.trim().replace(/^\[/, '')
+ var values = l.split(new RegExp(
+ sep, 'i'))
+ var field = values[0]?.trim()
+ .replace(/^\[/, '')
.replace(
/\]$/, '')
var value = ''
var op = sep.trim()
- if ([' in', ' not in'].includes(sep) && values[1]
+ if ([' in', ' not in'].includes(
+ sep) && values[1]
?.toLowerCase().includes(
- 'select ') && values[1]?.toLowerCase()
+ 'select ') && values[1]
+ ?.toLowerCase()
.includes(
' from ')) {
- value = l.replace(field, '').replace(
- /^\s*(in|not in)\s*/i, '').trim()
- if (value.startsWith('(') && value.endsWith(')'))
+ value = l.replace(field, '')
+ .replace(
+ /^\s*(in|not in)\s*/i,
+ '').trim()
+ if (value.startsWith('(') &&
+ value.endsWith(')'))
value = value
- .replace(/^\(/, '').replace(/\)$/, '').trim()
+ .replace(/^\(/, '')
+ .replace(/\)$/, '').trim()
} else {
- value = values[1]?.trim().replace(/^\'/, '')
+ value = values[1]?.trim()
+ .replace(/^\'/, '')
.replace(
/\'$/, '')
- if (['in', 'not in'].includes(op)) {
- value = value.replace(/^\(/, '').replace(/\)$/,
+ if (['in', 'not in'].includes(
+ op)) {
+ value = value.replace(
+ /^\(/, '').replace(
+ /\)$/,
'')
- value = value.split(',').map(v => v.trim()
- .replace(
- /^\'/, '')
- .replace(/\'$/, ''))
+ value = value.split(',')
+ .map(v => v.trim()
+ .replace(
+ /^\'/, '')
+ .replace(/\'$/, '')
+ )
}
}
sql.push([{
@@ -1977,7 +1938,8 @@
var li = where
// 鍗曚竴鏌ヨ鏉′欢鐩存帴鏀惧湪绗竴绾ф暟缁勪腑
var l = li.trim()
- if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '')
+ if (l.startsWith('(') && l.endsWith(')')) l = l
+ .replace(/^\(/, '')
.replace(
/\)$/, '')
var sep = ''
@@ -1989,24 +1951,32 @@
}
if (sep) {
var values = l.split(new RegExp(sep, 'i'))
- var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
+ var field = values[0]?.trim().replace(/^\[/,
+ '').replace(/\]$/, '')
var value = ''
var op = sep.trim()
- if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase()
+ if ([' in', ' not in'].includes(sep) && values[
+ 1]?.toLowerCase()
.includes('select ') &&
- values[1]?.toLowerCase().includes(' from ')) {
- value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '')
+ values[1]?.toLowerCase().includes(' from ')
+ ) {
+ value = l.replace(field, '').replace(
+ /^\s*(in|not in)\s*/i, '')
.trim()
- if (value.startsWith('(') && value.endsWith(')')) value = value
+ if (value.startsWith('(') && value
+ .endsWith(')')) value = value
.replace(/^\(/, '')
.replace(/\)$/, '').trim()
} else {
- value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
+ value = values[1]?.trim().replace(/^\'/,
+ '').replace(/\'$/, '')
if (['in', 'not in'].includes(op)) {
- value = value.replace(/^\(/, '').replace(/\)$/, '')
- value = value.split(',').map(v => v.trim().replace(/^\'/,
+ value = value.replace(/^\(/, '')
+ .replace(/\)$/, '')
+ value = value.split(',').map(v => v
+ .trim().replace(/^\'/,
'')
.replace(/\'$/,
''))
@@ -2165,6 +2135,7 @@
vertical-align: middle;
}
+
.dv-panel-buticon a i {
font-size: 38rpx;
}
@@ -2276,6 +2247,11 @@
margin-right: 20rpx;
}
+ button.btn_disabled {
+ background-color: #ddd;
+ color: #888;
+ }
+
.bk-active {
background-color: #D6FCB2;
}
--
Gitblit v1.9.1