From d8872903e30f0a53abefcd279ae03258341e931f Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 20 三月 2025 09:10:31 +0800
Subject: [PATCH] test
---
pages/modal/5601.vue | 1994 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 1,083 insertions(+), 911 deletions(-)
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 52a5dd6..3055125 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -1,53 +1,10 @@
<template>
<view class="uni-page-modal-5601">
<!-- 琛ㄥご鏍峰紡 -->
- <uni-forms ref="baseForm" label-align="right">
- <view v-for="(item,index) in head_styledef.form.items" :key="index" class="v-head-style">
- <!-- 鏅�甯冨眬 -->
- <uni-forms-item v-if="item.name != 'Layout'" :label="item.label +'锛� "
- :label-width="item.labelWidth+'px'">
- <uni-data-picker v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
- 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'">
- <text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
- @click="classAttr_extButton(item)"></text>
- <input class="uni-input" :class="item.disabled?'input-disabled':''"
- :style="{'padding-left':item.setting.prefix?0 : '8rpx','right':item.setting.suffix?0 : '8rpx'}"
- :type="item.name=='Input'?'text':'number'" v-model="item.value" :disabled="item.disabled"
- :placeholder="item.placeholder" :focus="focusFieldId == item.fieldId" @focus="ontap(item)"
- @click="onClick(item)" @keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)"
- :maxlength="-1" />
- <text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
- @click="classAttr_extButton(item)"></text>
- </view>
- </uni-forms-item>
- <!-- 鏍呮牸甯冨眬 -->
- <uni-row v-else :gutter="item.setting.gutter">
- <uni-col
- :span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
- v-for="(col,key) in item.setting.colList">
- <uni-forms-item :label="col.label +'锛�" :label-width="col.labelWidth+'px'">
- <uni-data-picker v-if="col.name=='Select'" :class="col.disabled?'input-disabled':''"
- v-model="col.value" :localdata="col.dict" @change="onEnterChange(item)"
- :readonly="col.disabled" :clear-icon="false" :popup-title="col.label"></uni-data-picker>
- <view class="input-wrapper" v-if="col.name=='Input' || col.name=='InputNumber'">
- <text v-if="col.setting.prefix" class="uni-icon" :class="[col.setting.prefix]"
- @click="classAttr_extButton(col)"></text>
- <input class="uni-input" :class="col.disabled?'input-disabled':''"
- :style="{'padding-left':col.setting.prefix?0 : '8px','right':col.setting.suffix?0 : '8px'}"
- :type="col.name=='Input'?'text':'number'" v-model="col.value"
- :disabled="col.disabled" :placeholder="col.placeholder"
- :focus="focusFieldId == col.fieldId" @focus="ontap(col)" @click="onClick(col)"
- @keyup.enter="onEnterChange(col)" @blur="onEnterChange(col)" :maxlength="-1" />
- <text v-if="col.setting.suffix" class="uni-icon" :class="[col.setting.suffix]"
- @click="classAttr_extButton(col)"></text>
- </view>
- </uni-forms-item>
- </uni-col>
- </uni-row>
- </view>
- </uni-forms>
+ <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
+ @click="onClick" @focus="ontap" @change="onEnterChange" @click-prefix="classAttr_extButton"
+ @click-suffix="classAttr_extButton"></OIForm>
+
<view class="view-content">
<!-- 鐮佺洏瀛愮晫闈�-->
<view v-if="param.Show_Welcom_Page==false" class="uni-panel-content">
@@ -70,57 +27,47 @@
@tap="onPanelClick(ii,style.form.htmlobjId)"
:id="'dvpanel'+style.form.htmlobjId"
:class="style.form.htmlobjId==active_id?'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" :maxlength="-1" />
- </view>
- <!-- 鏍呮牸甯冨眬 -->
- <uni-row class="demo-uni-row" v-else :gutter="item.setting.gutter">
- <uni-col
- :span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 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"
- 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" :maxlength="-1" />
- </view>
- </uni-col>
- </uni-row>
- </div>
- </div>
- <div class="dv-panel-button">
+ <OIForm class="dv-panel-form" :form="style.form" viewMode></OIForm>
+
+ <div class="dv-panel-button"
+ v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0">
<checkbox v-if="pageData.Select_Button==true" :model="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(pageData,ii)"
- v-if="pageData.Del_Button==true">{{translateSys('delete')}}</button>
+ <button size="mini" v-for="(btn,btnIndex) in pageData.Row_Button"
+ :key="btnIndex" type="default"
+ :class="btn.FunCode == 'Delete' ? 'btn-warn' : 'btn-primary'"
+ @click="onRowBtnClick(btn, pageData,ii)">
+ <Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'"
+ class="Img" />
+ {{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
+ </button>
</div>
+
</div>
</checkbox-group>
</view>
- <view class="view-bottom" v-if="pageData.OK_Button==true">
- <button type="default" @tap="cancel"
- class="btn_cancel">{{translateSys('cancel')}}</button>
- <button type="primary" @tap="ok(pageData)" class="btn_add"
- :class="pageData.okLoading?'btn_disabled':''"
- :disabled="pageData.okLoading? true:false">{{translateSys('ok')}}</button>
+ <view class="view-bottom" v-if="pageData.Button.length >0 ">
+ <button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex" type="default"
+ :class="{'btn-disabled':(btn.FunCode != 'Cancel' && pageData.okLoading),
+ 'btn-primary':(btn.FunCode != 'Cancel'),
+ 'btn-cancel':(btn.FunCode == 'Cancel'),
+ 'btn-one':pageData.Button.length == 1,
+ 'btn-left':(btnIndex < pageData.Button.length - 1),
+ 'btn-right': btnIndex > 0 && btnIndex == pageData.Button.length - 1 ,
+ 'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}"
+ :disabled="(btn.FunCode != 'Cancel' && pageData.okLoading)? true:false"
+ @click="onBtnClick(btn, pageData)">
+ <Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="Img" />
+ {{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
+ </button>
+ <view class="btn-right" v-if="pageData.DropDownButton.length >0 ">
+ <a @click="clickDropdownBtns(pageData)">
+ <Icon class="mobox-normal-more" />
+ </a>
+ </view>
</view>
</view>
</swiper-item>
@@ -141,8 +88,9 @@
<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
<view class="popup-header">{{check_list.title}}</view>
<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
- :style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
- <view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+ :style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+ <view class="popup-cont"
+ :style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -173,11 +121,16 @@
getUIStyleInfo,
runCustomEvent,
} from "@/api/data.js"
+ import dayjs from "dayjs";
+ import OIForm from '@/components/oi-form/index.vue'
export default {
name: "PageModal5601",
modules: {
Base64,
+ },
+ components: {
+ OIForm,
},
data() {
return {
@@ -194,11 +147,7 @@
pageDetail: [], //{StyleDef{}:,DefList:[],ExtData:{}}
// 鍒嗘鍣ㄦ暟鎹� current: 0,
- Before_OK_Event: {},
After_OK_Event: {},
- Before_Del_Event: {},
- After_Del_Event: {},
-
active_id: '',
selectAttrObj: {},
@@ -219,14 +168,11 @@
},
},
onLoad(options) {
- console.log(options.titlename, options);
uni.setNavigationBarTitle({
title: options.titlename
}); //璁剧疆椤堕儴鏍囬
this.title = options.titlename;
this.param = JSON.parse(options.param);
-
-
//鑾峰彇涓绘暟鎹被ID
this.ClsID = this.param.master_cls?.id;
if (this.ClsID) {
@@ -236,7 +182,7 @@
title: this.translateSys("error"),
content: this.translate("tip_no_master_class"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -266,7 +212,6 @@
});
},
async loadData(paramValue) {
-
//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID);
//浼犲叆鍙傛暟鍊�@@ -309,6 +254,33 @@
this.ClsID,
page.UI_Style.ID
);
+ const buttons = this.pageButtonList(page)
+ page.Button = buttons
+ page.DropDownButton = []
+ if (buttons.length > 3) {
+ let cancelBtn = undefined
+ const btns = []
+ buttons.forEach((btn) => {
+ if (btn.FunCode == "Cancel") {
+ cancelBtn = btn
+ } else {
+ btns.push(btn)
+ }
+ })
+ if (cancelBtn) {
+ if (btns.length > 2) {
+ page.DropDownButton = btns.splice(2)
+ page.Button = btns
+ }
+ page.Button.push(cancelBtn)
+ } else {
+ if (btns.length > 3) {
+ page.DropDownButton = btns.splice(3)
+ page.Button = btns
+ }
+ }
+ }
+ page.Row_Button = this.rowButtonList(page)
}
this.setData({
@@ -323,6 +295,92 @@
current: index
})
},
+ pageButtonList(page) {
+ if (this.param?.ver == "2.0") {
+ return page?.Button || []
+
+ } else {
+ if (page?.OK_Button) {
+ let evt = {};
+ if (page.Before_ok?.ID) {
+ evt = {
+ ID: page.Before_ok?.ID,
+ Name: page.Before_ok?.Name
+ };
+ } else if (page.After_ok?.ID) {
+ evt = {
+ ID: page.After_ok?.ID,
+ Name: page.After_ok?.Name
+ };
+ }
+ let btnCancel = {
+ Cls_Name: this.param?.master_cls?.name || "",
+ Cls_ID: this.param?.master_cls?.id || "",
+ FunCode: "Cancel",
+ ShowName: this.$t("sys.cancel"),
+ Style: "text",
+ Prompt: false,
+ };
+ if (evt.ID) {
+ let btn = {
+ Cls_Name: this.param?.master_cls?.name || "",
+ Cls_ID: this.param?.master_cls?.id || "",
+ FunCode: "TriggerEvent",
+ ShowName: this.$t("sys.ok"),
+ Style: "text",
+ Prompt: false,
+ NotTriggerSYSEvent: false,
+ DataStateVerify: false,
+ AttrVerify: false,
+ Event: evt,
+ };
+ if (page.After_ok?.ID) {
+ btn.After_Event = page.After_ok;
+ }
+ return [btn, btnCancel];
+ } else return [btnCancel];
+ } else {
+ return [];
+ }
+ }
+ },
+ rowButtonList(page) {
+ if (this.param?.ver == "2.0") {
+ return page?.Row_Button || [];
+ } else {
+ if (page?.Del_Button) {
+ let evt = {};
+ if (page.Before_Delete?.ID) {
+ evt = {
+ ID: page.Before_Delete?.ID,
+ Name: page.Before_Delete?.Name,
+ };
+ } else if (page.After_Delete?.ID) {
+ evt = {
+ ID: page.After_Delete?.ID,
+ 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 [];
+ }
+ },
+
checkboxChange(e) {
var items = this.pageDetail[this.current]?.DefList || []
@@ -363,7 +421,27 @@
await this.DictGetInfo(ele.bind.dict,
styledefHead.form.model,
ele);
+ } else {
+ if (ele?.name === "Select") {
+ const selections = ele?.selections || []
+ //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+ let itemName = ele.value || "";
+ if (itemName) {
+ styledefHead.form
+ .model[ele.fieldId] = itemName;
+ }
+
+ ele.selections = selections.map((a) => {
+ return {
+ value: a.value,
+ text: a.label
+ }
+ })
+
+ }
+
}
+
if ($this.focusFieldId == "") {
if (ele.name == 'Input' || ele.name ==
'InputNumber') {
@@ -381,6 +459,22 @@
.dict,
styledefHead.form
.model, col);
+ } else {
+ if (col?.name === "Select") {
+ const selections = col?.selections || []
+ //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+ let itemName = col.value || "";
+ if (itemName) {
+ styledefHead.form
+ .model[col.fieldId] = itemName;
+ }
+ col.selections = selections.map((a) => {
+ return {
+ value: a.value,
+ text: a.label
+ }
+ })
+ }
}
if ($this.focusFieldId == "") {
if (col.name == 'Input' || col
@@ -400,13 +494,15 @@
this.setData({
head_styledef: styledefHead
})
+ console.log("Head_UIStyleGetInfo", this.head_styledef)
+
} catch (ex) {
// console.log(ex);
uni.showModal({
title: this.translateSys("error") + "1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return {}
}
@@ -443,7 +539,12 @@
await this.DictGetInfo(ele.bind.dict,
detailstyledef.form
.model, ele);
+ } else {
+ if (ele?.name === "Select") {
+ ele.selections = []
+ }
}
+
} else {
for (let j in ele.setting.colList) {
const col = ele.setting.colList[j]
@@ -452,6 +553,10 @@
.bind.dict,
detailstyledef.form
.model, col);
+ } else {
+ if (col?.name === "Select") {
+ col.selections = []
+ }
}
}
}
@@ -466,7 +571,7 @@
title: this.translateSys("error") + "2",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return {}
}
@@ -505,7 +610,7 @@
title: this.translateSys("error") + "3",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -521,10 +626,11 @@
console.log(result.decodedata);
item.value = result.decodedata;
var $this = this;
- if (item.oldvalue != item.value && item.value.trim() != "") {
- item.oldvalue = item.value;
+ let newVal = item.value.trim()
+ if (newVal) {
+ item.oldvalue = newVal;
var attr = item.fieldId;
- this.head_styledef.form.model[attr] = item.value;
+ this.head_styledef.form.model[attr] = newVal;
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� var onSuffixClickCallbackEvent = item.bind
.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�@@ -532,39 +638,63 @@
.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� var isflag = false;
- if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� $this.onChange(onChangeEvent);
}
- if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�- //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
- 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
- }
+ //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
+ 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');
+
+ }
+ } 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
})
- if (curIndex > -1) {
+ 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]
@@ -572,65 +702,46 @@
})
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
- }
- }
}
-
}
+
}
}
-
}
})
},
onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
console.log(item);
- if (item.oldvalue != item.value && item.value.trim() != "") {
- item.oldvalue = item.value;
+ let newVal = item.value
+ if (typeof item.value == "string") {
+ newVal = item.value.trim()
+ if (!newVal)
+ return
+ }
+ if (item.oldvalue != newVal) {
+ item.oldvalue = newVal;
var attr = item.fieldId;
- this.head_styledef.form.model[attr] = item.value;
+ this.head_styledef.form.model[attr] = newVal;
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�
- if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� this.onChange(onChangeEvent);
}
}
},
+
classAttr_extButton(item) {
var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�-
+
if (!onSuffixClickCallbackEvent.id) {
uni.showModal({
title: this.translateSys("tip"),
content: this.translate('icon_click_callback_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -639,7 +750,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_event_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -647,20 +758,21 @@
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
this.$refs.popup.open(this.popupType);
- this.dataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
+ this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
item);
},
getDetailAttrList(pageData) {
const detailAttrList = [];
+ console.log(pageData)
if (pageData.DefList) {
pageData.DefList.forEach(style => {
var detail_attr = {};
style.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => {
- if (cols != null) detail_attr[cols
- .fieldId] = cols.value;
+ item.setting.colList.forEach(col => {
+ if (col != null) detail_attr[col
+ .fieldId] = col.value;
});
} else
detail_attr[item.fieldId] = item.value;
@@ -695,6 +807,7 @@
});
});
}
+ console.log(detailAttrList)
const jsonlist = [];
detailAttrList.forEach(attr => {
jsonlist.push({
@@ -717,15 +830,16 @@
var head_attr = {};
this.head_styledef.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => {
- if (cols != null) head_attr[cols
- .fieldId] = cols.value;
+ item.setting.colList.forEach(col => {
+ if (col != null) head_attr[col
+ .fieldId] = col.value;
});
} else
head_attr[item.fieldId] = item.value;
});
var obj_attr = this.head_styledef.form.model;
// console.log(obj_attr);
+
var input_param = Base64.encode(
JSON.stringify(
Object.keys(head_attr).map((a) => ({
@@ -740,9 +854,7 @@
jsonList.push({
page_name: page.Name,
- item_list: $this.getDetailAttrList(page
- .DefList, page
- .Select_Button),
+ item_list: $this.getDetailAttrList(page),
ext_data: page.ExtData || {}
})
@@ -750,6 +862,7 @@
const data_json = Base64.encode(
JSON.stringify(jsonList)
);
+ console.log(jsonList)
var dataInfo = {
ed_type: 0,
start_transaction: true,
@@ -771,7 +884,6 @@
};
runCustomEvent(dataInfo).then(result => {
console.log(result);
-
if (result.ret != 0) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result
@@ -789,7 +901,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
} else uni.showModal({
title: this.translateSys('tip'),
@@ -799,7 +911,7 @@
.ret,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return false;
} else {
@@ -811,267 +923,104 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
if (result.result_type == 0 && result.action) {
result.action.forEach(item => {
-
- if (item.action_type ==
- "insert_subtable_page_row"
- ) { //鐮佺洏涓�- $this.$data.param
- .Show_Welcom_Page =
- false;
+ if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+ $this.$data.param.Show_Welcom_Page = false;
var value = item.value;
$this.viewAceionRow(value);
} else if (item.action_type ==
- "set_subtable_page_content"
- ) { //宸茬爜鐩�- $this.$data.param
- .Show_Welcom_Page =
- false;
+ "set_subtable_page_content") { //宸茬爜鐩�+ $this.$data.param.Show_Welcom_Page = false;
var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page.Name;
- });
- if (value.clear_confirm !=
- false && value.clear ==
- true &&
- pageData && pageData
- .DefList.length > 0
+ const pageData = $this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
+ });
+ if (value.clear_confirm != false && value.clear == true &&
+ pageData && pageData.DefList.length > 0
) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹� uni.showModal({
- title: this
- .translateSys(
- 'tip'
- ),
- content: this
- .translate(
- "are_you_sure_clear_first"
- ) +
- this
- .translateSys(
- "quotation_mark_left"
- ) +
- value
- .page_name +
- this
- .translateSys(
- "quotation_mark_right"
- ) +
- this
- .translate(
- "are_you_sure_clear_last"
- ),
- success: function(
- res
- ) {
- if (res
- .confirm
- ) {
- if (
- pageData)
- pageData
- .DefList = [];
- $this
- .viewAceionContent(
- value
- );
- } else if (
- res
- .cancel
- ) {
- if (
- pageData)
- pageData
- .DefList = [];
- $this
- .viewAceionContent(
- value
- );
+ title: this.translateSys('tip'),
+ content: this.translate(
+ "are_you_sure_clear_first") +
+ this.translateSys(
+ "quotation_mark_left") +
+ value.page_name +
+ this.translateSys(
+ "quotation_mark_right") +
+ this.translate(
+ "are_you_sure_clear_last"),
+ cancelText: $this.translateSys('ok'),
+ confirmText: $this.translateSys('cancel'),
+ success: function(res) {
+ if (res.cancel) {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
+ } else if (res.confirm) {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
}
}
});
} else {
if (pageData)
- pageData
- .DefList = [];
- $this
- .viewAceionContent(
- value);
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
}
- } else if (item.action_type ==
- "select_subtable_page_row"
- ) {
+ } else if (item.action_type == "select_subtable_page_row") {
// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page.Name;
- });
- if (pageData?.DefList) {
- pageData.DefList
- .forEach(ele => {
-
- if (ele
- .form
- .objId ==
- value
- .row.id
- ) {
- ele.SelBut_Checked =
- true;
- $this
- .active_id =
- ele
- .form
- .htmlobjId;
- //鑷姩婊氬姩鍒版寚瀹氬厓绱�- uni.createSelectorQuery()
- .select(
- "#tabpanel" +
- value
- .page_name
- ) //瀵瑰簲澶栧眰鑺傜偣
- .boundingClientRect(
- (
- container
- ) => {
- uni.createSelectorQuery()
- .select(
- "#dvpanel" +
- ele
- .form
- .htmlobjId
- ) //鐩爣鑺傜偣
- .boundingClientRect(
- (
- target
- ) => {
- uni.pageScrollTo({
- scrollTop: target
- .top -
- container
- .top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�- });
- }
- )
- .exec();
- }
- )
- .exec();
- }
- });
- }
+ $this.viewActionSelectRow(value)
} else if (item.action_type ==
- "remove_subtable_page_row"
- ) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page.Name;
- });
- if (pageData
- ?.DefList
- ) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- {
- value.row.forEach(
- row => {
- pageData
- .DefList
- .forEach(
- (ele,
- index
- ) => {
- if (ele
- .form
- .objId ==
- row
- .id
- ) {
- pageData
- .DefList
- .splice(
- index,
- 1
- );
- }
- });
- });
- }
+ $this.viewActionRemoveRow(value)
+ } else if (item.action_type == "set_subtable_page_row") {
+ $this.viewActionSetRow(item.value)
-
-
- } else if (item.action_type ==
- "set_subtable_page_row") {
- $this.viewActionSetRow(item
- .value)
-
- } else if (item.action_type ==
- "set_subtable_page_ext_data"
- ) {
+ } else if (item.action_type == "set_subtable_page_ext_data") {
var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page.Name;
- });
+ const pageData = $this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
+ });
if (pageData)
- pageData.ExtData =
- value.ext_data
+ pageData.ExtData = value.ext_data
- } else if (item.action_type ==
- "clear_subpage_rows") {
+ } else if (item.action_type == "clear_subpage_rows") {
var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page.Name;
- });
- if (pageData) {
+ const pageIndex = $this.pageDetail.findIndex((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageIndex > -1) {
+ const pageData = $this.pageDetail[pageIndex]
pageData.DefList = []
pageData.ExtData = {}
+
+ $this.$set(this.pageDetail, pageIndex, pageData)
}
- } else if (item.action_type ==
- "set_dlg_current_edit_attr"
- ) {
+ } else if (item.action_type == "set_dlg_current_edit_attr") {
- if ($this
- .focusOldFieldId ==
- item.value) {
+ if ($this.focusOldFieldId == item.value) {
$this.setData({
focusFieldId: ""
})
} else {
$this.setData({
- focusFieldId: $this
- .focusOldFieldId
+ focusFieldId: $this.focusOldFieldId
})
}
$this.$nextTick(() => {
$this.setData({
- focusFieldId: item
- .value
+ focusFieldId: item.value
})
});
- } else if (item.action_type ==
- "set_dlg_attr") {
+ } else if (item.action_type == "set_dlg_attr") {
// value = {"attr":"xxx", "value":"xxx"}
var data = item.value;
$this.setFormValues(data)
@@ -1086,7 +1035,7 @@
content: result.info,
showCancel: false,
confirmText: this
- .translateSys("cancel")
+ .translateSys('close')
});
}
}
@@ -1100,7 +1049,7 @@
title: this.translateSys("error") + "4.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
}
@@ -1115,7 +1064,7 @@
this.translate('reason') + this.translateSys("colon") +
tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -1126,6 +1075,9 @@
number1 = parseInt(value1)
if (value2)
number2 = parseInt(value2)
+ if (!operation) {
+ return value2;
+ }
if (operation == "+") {
return number1 + number2
} else if (operation == "-") {
@@ -1133,18 +1085,72 @@
} else if (operation == "*") {
return number1 * number2
} else if (operation == "/") {
- if (number2)
- return number1 / number2
- else
- return number1
- } else return number2
+ if (number2) return number1 / number2;
+ else {
+ throw new Error(`${this.translate("illegal_dividend")}'${value2}'`);
+ return 0;
+ }
+ } else if (operation == "=") {
+ return value2;
+ } else {
+ throw new Error(`${this.translate("unrecognized_operator")}'${operation}'`);
+ return 0;
+ }
},
+ viewActionSelectRow(value) {
+ const pageData = this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageData?.DefList) {
+ pageData.DefList.forEach(ele => {
+ if (ele.form.objId == value.row.id) {
+ ele.SelBut_Checked = true;
+ this.active_id = ele.form.htmlobjId;
+ //鑷姩婊氬姩鍒版寚瀹氬厓绱�+ uni.createSelectorQuery().select("#tabpanel" + value.page_name) //瀵瑰簲澶栧眰鑺傜偣
+ .boundingClientRect((container) => {
+ uni.createSelectorQuery()
+ .select("#dvpanel" + ele.form.htmlobjId) //鐩爣鑺傜偣
+ .boundingClientRect((target) => {
+ uni.pageScrollTo({
+ scrollTop: target.top - container
+ .top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�+ });
+ }).exec();
+ }).exec();
+ }
+ });
+ }
+
+ },
+
+ viewActionRemoveRow(value) {
+ if (JSON.stringify(value.row) == '{}') {
+ return;
+ }
+ const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => {
+ return value.page_name == page.Name;
+ })
+ if (pageIndex < 0)
+ return
+ const pageData = $this.pageDetail[pageIndex]
+ if (pageData?.DefList) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ {
+ value.row.forEach((row) => {
+ pageData.DefList.forEach((ele, index) => {
+ if (ele.form.objId == row.id) {
+ pageData.DefList.splice(index, 1);
+ }
+ });
+ });
+ }
+ $this.$set(this.pageDetail, pageIndex, pageData)
+ },
//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
viewActionSetRow(value) {
const $this = this
- const pageIndex = $this.pageDetail.findIndex((
- page, index2, arr) => {
+ const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => {
return value.page_name == page.Name;
})
if (pageIndex < 0)
@@ -1153,54 +1159,141 @@
var detailStyleDefList = pageData.DefList || []
detailStyleDefList.forEach(ele => {
value.row.forEach((rowData) => {
- if (ele.form.objId == rowData.id) {
- rowData.attrs.forEach(attr => {
- ele.form.items.forEach(ele2 => {
- if (ele2.name !=
- 'Layout') {
- if (ele2.fieldId ==
- attr
- .attr) {
- ele2.value =
- $this
- .operationNumber(
- ele2
- .value,
- attr
- .value,
- attr
- .operation
- )
- }
- } else if (ele2.name ==
- 'Layout') {
- ele2.setting
- .colList
- .forEach(
- col => {
- if (
- col) {
- if (col
- .fieldId ==
- attr
- .attr
- ) {
- col.value =
- $this
- .operationNumber(
- col
- .value,
- attr
- .value,
- attr
- .operation
- )
+ if (rowData.id) {
+ if (ele.form.objId == rowData.id) {
+ rowData.attrs.forEach(attr => {
+ ele.form.items.forEach(ele2 => {
+ if (ele2.name !=
+ 'Layout') {
+ if (ele2.fieldId ==
+ attr
+ .attr) {
+ ele2.value =
+ $this
+ .operationNumber(
+ ele2
+ .value,
+ attr
+ .value,
+ attr
+ .operation
+ )
+ }
+ } else if (ele2.name ==
+ 'Layout') {
+ ele2.setting
+ .colList
+ .forEach(
+ col => {
+ if (
+ col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ ) {
+ col.value =
+ $this
+ .operationNumber(
+ col
+ .value,
+ attr
+ .value,
+ attr
+ .operation
+ )
+ }
}
- }
- })
- }
+ })
+ }
+ });
});
- });
+ }
+ } else if (rowData.condition) {
+ const conditions = rowData.condition;
+ let bFindCondition = true;
+ for (let i in conditions) {
+ const condition = conditions[i];
+ let bFind = false;
+ for (let i2 in ele.form.items) {
+ const ele2 = ele.form.items[i2];
+ if (ele2.name != "Layout") {
+ if (ele2.fieldId == condition.attr) {
+ if (condition.value == ele2.value) {
+ bFind = true;
+ }
+ break;
+ }
+ } else {
+ const colList = ele2.setting.colList || [];
+ for (let i3 in colList) {
+ const col = colList[i3];
+ if (col.fieldId == condition.attr) {
+ if (condition.value == col.value) {
+ bFind = true;
+ }
+ break;
+ }
+ }
+ if (bFind) break;
+ }
+ }
+ if (!bFind) {
+ bFindCondition = false;
+ break;
+ }
+ }
+ if (bFindCondition) {
+
+ rowData.attrs.forEach(attr => {
+ ele.form.items.forEach(ele2 => {
+ if (ele2.name !=
+ 'Layout') {
+ if (ele2.fieldId ==
+ attr
+ .attr) {
+ ele2.value =
+ $this
+ .operationNumber(
+ ele2
+ .value,
+ attr
+ .value,
+ attr
+ .operation
+ )
+ }
+ } else if (ele2.name ==
+ 'Layout') {
+ ele2.setting
+ .colList
+ .forEach(
+ col => {
+ if (
+ col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ ) {
+ col.value =
+ $this
+ .operationNumber(
+ col
+ .value,
+ attr
+ .value,
+ attr
+ .operation
+ )
+ }
+ }
+ })
+ }
+ });
+ });
+
+ }
}
})
});
@@ -1362,111 +1455,76 @@
});
}
-
+ $this.$set(this.pageDetail, pageIndex, pageData)
},
- setFormValues(data) {
+ setFormValues(attrs) {
const head_styledef = this.head_styledef
- if (JSON.stringify(data) == '{}') {
+ if (JSON.stringify(attrs) == '{}') {
return;
}
- head_styledef.form.items.forEach(async (ele, index) => {
- if (ele.name != "Layout") {
- let curIndex = data.findIndex((attr, index2, arr) => {
- return attr.attr == ele.fieldId;
- })
- if (curIndex > -1) {
- const attr = data[curIndex]
- if (ele.name ==
- 'Select' &&
- attr
- .choice_list
- ) {
- const
- dictItemList = [];
- const
- choiceList =
- attr
- .choice_list || [];
- for (let d in
- choiceList) {
- const
- val =
- choiceList[
- d
- ];
- dictItemList
- .push({
- text: val,
- value: val
- });
+ console.log(attrs)
+ attrs.forEach(async (attr, key) => {
+ if (attr.choice_list) {
+ var dictItemList = [];
+ attr.choice_list.forEach(async (val, index) => {
+ dictItemList.push({
+ text: val,
+ value: val
+ });
+ });
+
+ head_styledef.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;
+ }
}
- ele.dict =
- dictItemList;
- }
-
- ele.value =
- attr
- .value;
- }
- } else {
- ele.setting
- .colList
- .forEach(
- async (
- col
- ) => {
- if (
- col) {
- let curIndex = data.findIndex((
- attr, index2, arr) => {
- return attr.attr == col.fieldId;
- })
- if (curIndex > -1) {
- const attr = data[curIndex]
- if (col.name ==
- 'Select' &&
- attr
- .choice_list
- ) {
- const
- dictItemList = [];
- const
- choiceList =
- attr
- .choice_list || [];
- for (let d in
- choiceList) {
- const
- val =
- choiceList[
- d
- ];
- dictItemList
- .push({
- text: val,
- value: val
- });
- }
- col.dict =
- 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;
}
-
- col.value =
- attr
- .value;
}
}
-
- })
-
+ });
+ }
+ });
}
- })
+ if (!head_styledef.form.model[attr.attr]) {
+ head_styledef.form.model[attr.attr] = attr.value;
+ }
+ head_styledef.form.items.forEach(async (ele) => {
+ if (ele.name != "Layout") {
+ if (ele.fieldId == attr.attr) {
+ ele.value = attr.value;
+ ele.oldvalue = attr.value;
+ }
+ } 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;
+ }
+ }
+ });
+ }
+ })
+ //鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+ })
+ console.log(head_styledef)
this.setData({
head_styledef: head_styledef
})
},
-
onClickItem(e) { //閫夋嫨椤电
// console.log(e);
this.current = e.currentIndex
@@ -1474,29 +1532,14 @@
onDetail1EnterChange(item) { //鐮佺洏涓牱寮忓洖杞︿簨浠� console.log(item);
},
- delItem(pageData, index) { //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�-
- //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�- this.Before_Del_Event = pageData.Before_Delete;
- this.After_Del_Event = pageData.After_Delete;
- const style = pageData.DefList[index];
- //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�- pageData.DefList.splice(index, 1);
- if (this.Before_Del_Event?.ID)
- //鏄惁鏈夊垹闄ゅ墠浜嬩欢
- this.del(pageData, style, this.Before_Del_Event);
- else if (this.After_Del_Event?.ID)
- //鏄惁鏈夊垹闄ゅ悗浜嬩欢
- this.del(pageData, style, this.After_Del_Event);
- },
async del(pageData, style, event) {
//鑾峰彇琛ㄥご灞炴�
var head_attr = {};
this.$data.head_styledef.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => {
- if (cols != null) head_attr[cols.fieldId] =
- cols.value;
+ item.setting.colList.forEach(col => {
+ if (col != null) head_attr[col.fieldId] =
+ col.value;
});
} else
head_attr[item.fieldId] = item.value;
@@ -1507,9 +1550,9 @@
var detail_attr = {};
style.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => {
- if (cols != null) detail_attr[cols
- .fieldId] = cols
+ item.setting.colList.forEach(col => {
+ if (col != null) detail_attr[col
+ .fieldId] = col
.value;
});
} else
@@ -1564,7 +1607,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1620,7 +1663,7 @@
title: this.translateSys("tip"),
content: "popupParam涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1629,7 +1672,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1725,14 +1768,14 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
} else uni.showModal({
title: this.translateSys("tip"),
content: tip + ',' + this.translateSys('tip') + ':' + data
.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -1744,7 +1787,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -1807,7 +1850,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -1884,12 +1927,12 @@
title: this.translateSys("error") + "3.1",
content: exStr,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
- console.log("dataObjRunCustomEvent_Return",eventid,data_attr,button_callback)
+ console.log("dataObjRunCustomEvent_Return", eventid, data_attr, button_callback)
const $this = this
var enviroment = {
'function': '3000', // 鍔熻兘鐐圭紪鍙�@@ -1977,14 +2020,14 @@
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
} else uni.showModal({
title: $this.translateSys("tip"),
content: tip + ',' + $this.translateSys('tip') + ':' + data
.ret,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
return false
} else {
@@ -1996,7 +2039,7 @@
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
if (data != "") {
@@ -2082,6 +2125,7 @@
$this.setData({
check_list: val.config
})
+ console.log($this.check_list)
if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊� $this.setData({
popupType: "right"
@@ -2174,7 +2218,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -2187,7 +2231,7 @@
"quotation_mark_right") + $this.translateSys(
"comma") + 'event_id' + eventid,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -2202,7 +2246,7 @@
title: $this.translateSys('tip') + "5.1",
content: exStr,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
});
},
@@ -2211,6 +2255,224 @@
onPanelClick(value, id) {
// console.log(value);
this.active_id = id;
+ },
+ //鐐瑰嚮鎸夐挳鍒楄〃
+ clickDropdownBtns(pageData) {
+ const that = this
+ const itemlist = [];
+ const btnList = pageData.DropDownButton || []
+
+ for (let i in btnList) {
+ itemlist.push(btnList[i].ShowName || "");
+ }
+ uni.showActionSheet({
+ // title: '鎸夐挳鍒楄〃',
+ itemList: itemlist,
+ success: (e) => {
+ console.log(e.tapIndex);
+ var btn = btnList[e.tapIndex];
+ that.onBtnClick(btn, pageData);
+ }
+ })
+ },
+ onBtnClick(btn, pageData) {
+ const $this = this
+ if (btn.Prompt) {
+ const sContent = btn.PromptContent || this.translate("confirm")
+
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: btn.PromptContent || this.translate("confirm"),
+ cancelText: this.translateSys('ok'),
+ confirmText: this.translateSys('cancel'),
+ success: function(res) {
+ if (res.cancel) {
+ $this.onButtonClicked(btn, pageData, -1);
+ }
+
+ },
+ })
+
+ } else {
+ this.onButtonClicked(btn, pageData, -1);
+ }
+ },
+ onRowBtnClick(btn, pageData, index) {
+ const $this = this
+ if (btn.Prompt) {
+ const sContent = btn.PromptContent || this.translate("confirm")
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: btn.PromptContent || this.translate("confirm"),
+ cancelText: this.translateSys('ok'),
+ confirmText: this.translateSys('cancel'),
+ success: function(res) {
+ if (res.cancel) {
+ $this.onButtonClicked(btn, pageData, index);
+ }
+
+ },
+ })
+
+ } else {
+ this.onButtonClicked(btn, pageData, index);
+ }
+ },
+ onButtonClicked(btn, pageData, index) {
+ this.After_OK_Event = {}
+ let enviroment = {
+ button: "top",
+ button_name: btn.ShowName,
+ cls_id: btn.Cls_ID,
+ function: "5601",
+ master: {},
+ };
+ if (btn.FunCode == "TriggerEvent") {
+ this.After_OK_Event = btn?.After_Event || {};
+ this.sava(pageData, btn.Event);
+ } else if (btn.FunCode == "Cancel") {
+ this.cancel();
+ } else if (btn.FunCode == "Delete") {
+ if (index > -1) {
+ const pageIndex = this.pageDetail.findIndex((
+ page) => {
+ return pageData.Name == page.Name;
+ })
+ const style = pageData.DefList[index];
+ //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�+ pageData.DefList.splice(index, 1);
+ this.del(pageData, style, btn.AfterProcess_Event);
+ this.$set(this.pageDetail, pageIndex, pageData)
+ }
+ } else if (btn.FunCode == "Modify") {
+ if (index > -1) {
+ const style = pageData.DefList[index];
+ if (btn.Edit_dlg.Model == "small") {
+ this.showSmallDialog(btn, style, enviroment, pageData);
+ } else if (btn.Edit_dlg.Model == "form") {
+ this.showFormDialog(btn, style, enviroment, pageData);
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translateSys("unrealized"),
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+
+ } else {
+ this.$Message.warning(this.$t("sys.unrealized"));
+ }
+ },
+ //淇敼灏忕獥鍙ｆ暟鎹�+ showSmallDialog(btn, row, enviroment, pageData) {
+ var data = {
+ Add_BtnName: btn.ShowName,
+ EditDlgMode: btn.Edit_dlg.Model,
+ clsid: btn.Cls_ID,
+ objid: "",
+ cls_name: btn.Cls_Name,
+ Edit_dlg: btn.Edit_dlg
+ };
+ const objAttr = {}
+ row.form.items.forEach(item => {
+ if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item.setting.colList.forEach(col => {
+ if (col != null) objAttr[col
+ .fieldId] = col.value;
+ });
+ } else
+ objAttr[item.fieldId] = item.value;
+ });
+ const url = `../modal/3018?param=${JSON.stringify(data)}&titlename=${btn.Edit_dlg
+ .Name}&editMode=1&objAttr=${JSON.stringify(objAttr)}&type=updateDataObj`
+
+ var $this = this;
+ uni.navigateTo({
+ url: url,
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
+ updateDataObj: function(formData) {
+ const pageIndex = $this.pageDetail.findIndex((
+ page) => {
+ return pageData.Name == page.Name;
+ })
+ if (pageIndex < 0)
+ return
+ Object.assign(row.form.model, formData);
+ row.form.items.forEach(async (ele, index) => {
+ if (ele.name != "Layout") {
+ let value = formData[ele.fieldId]
+ if (value)
+ ele.value = value
+
+ } else {
+ ele.setting.colList.forEach(async (col) => {
+ if (col) {
+ let value = formData[col.fieldId]
+ if (value)
+ col.value = value
+ }
+ });
+ }
+ })
+ $this.$set($this.pageDetail, pageIndex, pageData)
+
+ },
+
+ }
+ });
+ },
+
+ //淇敼鑷畾涔夎〃鍗曟暟鎹�+ showFormDialog(btn, row, enviroment, pageData) {
+ const objAttr = {}
+ row.form.items.forEach(item => {
+ if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item.setting.colList.forEach(col => {
+ if (col != null) objAttr[col.fieldId] = col.value;
+ });
+ } else
+ objAttr[item.fieldId] = item.value;
+ });
+
+ const url =
+ `../modal/form/index?param=${JSON.stringify(btn)}&titlename=${btn.ShowName}&editMode=1&objAttr=${JSON.stringify(objAttr)}&type=updateDataObj`
+ var $this = this;
+ uni.navigateTo({
+ url: url,
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
+ updateDataObj: function(formData) {
+ const pageIndex = $this.pageDetail.findIndex((
+ page) => {
+ return pageData.Name == page.Name;
+ })
+ if (pageIndex < 0)
+ return
+ Object.assign(row.form.model, formData);
+ row.form.items.forEach(async (ele) => {
+ if (ele.name != "Layout") {
+ let value = formData[ele.fieldId]
+ if (value)
+ ele.value = value
+
+ } else {
+ ele.setting.colList.forEach(async (col) => {
+ if (col) {
+ let value = formData[col.fieldId]
+ if (value)
+ col.value = value
+ }
+ });
+ }
+ })
+ $this.$set($this.pageDetail, pageIndex, pageData)
+
+ },
+ }
+ });
},
//纭畾
ok(pageData) {
@@ -2237,7 +2499,7 @@
this.translate(
"tip_no_data_last"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false;
}
@@ -2246,9 +2508,9 @@
var head_attr = {};
this.$data.head_styledef.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => {
- if (cols != null) head_attr[cols.fieldId] =
- cols.value;
+ item.setting.colList.forEach(col => {
+ if (col != null) head_attr[col.fieldId] =
+ col.value;
});
} else
head_attr[item.fieldId] = item.value;
@@ -2260,10 +2522,9 @@
var detail_attr = {};
style.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => {
- if (cols != null) detail_attr[
- cols
- .fieldId] = cols.value;
+ item.setting.colList.forEach(col => {
+ if (col != null)
+ detail_attr[col.fieldId] = col.value;
});
} else
detail_attr[item.fieldId] = item.value;
@@ -2328,7 +2589,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -2389,7 +2650,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
} else uni.showModal({
title: this.translateSys('tip'),
@@ -2398,7 +2659,7 @@
result.ret,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return false;
} else {
@@ -2410,254 +2671,113 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ '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")});
result.action.forEach(item => {
- if (item.action_type ==
- "insert_subtable_page_row"
- ) { //鐮佺洏涓�+ if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓� var value = item.value;
//鍔犺浇宸茬粡鐮佺洏鏁版嵁
- $this.viewAceionRow(
- value, );
+ $this.viewAceionRow(value);
//娓呯┖鏉＄爜鍐呭
- $this.$data
- .head_styledef
- .form.items
- .forEach((
- item,
- index) => {
- if (item
- .fieldId !=
- "S_CNTR_CODE"
- ) {
- item.value =
- '';
- item.oldvalue =
- '';
- $this
- .$data
- .head_styledef
- .form
- .model[
- item
- .fieldId
- ] =
- '';
- }
- });
+ $this.$data.head_styledef.form.items.forEach((item, index) => {
+ if (item.fieldId != "S_CNTR_CODE") {
+ item.value = '';
+ item.oldvalue = '';
+ $this.$data.head_styledef.form.model[item
+ .fieldId] = '';
+ }
+ });
uni.showModal({
- title: this
- .translateSys(
- "tip"
- ),
- content: this
- .translate(
- 'execute_event_success'
- ),
+ title: $this.translateSys("tip"),
+ content: $this.translate('execute_event_success'),
showCancel: false,
- confirmText: this
- .translateSys(
- "cancel"
- )
+ confirmText: $this.translateSys('close')
});
} else if (item.action_type ==
"set_subtable_page_content"
) { //宸茬爜鐩�- $this.$data.param
- .Show_Welcom_Page =
- false;
+ $this.$data.param.Show_Welcom_Page = false;
var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page.Name;
- });
- if (value.clear_confirm !=
- false && value.clear ==
- true &&
- pageData && pageData
- .DefList.length > 0
+ const pageData = $this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
+ });
+ if (value.clear_confirm != false && value.clear == true &&
+ pageData && pageData.DefList.length > 0
) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹� uni.showModal({
- title: this
- .translateSys(
- 'tip'
- ),
- content: this
- .translate(
- "are_you_sure_clear_first"
- ) +
- this
- .translateSys(
- "quotation_mark_left"
- ) +
- value
- .page_name +
- this
- .translateSys(
- "quotation_mark_right"
- ) +
- this
- .translate(
- "are_you_sure_clear_last"
- ),
- success: function(
- res
- ) {
- if (res
- .confirm
- ) {
- if (
- pageData
- )
- pageData
- .DefList = [];
- $this
- .viewAceionContent(
- value
- );
- } else if (
- res
- .cancel
- ) {
- if (
- pageData
- )
- pageData
- .DefList = [];
- $this
- .viewAceionContent(
- value
- );
+ title: $this.translateSys('tip'),
+ content: $this.translate(
+ "are_you_sure_clear_first") +
+ $this.translateSys("quotation_mark_left") +
+ value.page_name +
+ $this.translateSys(
+ "quotation_mark_right") +
+ $this.translate("are_you_sure_clear_last"),
+ cancelText: $this.translateSys('ok'),
+ confirmText: $this.translateSys('cancel'),
+ success: function(res) {
+ if (res.cancel) {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
+ } else if (res.confirm) {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
}
}
});
} else {
if (pageData)
- pageData
- .DefList = [];
- $this
- .viewAceionContent(
- value);
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
}
- } else if (item
- .action_type ==
- "remove_subtable_page_row"
- ) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page
- .Name;
- });
- if (pageData
- ?.DefList
- ) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
- //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- value.row.forEach(
- row => {
- pageData
- .DefList
- .forEach(
- (
- ele,
- index
- ) => {
- if (ele
- .form
- .objId ==
- row
- .id
- ) {
- pageData
- .DefList
- .splice(
- index,
- 1
- );
- }
- }
- );
- });
- }
- } else if (item
- .action_type ==
- "set_subtable_page_row"
- ) {
- $this.viewActionSetRow(
- item
- .value)
-
- } else if (item
- .action_type ==
- "set_subtable_page_ext_data"
- ) {
- var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page
- .Name;
- });
+ } else if (item.action_type ==
+ "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ let value = item.value;
+ $this.viewActionRemoveRow(value)
+ } else if (item.action_type == "set_subtable_page_row") {
+ $this.viewActionSetRow(item.value)
+ } else if (item.action_type == "set_subtable_page_ext_data") {
+ let value = item.value;
+ const pageData = $this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
+ });
if (pageData) {
- pageData.ExtData =
- value
- .ext_data
+ pageData.ExtData = value.ext_data
}
- } else if (item
- .action_type ==
- "clear_subpage_rows") {
+ } else if (item.action_type == "clear_subpage_rows") {
var value = item.value;
- const pageData = $this
- .pageDetail.find((
- page) => {
- return value
- .page_name ==
- page
- .Name;
- });
- if (pageData) {
- pageData
- .DefList = []
- pageData
- .ExtData = {}
+ const pageIndex = $this.pageDetail.findIndex((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageIndex > -1) {
+ const pageData = $this.pageDetail[pageIndex]
+ pageData.DefList = []
+ pageData.ExtData = {}
+
+ $this.$set(this.pageDetail, pageIndex, pageData)
}
- } else if (item
- .action_type ==
- "set_dlg_current_edit_attr"
- ) {
- if ($this
- .focusOldFieldId ==
- item.value)
+ } else if (item.action_type == "set_dlg_current_edit_attr") {
+ if ($this.focusOldFieldId == item.value)
$this.setData({
focusFieldId: ""
})
else {
$this.setData({
- focusFieldId: $this
- .focusOldFieldId
+ focusFieldId: $this.focusOldFieldId
})
}
$this.$nextTick(() => {
- $this
- .setData({
- focusFieldId: item
- .value
- })
+ $this.setData({
+ focusFieldId: item.value
+ })
});
} else if (item.action_type ==
"set_dlg_attr") {
@@ -2668,12 +2788,8 @@
});
} else {
- if ($this.$data.After_OK_Event.ID !=
- event
- .ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
-
- $this.sava(pageParam, $this.$data
- .After_OK_Event); //鎵ц纭畾鍚庝簨浠�+ if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+ $this.sava(pageParam, $this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�
}
}
@@ -2681,12 +2797,10 @@
if (result.info) {
uni.showModal({
- title: this.translateSys(
- "tip"),
+ title: this.translateSys("tip"),
content: result.info,
showCancel: false,
- confirmText: this
- .translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -2698,13 +2812,10 @@
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(
- "comma") +
- tip,
+ content: this.translate("execute_after_ok_event_failed") +
+ this.translateSys("comma") + tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -2725,7 +2836,17 @@
},
};
</script>
+<style>
+ .popup-content {
+ @include flex;
+ }
+
+ .popup-height {
+ @include height;
+ /* width: 200px; */
+ }
+</style>
<style lang="scss">
.uni-page-modal-5601 {
@@ -2763,7 +2884,7 @@
}
.uni-icon {
- padding: 8rpx;
+ padding: 10rpx 5rpx;
font-size: 32rpx;
color: rgb(192, 196, 204);
}
@@ -2809,15 +2930,79 @@
flex-direction: column !important;
}
+
.view-bottom {
display: flex;
flex-direction: row;
width: calc(100% - 30rpx);
padding: 10rpx 15rpx 30rpx 15rpx;
+
+ .btn-disabled {
+ background-color: #ddd !important;
+ color: #888 !important;
+ }
+
+ .btn-left {
+ padding: 20rpx;
+ line-height: 1.5;
+ font-size: 38rpx;
+ font-weight: bold;
+ float: left;
+ display: inline-block;
+
+ }
+
+ .btn-one {
+ padding: 20rpx;
+ line-height: 1.5;
+ font-size: 38rpx;
+ font-weight: bold;
+ float: left;
+ display: inline-block;
+ width: 50%;
+ margin-left: 25%;
+ }
+
+ .btn-right {
+ padding: 20rpx;
+ line-height: 1.5;
+ font-size: 38rpx;
+ font-weight: bold;
+ float: right;
+ display: inline-block;
+ }
+
+ .width-50 {
+ width: 49%;
+ }
+
+ .width-32 {
+ width: 32%;
+ margin-left: 1%;
+ }
+
+ .width-30 {
+ width: 30%;
+ margin-left: 1%;
+ }
}
+ .btn-warn {
+ background: #ff2d1e;
+ border: none;
+ color: #fff;
+ }
+ .btn-cancel {
+ background: #fff;
+ color: #000;
+ }
+ .btn-primary {
+ background: #27A6E1;
+ border: none;
+ color: #fff;
+ }
[nvue] uni-view {
position: relative;
@@ -2827,7 +3012,7 @@
.uni-icon {
/* border: 1px solid red; */
- width: 8%;
+ width: 30rpx;
font-family: uniicons;
font-size: 40rpx;
font-weight: 400;
@@ -2843,52 +3028,62 @@
.dv-panel {
background-color: #efefef;
- padding: 20rpx 20rpx 4rpx 0px;
+ padding: 10rpx 10rpx 10rpx 0px;
border-radius: 12rpx;
margin: 10rpx 0 20rpx 0;
- text-align: right;
- .txt_title {
- font-size: 28rpx;
- text-align: right;
- display: inline-block;
- }
+ .dv-panel-form {
+ padding: 0px;
+ margin: 0;
- input {
- vertical-align: middle;
- display: inline-block;
- border: 1px solid #d5d5d5;
- width: 68%;
- height: 48rpx;
- line-height: 28rpx;
- background: #FFF;
- border-radius: 7px !important;
- color: #2d8cf0;
- padding: 6rpx 8rpx 8rpx;
- font-size: 28rpx;
- font-family: inherit;
- box-shadow: none !important;
- transition-duration: 0.1s;
- margin-top: 0rpx;
- }
+ .dv-panel-form-item {
+ margin: 0;
+ padding: 0px;
+ }
- input::-webkit-input-placeholder {
- font-size: 10rpx;
- }
+ .uni-forms-item {
+ padding-bottom: 5rpx;
+ margin-bottom: 0;
- .form-item-span {
- vertical-align: text-top;
- color: #2d8cf0;
- white-space: normal;
- word-break: break-all;
- display: inline-block;
- width: calc(100% - 100px);
+ .uni-forms-item__label {
+ height: 20px !important;
+ padding: 0 10rpx 0 0 !important;
+ }
+
+ .uni-input {
+ width: calc(100% - 12rpx);
+ padding: 5rpx;
+ border: 1px solid #d5d5d5;
+ color: #2d8cf0;
+ height: 20px;
+ background: #FFF;
+ line-height: 20px;
+ border-radius: 6px !important;
+ font-size: 14px;
+ font-family: inherit;
+ box-shadow: none !important;
+ transition-duration: 0.1s;
+ vertical-align: middle;
+ }
+
+ .form-item-span {
+ vertical-align: text-top;
+ color: #2d8cf0;
+ white-space: normal;
+ word-break: break-all;
+ width: 100%;
+ }
+ }
+
+
+
}
.dv-panel-button {
width: 100%;
text-align: left;
- padding-bottom: 20rpx;
+ min-height: 30rpx;
+ padding-bottom: 10rpx;
checkbox {
padding-left: 20px;
@@ -2897,58 +3092,18 @@
button {
text-align: left;
- line-height: 1.8;
+ line-height: 1.5;
border: none;
- font-size: 34rpx;
- width: 180rpx;
+ font-size: 30rpx;
+ margin-right: 10rpx;
display: inline-block;
float: right;
text-align: center;
-
- .btn_cancel {
- width: 49.5%;
- padding: 20rpx;
- line-height: 1.5;
- border: none;
- font-size: 38rpx;
- font-weight: bold;
- float: left;
- display: inline-block;
- }
-
- .btn_add {
- width: 49.5%;
-
- padding: 20rpx;
- line-height: 1.5;
- border: none;
- font-size: 38rpx;
- font-weight: bold;
- float: right;
- color: #fff;
- display: inline-block;
- }
-
- .btn_disabled {
- background-color: #ddd;
- color: #888;
- }
-
-
}
}
}
- .dv-panel-input {
- width: 100%;
- display: inline-block;
- text-align: left;
-
- .dv-input {
- margin-bottom: 2rpx;
- }
- }
.logo {
height: 100rpx;
@@ -3043,15 +3198,6 @@
background-color: #f3f3f3 !important;
}
- .demo-uni-row {
- margin-bottom: 0px;
- display: block;
-
- .uni-input {
- width: calc(100% - 120px);
- }
- }
-
::v-deep .uni-row {
margin-bottom: 0px;
}
@@ -3063,6 +3209,30 @@
.demo-uni-col {
height: 36px;
border-radius: 5px;
+ }
+
+ .view-popup {
+ position: relative;
+ }
+
+ .popup-content {
+ // @include flex;
+ align-items: center;
+ justify-content: center;
+ padding: 30rpx;
+ background-color: #fff;
+ /* height: 150px; */
+ /* border: 1px solid red; */
+ }
+
+ .popup-cont {
+ overflow-y: auto;
+ /* border: 1px solid red; */
+ }
+
+ .popup-height {
+ // @include height;
+ /* width: 200px; */
}
.popup-header {
@@ -3078,7 +3248,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom: 10rpx;
right: 20rpx;
}
@@ -3102,9 +3272,11 @@
margin-top: 50rpx;
padding: 15rpx;
line-height: 1.5;
- background: #27A6E1;
- border: none;
- color: #fff;
+ // background: #27A6E1;
+ // border: none;
+ // color: #fff;
+ background: #fff;
+ color: #000;
font-size: 38rpx;
font-weight: bold;
/* float: right; */
--
Gitblit v1.9.1