From d84283821bb08d81d887f20a7118caf25b8b2714 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期二, 27 八月 2024 18:29:10 +0800
Subject: [PATCH] 判断接口返回值是否是字符串，然后解析
---
pages/modal/5602.vue | 976 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 649 insertions(+), 327 deletions(-)
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index e5cdb95..5f3b6f3 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -17,14 +17,15 @@
v-model="item.value" :localdata="item.dict" @change="onEnterChange(item)" :readonly="item.disabled"
:clear-icon="false" :popup-title="item.label"></uni-data-picker>
- <view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
+ <view class="input-wrapper" :style="{'width':`calc(96% - ${item.labelWidth}px)`}"
+ v-if="item.name=='Input' || item.name=='InputNumber'">
<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
@click="onEnterChange(item)"></text>
<input class="uni-input" :class="item.disabled?'input-disabled':''"
:type="item.name=='Input'?'text':'number'" v-model="item.value" :disabled="item.disabled"
:placeholder="item.placeholder"
:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
- :focus="focusFieldId == item.fieldId" @focus="ontap(index,item)"
+ :focus="focusFieldId == item.fieldId" @focus="ontap(index,item)" @click="onClick(item)"
@keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)" />
<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
@click="onEnterChange(item)"></text>
@@ -47,56 +48,59 @@
<view class="view-tab-content" id="tabpanel">
<image class="logo" v-if="detail1StyleDefList.length==0"
src="../../images/mobox_log_200x40.png"></image>
- <div class="dv-panel" v-for="(style,ii) in detail1StyleDefList" @tap="onPanelClick(ii)"
- :id="'tabpanel'+style.form.htmlobjId"
- :class="style.form.htmlobjId==active_id?'bk-active':activelist[ii].active==true?'bk-active':''">
- <div class="dv-panel-input">
- <div class="dv-input" v-for="(item,index) in style.form.items">
- <!-- 鏅�甯冨眬 -->
- <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>
- <input class="uni-input" v-if="!item.disabled"
- :type="item.name=='InputNumber'?'number':'text'" :value="item.value"
- :disabled="item.disabled" :placeholder="item.placeholder" />
- </view>
- <!-- 鏍呮牸甯冨眬 -->
- <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
- <uni-col v-for="(cols,key) in item.setting.colList"
- :span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
- <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>
- <input class="uni-input" v-if="!cols.disabled"
- :type="cols.name=='InputNumber'?'number':'text'"
- :value="cols.value" :disabled="cols.disabled"
- :placeholder="cols.placeholder" />
- </view>
- </uni-col>
- </uni-row>
+ <checkbox-group @change="checkboxChange">
+ <div class="dv-panel" v-for="(style,ii) in detail1StyleDefList"
+ @tap="onPanelClick(ii)" :id="'tabpanel'+style.form.htmlobjId"
+ :class="style.form.htmlobjId==active_id?'bk-active':activelist[ii].active==true?'bk-active':''">
+ <div class="dv-panel-input">
+ <div class="dv-input" v-for="(item,index) in style.form.items">
+ <!-- 鏅�甯冨眬 -->
+ <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>
+ <input class="uni-input" v-if="!item.disabled"
+ :type="item.name=='InputNumber'?'number':'text'"
+ v-model="item.value" :disabled="item.disabled"
+ :placeholder="item.placeholder" />
+ </view>
+ <!-- 鏍呮牸甯冨眬 -->
+ <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
+ <uni-col v-for="(cols,key) in item.setting.colList"
+ :span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
+ <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>
+ <input class="uni-input" v-if="!cols.disabled"
+ :type="cols.name=='InputNumber'?'number':'text'"
+ v-model="cols.value" :disabled="cols.disabled"
+ :placeholder="cols.placeholder" />
+ </view>
+ </uni-col>
+ </uni-row>
+ </div>
+ </div>
+ <div class="dv-panel-button">
+
+ <checkbox v-if="param.Sub_Page[0].Select_Button==true" :value="ii"
+ :checked="style.SelBut_Checked" />
+ <!-- <text></text> -->
+
+ <!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> -->
+ <button type="warn" @tap="delItem(ii)"
+ v-if="param.Sub_Page[0].Del_Button==true">{{translateSys('delete')}}</button>
</div>
</div>
- <div class="dv-panel-button">
- <checkbox-group v-if="param.Sub_Page[0].Select_Button==true">
- <label>
- <checkbox :value="style.SelBut_Checked"
- :checked="style.SelBut_Checked" />
- <!-- <text></text> -->
- </label>
- </checkbox-group>
- <!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> -->
- <button type="warn" @tap="delItem(ii)"
- v-if="param.Sub_Page[0].Del_Button==true">鍒犻櫎</button>
- </div>
- </div>
+ </checkbox-group>
</view>
<view v-if="param.Sub_Page[0].OK_Button==true">
<button type="default" @tap="cancel"
class="btn_cancel">{{translateSys('cancel')}}</button>
- <button type="primary" @tap="ok" class="btn_add">{{translateSys('ok')}}</button>
+ <button type="primary" @tap="ok" class="btn_add" :class="okLoading?'btn_disabled':''"
+ :disabled="okLoading">{{translateSys('ok')}}</button>
</view>
</view>
</swiper-item>
@@ -106,46 +110,47 @@
<view class="view-tab-content">
<image class="logo" v-if="detail2StyleDefList.length==0"
src="../../images/mobox_log_200x40.png"></image>
- <div class="dv-panel" v-for="(style,ii) in detail2StyleDefList">
- <div class="dv-panel-input">
- <div v-for="(item,index) in style.form.items">
- <!-- 鏅�甯冨眬 -->
- <view v-if="item.name!='Layout'">
- <text class="txt_title"
- :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
- <span class="form-item-span">{{item.value}}</span>
- </view>
- <!-- 鏍呮牸甯冨眬 -->
- <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
- <uni-col :span="24 / item.setting.col"
- v-for="(cols,key) in item.setting.colList">
- <view v-if="cols!=null">
- <text class="txt_title"
- :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
- <span class="form-item-span">{{cols.value}}</span>
- </view>
- </uni-col>
- </uni-row>
+ <checkbox-group @change="checkboxChange2">
+ <div class="dv-panel" v-for="(style,ii) in detail2StyleDefList">
+ <div class="dv-panel-input">
+ <div v-for="(item,index) in style.form.items">
+ <!-- 鏅�甯冨眬 -->
+ <view v-if="item.name!='Layout'">
+ <text class="txt_title"
+ :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
+ <span class="form-item-span">{{item.value}}</span>
+ </view>
+ <!-- 鏍呮牸甯冨眬 -->
+ <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
+ <uni-col :span="24 / item.setting.col"
+ v-for="(cols,key) in item.setting.colList">
+ <view v-if="cols!=null">
+ <text class="txt_title"
+ :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
+ <span class="form-item-span">{{cols.value}}</span>
+ </view>
+ </uni-col>
+ </uni-row>
+ </div>
+ </div>
+ <div class="dv-panel-button">
+
+ <checkbox v-if="param.Sub_Page[1].Select_Button==true" :value="ii"
+ :checked="style.SelBut_Checked" />
+ <!-- <text></text> -->
+
+ <!-- <button type="primary" @click="savaDataObj(style,ii)" v-if="param.Sub_Page[1].OK_Button==true">淇濆瓨</Button> -->
+ <button type="warn" @tap="delDataObj(style,ii)"
+ v-if="param.Sub_Page[1].Del_Button==true">{{translateSys('delete')}}</button>
</div>
</div>
- <div class="dv-panel-button">
- <checkbox-group v-if="param.Sub_Page[1].Select_Button==true">
- <label>
- <checkbox :value="style.SelBut_Checked"
- :checked="style.SelBut_Checked" />
- <!-- <text></text> -->
- </label>
- </checkbox-group>
- <!-- <button type="primary" @click="savaDataObj(style,ii)" v-if="param.Sub_Page[1].OK_Button==true">淇濆瓨</Button> -->
- <button type="warn" @tap="delDataObj(style,ii)"
- v-if="param.Sub_Page[1].Del_Button==true">{{translateSys('delete')}}</button>
- </div>
- </div>
+ </checkbox-group>
</view>
<view v-if=" param.Sub_Page[1].OK_Button==true">
<button type="default" @tap="cancel"
class="btn_cancel">{{translateSys('cancel')}}</button>
- <button type="primary" @tap="ok2" class="btn_add">{{translateSys('ok')}}</button>
+ <button type="primary" @tap="ok2" class="btn_add" :class="ok2Loading?'btn_disabled':''"
+ :disabled="ok2Loading">{{translateSys('ok')}}</button>
</view>
</view>
</swiper-item>
@@ -183,8 +188,8 @@
data() {
return {
title: this.translateSys("sorting"),
- ClsID: "Sorting_Detail",
- ClsID2: "Sorting_Result",
+ ClsID: "Distribution_CNTR_Detail",
+ ClsID2: "Picking_Result",
param: {},
focusFieldId: "",
focusOldFieldId: "",
@@ -208,6 +213,8 @@
items: [],
active_id: '',
activelist: [],
+ okLoading: false,
+ ok2Loading: false,
};
},
onLoad(options) {
@@ -218,22 +225,7 @@
this.$data.title = options.titlename;
this.$data.param = JSON.parse(options.param);
// console.log(this.$data.param);
- //鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�- this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
-
- //鍔犺浇鍒濆鐣岄潰
- if (this.$data.param.Show_Welcom_Page) {
- this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
- this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
- this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
- }
- //鍔犺浇Tab椤电
- this.$data.items.push(this.$data.param.Sub_Page[0].Name);
- this.$data.items.push(this.$data.param.Sub_Page[1].Name);
- this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
- this.Detail2_UIstyleGetInfo(this.ClsID2, this.$data.param.Sub_Page[1].UI_Style.ID);
-
- console.log(this.$data.param);
+ this.loadData(options.paramValue)
},
methods: {
setData: function(obj) {
@@ -257,12 +249,81 @@
});
});
},
+
+ async loadData(paramValue) {
+ //鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�+ await this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
+ //浼犲叆鍙傛暟鍊�+ if (paramValue) {
+ const attrs = paramValue.attrs || [];
+ (this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+ if (ele.name != "Layout") {
+ attrs.forEach(async (ele2, index2) => {
+ if (ele.fieldId == ele2.name) {
+ ele.value = ele2.value;
+ }
+ });
+ } else {
+ ele.setting.colList.forEach(async (col) => {
+ if (col) {
+ attrs.forEach(async (ele2,
+ index2) => {
+ if (col.fieldId == ele2.name) {
+ col.value = ele2.value;
+ }
+ });
+ }
+ });
+ }
+ })
+ }
+
+ //鍔犺浇鍒濆鐣岄潰
+ if (this.$data.param.Show_Welcom_Page) {
+ this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
+ this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
+ this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
+ }
+ //鍔犺浇Tab椤电
+ this.$data.items.push(this.$data.param.Sub_Page[0].Name);
+ this.$data.items.push(this.$data.param.Sub_Page[1].Name);
+ await this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
+ await this.Detail2_UIstyleGetInfo(this.ClsID2, this.$data.param.Sub_Page[1].UI_Style.ID);
+
+
+ console.log(this.$data.param);
+ },
changeSwiper(evt) {
let index = evt.target.current || evt.detail.current;
this.setData({
current: index
})
},
+ checkboxChange(e) {
+ var items = this.detail1StyleDefList
+ var values = e.detail.value;
+ for (var i = 0, lenI = items.length; i < lenI; ++i) {
+ const item = items[i]
+ if (values.includes(i)) {
+ item.SelBut_Checked = true
+ } else {
+ item.SelBut_Checked = false
+ }
+ }
+ },
+ checkboxChange2(e) {
+ var items = this.detail2StyleDefList
+ var values = e.detail.value;
+ for (var i = 0, lenI = items.length; i < lenI; ++i) {
+ const item = items[i]
+ if (values.includes(i)) {
+ item.SelBut_Checked = true
+ } else {
+ item.SelBut_Checked = false
+ }
+ }
+ },
+
async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮� var $this = this;
var dataInfo = {
@@ -283,18 +344,21 @@
$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
// this.form = this.head_styledef.form.model;
// console.log($this.$data.head_styledef);
- $this.head_styledef.form.items.forEach(async (ele, index) => {
- if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
- await this.DictGetInfo(ele.bind.dict, index, 'mast');
- }
- if ($this.focusFieldId == "") {
- if (ele.name == 'Input' || ele.name == 'InputNumber') {
- $this.setData({
- focusFieldId: ele.fieldId
- })
+ if ($this.head_styledef.form?.items) {
+ $this.head_styledef.form.items.forEach(async (ele, index) => {
+ if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ await this.DictGetInfo(ele.bind.dict, index, 'mast');
}
- }
- });
+ if ($this.focusFieldId == "") {
+ if (ele.name == 'Input' || ele.name == 'InputNumber') {
+ $this.setData({
+ focusFieldId: ele.fieldId
+ })
+ }
+ }
+ });
+
+ }
} else {
uni.showModal({
title: this.translateSys("error") + "1",
@@ -305,9 +369,10 @@
}
}).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")
});
@@ -338,11 +403,13 @@
// var aa = JSON.stringify(this.detail1_styledef);
// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
// console.log($this.$data.detail1StyleDefList);
- $this.detail1_styledef.form.items.forEach(async (ele, index) => {
- if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
- await this.DictGetInfo(ele.bind.dict, index, 'sub');
- }
- });
+ if ($this.detail1_styledef.form?.items) {
+ $this.detail1_styledef.form.items.forEach(async (ele, index) => {
+ if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ await this.DictGetInfo(ele.bind.dict, index, 'sub');
+ }
+ });
+ }
} else {
uni.showModal({
title: this.translateSys("error") + "2",
@@ -353,9 +420,10 @@
}
}).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,
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
@@ -393,9 +461,10 @@
}
}).catch(ex => {
// console.log(ex);
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
title: this.translateSys("error") + "3.1",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
@@ -410,53 +479,47 @@
dict_name: dict.name
};
// console.log(dataInfo);
- this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => {
- // console.log(success);
- if (success.err_code == 0) {
- var list = [];
- var itemName = '';
- success.result.dict_item_list.forEach((item) => {
- if (item.is_default == '1')
- itemName = item.name;
- list.push({
- text: item.value,
- value: item.name,
- });
+ try {
+ const res = await this.getDictInfo(dataInfo)
+ var list = [];
+ var itemName = '';
+ res.result.dict_item_list.forEach((item) => {
+ if (item.is_default == '1')
+ itemName = item.name;
+ list.push({
+ text: item.value,
+ value: item.name,
});
-
- if (type == 'mast') { //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
- if (itemName) {
- $this.head_styledef.form.items[index].value = itemName;
- var attr = $this.head_styledef.form.items[index].fieldId;
- $this.head_styledef.form.model[attr] = itemName;
- }
- $this.head_styledef.form.items[index].dict = list;
- var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
- $this.head_styledef = [];
- $this.head_styledef = head_styledef;
- // console.log($this.$data.detail1StyleDefList);
- } else {
- if (itemName) {
- $this.detail1_styledef.form.items[index].value = itemName;
- var attr = $this.detail1_styledef.form.items[index].fieldId;
- $this.detail1_styledef.form.model[attr] = itemName;
- }
- $this.detail1_styledef.form.items[index].dict = list;
- var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
- $this.detail1_styledef = [];
- $this.detail1_styledef = detail1_styledef;
- // console.log($this.$data.detail1_styledef);
+ });
+ //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+ if (type == 'mast') { //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+ if (itemName) {
+ $this.head_styledef.form.items[index].value = itemName;
+ var attr = $this.head_styledef.form.items[index].fieldId;
+ $this.head_styledef.form.model[attr] = itemName;
}
-
+ $this.head_styledef.form.items[index].dict = list;
+ var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
+ $this.head_styledef = [];
+ $this.head_styledef = head_styledef;
+ // console.log($this.head_styledef);
} else {
- uni.showModal({
- title: this.translateSys("error") + "9.1",
- content: success.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ if (itemName) {
+ $this.detail1_styledef.form.items[index].value = itemName;
+ var attr = $this.detail1_styledef.form.items[index].fieldId;
+ $this.detail1_styledef.form.model[attr] = itemName;
+ }
+ $this.detail1_styledef.form.items[index].dict = list;
+ var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
+ $this.detail1_styledef = [];
+ $this.detail1_styledef = detail1_styledef;
+ // console.log($this.$data.detail1_styledef);
}
- }).catch(ex => {
+
+
+ // $this.head_styledef.form.items[index].dictitem=success.result;
+ // this.$store.commit("classAttrList", $this.$data.classAttrList);
+ } catch (ex) {
// console.log(ex);
uni.showModal({
title: this.translateSys("error") + "9",
@@ -464,9 +527,113 @@
showCancel: false,
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);
+ }
+ })
+
+ })
+
},
+ onClick(item) {
+ this.focusFieldId = item.fieldId
+ },
ontap(index, item) { //鎵爜鍔熻兘
// var $ele = e;
this.focusOldFieldId = item.fieldId
@@ -477,7 +644,7 @@
var $this = this;
console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value && item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
@@ -489,21 +656,66 @@
if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠� $this.onChange(onChangeEvent);
}
- if (item.value) { //杈撳叆妗嗕笉涓虹┖
+ if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌� //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
- const curIndex = $this.head_styledef.form.items.findIndex((ele, index2, arr) => {
- return (ele.name == 'Input' || ele.name == 'InputNumber') && index2 >
- index;
- })
- if (curIndex > -1) {
- $this.setData({
- focusFieldId: $this.head_styledef.form.items[curIndex].fieldId
- })
+ var findd = false
+ for (let i in $this.head_styledef.form.items) {
+ const ele = $this.head_styledef.form.items[i]
+
+ if (ele.name != "Layout") {
+ if (ele.name == 'Input' || ele.name == 'InputNumber') {
+ if (attr == ele.fieldId) {
+ findd = true
+ } else {
+ if (findd) {
+ $this.setData({
+ focusFieldId: ele.fieldId
+ })
+ break
+ }
+
+ }
+
+ }
+ } else {
+ if (findd) {
+ let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
+ return (col.name == 'Input' || col.name == 'InputNumber');
+ })
+ if (curIndex > -1) {
+ $this.setData({
+ focusFieldId: ele.setting.colList[curIndex]
+ .fieldId
+ })
+ break
+ }
+
+ } else {
+ let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
+ return attr == col.fieldId;
+ })
+ if (curIndex > -1) {
+ findd = true
+ let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
+ return (col.name == 'Input' || col.name ==
+ 'InputNumber') &&
+ index2 >
+ curIndex;
+ })
+ if (curIndex2 > -1) {
+ $this.setData({
+ focusFieldId: ele.setting.colList[curIndex]
+ .fieldId
+ })
+ break
+ }
+ }
+ }
+
+ }
}
- // setTimeout(function(){
- // uni.hideKeyboard();
- // },1000);
}
+
// if(onSuffixClickCallbackEvent.id){ //鍚庡浘鏍囩偣鍑讳簨浠� // this.onSuffixClick(onSuffixClickCallbackEvent);
// }
@@ -515,7 +727,7 @@
},
onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
// console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value && item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
@@ -655,13 +867,18 @@
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) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- else uni.showModal({
+ 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,
@@ -700,7 +917,7 @@
this.translateSys(
"quotation_mark_left") + value
.page_name + this.translateSys(
- "sys.quotation_mark_right") +
+ "quotation_mark_right") +
this.translate(
"are_you_sure_clear_last"),
@@ -834,8 +1051,34 @@
data.forEach(async (ele2, index) => {
if (ele.fieldId == ele2
.attr) {
+ if (ele.name ==
+ 'Select' &&
+ ele2
+ .choice_list) {
+ const
+ dictItemList = [];
+ const
+ choiceList =
+ ele2
+ .choice_list ||
+ [];
+ for (let d in
+ choiceList) {
+ const val =
+ choiceList[
+ d];
+ dictItemList
+ .push({
+ text: val,
+ value: val
+ });
+ }
+ ele.dict =
+ dictItemList;
+ }
ele.value = ele2
.value;
+
}
});
});
@@ -864,9 +1107,10 @@
}
}).catch(ex => {
// console.log(ex);
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
title: this.translateSys("error") + "4.1",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
@@ -959,48 +1203,53 @@
if (JSON.stringify(data.row) == '{}') {
return;
}
- data.row.forEach(row => {
- var styleStr = JSON.stringify(this.$data.detail1_styledef);
- if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
- styleStr = JSON.stringify(this.$data.detail2_styledef);
- } else {
- if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
- styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷�- }
+ var styleStr = JSON.stringify(this.$data.detail1_styledef);
+ if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
+ styleStr = JSON.stringify(this.$data.detail2_styledef);
+ } else {
+ if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+ styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷� }
- var detailStyle = JSON.parse(styleStr);
- detailStyle.form.objId = row.id;
- detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace('}',
- '') : 'null';
- detailStyle.form.attrs = row.attrs;
- row.attrs.forEach(attr => {
- detailStyle.form.items.forEach(ele => {
- if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr) ele.value = attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == attr.attr) col.value = attr
- .value;
- }
- });
- }
- });
- });
+ }
+ data.row.forEach(row => {
- if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
- this.$data.detail2StyleDefList.push(detailStyle);
- // console.log(this.$data.detail2StyleDefList);
- } else {
- if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+ var detailStyle = JSON.parse(styleStr);
+ if (detailStyle.form) {
+ detailStyle.form.objId = row.id;
+ detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace(
+ '}',
+ '') : 'null';
+ detailStyle.form.attrs = row.attrs;
+ row.attrs.forEach(attr => {
+ detailStyle.form.items.forEach(ele => {
+ if (ele.name != 'Layout') {
+ if (ele.fieldId == attr.attr) ele.value = attr.value;
+ } else if (ele.name == 'Layout') {
+ ele.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == attr.attr) col.value = attr
+ .value;
+ }
+ });
+ }
+ });
+ });
+
+ if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
this.$data.detail2StyleDefList.push(detailStyle);
// console.log(this.$data.detail2StyleDefList);
} else {
- this.$data.detail1StyleDefList.push(detailStyle);
- this.activelist.push({
- active: false
- });
- // console.log(this.$data.detail1StyleDefList);
+ if (data.page_name == this.$data.param.Sub_Page[1]
+ .Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+ this.$data.detail2StyleDefList.push(detailStyle);
+ // console.log(this.$data.detail2StyleDefList);
+ } else {
+ this.$data.detail1StyleDefList.push(detailStyle);
+ this.activelist.push({
+ active: false
+ });
+ // console.log(this.$data.detail1StyleDefList);
+ }
}
}
});
@@ -1017,95 +1266,103 @@
if (JSON.stringify(data.content) == '{}') {
return;
}
+ var styleStr = JSON.stringify($this.$data.detail2_styledef); //宸插垎鎷�+ if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+ styleStr = JSON.stringify($this.$data.detail1_styledef); //寰呭垎鎷�+ }
data.content.forEach(cont => {
- var styleStr = JSON.stringify($this.$data.detail2_styledef); //宸插垎鎷�- if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
- styleStr = JSON.stringify($this.$data.detail1_styledef); //寰呭垎鎷�- }
+
var detailStyle = JSON.parse(styleStr);
- detailStyle.SelBut_Checked = data.checkbox ?? true;
- detailStyle.form.objId = cont.id;
- detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '').replace('{', '').replace('}',
- '') : 'null';
- detailStyle.form.attrs = cont.attrs;
- cont.attrs.forEach(attr => {
- detailStyle.form.items.forEach(ele => {
- if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr) ele.value = attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == attr.attr) col.value = attr
- .value;
+ if (detailStyle.form) {
+ detailStyle.SelBut_Checked = data.checkbox ?? true;
+ detailStyle.form.objId = cont.id;
+ detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '').replace('{', '').replace(
+ '}',
+ '') : 'null';
+ detailStyle.form.attrs = cont.attrs;
+ cont.attrs.forEach(attr => {
+ detailStyle.form.items.forEach(ele => {
+ if (ele.name != 'Layout') {
+ if (ele.fieldId == attr.attr) ele.value = attr.value;
+ } else if (ele.name == 'Layout') {
+ ele.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == attr.attr) col.value = attr
+ .value;
+ }
+ });
+ }
+ });
+ });
+
+ if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+ //濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+ if (data.clear == false) {
+ var isflag = true;
+ $this.detail1StyleDefList.forEach((style, index) => {
+ if (style.form.objId == detailStyle.form.objId) {
+ cont.attrs.forEach(attr => {
+ style.form.items.forEach(ele => {
+ if (ele.name != 'Layout') {
+ if (ele.fieldId == attr.attr) ele
+ .value =
+ attr.value;
+ } else if (ele.name == 'Layout') {
+ ele.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == attr
+ .attr) col.value =
+ attr
+ .value;
+ }
+ });
+ }
+ });
+ });
+ isflag = false;
}
});
+ if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+ } else {
+ $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷� }
- });
- });
-
- if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
- //濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�- if (data.clear == false) {
- var isflag = true;
- $this.detail1StyleDefList.forEach((style, index) => {
- if (style.form.objId == detailStyle.form.objId) {
- cont.attrs.forEach(attr => {
- style.form.items.forEach(ele => {
- if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr) ele.value =
- attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == attr
- .attr) col.value = attr
- .value;
- }
- });
- }
- });
- });
- isflag = false;
- }
+ $this.activelist.push({
+ active: false
});
- if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+ // console.log($this.$data.detail1StyleDefList);
} else {
- $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�- }
- $this.activelist.push({
- active: false
- });
- // console.log($this.$data.detail1StyleDefList);
- } else {
- if (data.clear == false) {
- //濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�- var isflag = true;
- $this.detail2StyleDefList.forEach((style, index) => {
- if (style.form.objId == detailStyle.form.objId) {
- cont.attrs.forEach(attr => {
- style.form.items.forEach(ele => {
- if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr) ele.value =
- attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == attr
- .attr) col.value = attr
- .value;
- }
- });
- }
+ if (data.clear == false) {
+ //濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+ var isflag = true;
+ $this.detail2StyleDefList.forEach((style, index) => {
+ if (style.form.objId == detailStyle.form.objId) {
+ cont.attrs.forEach(attr => {
+ style.form.items.forEach(ele => {
+ if (ele.name != 'Layout') {
+ if (ele.fieldId == attr.attr) ele
+ .value =
+ attr.value;
+ } else if (ele.name == 'Layout') {
+ ele.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == attr
+ .attr) col.value =
+ attr
+ .value;
+ }
+ });
+ }
+ });
});
- });
- isflag = false;
- }
- });
- if (isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�- } else {
- $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+ isflag = false;
+ }
+ });
+ if (isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+ } else {
+ $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+ }
+ // console.log($this.$data.detail2StyleDefList);
}
- // console.log($this.$data.detail2StyleDefList);
}
});
},
@@ -1177,9 +1434,10 @@
}
}).catch(ex => {
// console.log(ex);
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
title: this.translateSys("error") + "5.1",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
@@ -1253,6 +1511,15 @@
})
});
});
+ if (jsonlist.length == 0) {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translate("tip_no_select_data"),
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
+ return;
+ }
// console.log(jsonlist);
const list = []
list.push({
@@ -1325,6 +1592,15 @@
})
});
});
+ if (jsonlist.length == 0) {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translate("tip_no_select_data"),
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
+ return;
+ }
const list = []
list.push({
page_name: $this.param.Sub_Page[1].Name,
@@ -1359,21 +1635,23 @@
},
sava(event) {
var $this = this;
+
if (this.$data.detail1StyleDefList.length == 0) {
uni.showModal({
title: this.translateSys("tip"),
content: this.translate(
- "page.tip_no_data_first") +
+ "tip_no_data_first") +
this.translateSys(
"quotation_mark_left") + this.param.Sub_Page[0].Name + this.translateSys(
- "sys.quotation_mark_right") +
+ "quotation_mark_right") +
this.translate(
- "page.tip_no_data_last"),
+ "tip_no_data_last"),
showCancel: false,
confirmText: this.translateSys("cancel")
});
return false;
}
+ this.okLoading = true
//鑾峰彇琛ㄥご灞炴�
var head_attr = {};
this.$data.head_styledef.form.items.forEach(item => {
@@ -1440,6 +1718,16 @@
})
});
});
+ if (jsonlist.length == 0) {
+ this.okLoading = false
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translate("tip_no_select_data"),
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
+ return;
+ }
// console.log(jsonlist);
const list = []
list.push({
@@ -1465,21 +1753,23 @@
},
sava2(event) {
var $this = this;
+
if (this.$data.detail1StyleDefList.length == 0) {
uni.showModal({
title: this.translateSys("tip"),
content: this.translate(
- "page.tip_no_data_first") +
+ "tip_no_data_first") +
this.translateSys(
"quotation_mark_left") + this.param.Sub_Page[1].Name + this.translateSys(
- "sys.quotation_mark_right") +
+ "quotation_mark_right") +
this.translate(
- "page.tip_no_data_last"),
+ "tip_no_data_last"),
showCancel: false,
confirmText: this.translateSys("cancel")
});
return false;
}
+ this.ok2Loading = true
//鑾峰彇琛ㄥご灞炴�
var head_attr = {};
this.$data.head_styledef.form.items.forEach(item => {
@@ -1546,6 +1836,17 @@
})
});
});
+ if (jsonlist.length == 0) {
+ this.ok2Loading = false
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translate("tip_no_select_data"),
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
+
+ return;
+ }
const list = []
list.push({
page_name: $this.param.Sub_Page[1].Name,
@@ -1592,13 +1893,18 @@
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) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- else uni.showModal({
+ 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,
@@ -1662,7 +1968,7 @@
this.translateSys(
"quotation_mark_left") + value
.page_name + this.translateSys(
- "sys.quotation_mark_right") +
+ "quotation_mark_right") +
this.translate(
"are_you_sure_clear_last"),
success: function(res) {
@@ -1767,7 +2073,7 @@
value += ele;
});
uni.showModal({
- title:this.translateSys("tip"),
+ title: this.translateSys("tip"),
content: value,
showCancel: false,
confirmText: this.translateSys("close")
@@ -1803,8 +2109,17 @@
confirmText: this.translateSys("cancel")
});
}
+ if (type == "1")
+ this.okLoading = false
+ else if (type == "2")
+ this.ok2Loading = false
}).catch(ex => {
- var tip = typeof ex == "string" ? ex : ex.errMsg;
+ if (type == "1")
+ this.okLoading = false
+ else if (type == "2")
+ this.ok2Loading = false
+
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
title: this.translateSys("error") + "8.1",
content: this.translate("execute_after_ok_event_failed") + this.translateSys(
@@ -1849,6 +2164,7 @@
.v-headStyle {
width: 100%;
+ margin-bottom: 11rpx;
}
.view-content {
@@ -1897,24 +2213,24 @@
}
.v-headStyle .txt_title {
- font-size: 34rpx;
+ font-size: 14px;
text-align: right;
display: inline-block;
- vertical-align: 12px;
+ // align-items: center;
+ color: #606266;
+ padding: 0 5px 0 0;
+ vertical-align: 10px;
}
.v-headStyle input {
display: inline-block;
- /* border: 1px solid #d5d5d5; */
- /* width: 65%; */
width: 85%;
- height: 52rpx;
- line-height: 34rpx;
+ line-height: 14px;
background: #FFF;
border-radius: 0 !important;
color: #2d8cf0;
- padding: 10rpx 8rpx 12rpx;
- font-size: 34rpx;
+ padding: 12rpx 8rpx;
+ font-size: 14px;
font-family: inherit;
box-shadow: none !important;
transition-duration: 0.1s;
@@ -2036,7 +2352,7 @@
padding-bottom: 20rpx;
}
- .dv-panel-button checkbox-group {
+ .dv-panel-button checkbox {
/* float: left; */
padding-left: 20px;
display: inline-block;
@@ -2074,9 +2390,15 @@
font-size: 38rpx;
font-weight: bold;
float: right;
+ color: #fff;
display: inline-block;
}
+ button.btn_disabled {
+ background-color: #ddd;
+ color: #888;
+ }
+
.logo {
height: 100rpx;
width: 460rpx;
--
Gitblit v1.9.1