From d0cdbdf4005c58420249d1cafe214462de20d472 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期五, 02 二月 2024 14:42:57 +0800
Subject: [PATCH] 5600改回码盘专用改进
---
pages/modal/5600.vue | 196 ++++++++++++-------------------------------------
1 files changed, 48 insertions(+), 148 deletions(-)
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index b278da6..6a31f6f 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -164,8 +164,8 @@
overflow: hidden;
background: #fff;
position: relative;
- box-shadow: 0 2rpx 2rpx rgba(0, 0, 0, 0.2);
- margin-right: 8rpx;
+ /* box-shadow: 0 2rpx 2rpx rgba(0, 0, 0, 0.2);
+ margin-right: 8rpx; */
}
.view-imagetext .txt-text{
display: block;
@@ -239,26 +239,24 @@
</view>
<view class="view-content">
<!-- 鍥炬枃/鏂囨湰 -->
- <view class="view-imagetext" v-if="pageType=='img_msg' || pageType=='msg'">
- <div class="view-imagetext-uploadlist" :style="{'background-color':page.Bk_Color}">
- <!-- 鍥炬枃 -->
- <image :src="page.Img" :style="{'width':page.Width+'px','height':page.Height+'px'}" v-if="pageType=='img_msg'"></image>
-
- <!-- 鍥炬枃/鏂囨湰 -->
+ <view class="view-imagetext" v-if="param.Show_Welcom_Page==true">
+ <div class="view-imagetext-uploadlist">
+ <image :src="param.Welcome_Page.Img"
+ :style="{'width':param.Welcome_Page.Width+'px','height':param.Welcome_Page.Height+'px'}"></image>
<text class="txt-text"
- :style="{'color':page.Txt_Color,'font-size':page.Font_Size,'font-family':page.Font}"
- >{{page.Text}}</Text>
+ :style="{'color':param.Welcome_Page.Txt_Color,'font-size':param.Welcome_Page.Font_Size,'font-family':param.Welcome_Page.Font}"
+ >{{param.Welcome_Page.Text}}</Text>
</div>
</view>
- <!-- 澶氶〉绛炬暟鎹垪琛�-->
- <view v-if="pageType=='mulit_page_datalist'">
+ <!-- 鐮佺洏鐣岄潰 -->
+ <view v-if="param.Show_Welcom_Page==false">
<!-- 椤电 -->
<view class="dv-tab">
<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem"
styleType="button">
</uni-segmented-control>
</view>
- <!-- 1#椤电 -->
+ <!-- 鐮佺洏鐣岄潰 -->
<view class="view-tabpage" v-if="current==0">
<image class="logo" v-if="detail1StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
<!-- <div class="dv-panel">
@@ -339,18 +337,18 @@
</div>
</div>
<div class="dv-panel-button">
- <checkbox-group v-if="page.Page[0].Select_Button==true">
+ <checkbox-group v-if="param.Coder_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="page.Page[0].OK_Button==true">淇濆瓨</Button>
- <button type="warn" @tap="delItem(ii)" v-if="page.Page[0].Del_Button==true">鍒犻櫎</button>
+ <button type="primary" @click="savaItem(ii)" v-if="param.Coder_Page[0].OK_Button==true">淇濆瓨</Button>
+ <button type="warn" @tap="delItem(ii)" v-if="param.Coder_Page[0].Del_Button==true">鍒犻櫎</button>
</div>
</div>
</view>
- <!-- 2#椤电 -->
+ <!-- 宸茬爜鐩樼晫闈�-->
<view class="view-tabpage2" v-if="current==1">
<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">
@@ -376,71 +374,17 @@
</div>
</div>
<div class="dv-panel-button">
- <checkbox-group v-if="page.Page[1].Select_Button==true">
+ <checkbox-group v-if="param.Coder_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="page.Page[1].OK_Button==true">淇濆瓨</Button>
- <button type="warn" @tap="delDataObj(style,ii)" v-if="page.Page[1].Del_Button==true">鍒犻櫎</button>
+ <button type="primary" @click="savaDataObj(style,ii)" v-if="param.Coder_Page[1].OK_Button==true">淇濆瓨</Button>
+ <button type="warn" @tap="delDataObj(style,ii)" v-if="param.Coder_Page[1].Del_Button==true">鍒犻櫎</button>
</div>
</div>
</view>
- </view>
- <!-- 鍗曟暟鎹垪琛�-->
- <view class="view-detalist-centen" v-if="pageType=='datalist'">
- <text class="txt-detalist">{{page.Page_Name}}</Text>
- <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">
- <div class="dv-panel-input">
- <div v-for="(item,index) in style.form.items">
- <!-- 鏅�甯冨眬 -->
- <view v-if="item.name=='Input'">
- <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
- :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" 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>
- </div>
- </div>
- <div class="dv-panel-button">
- <checkbox-group v-if="page.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="page.OK_Button==true">淇濆瓨</Button>
- <button type="warn" @tap="delItem(ii)" v-if="page.Del_Button==true">鍒犻櫎</button>
- </div>
- </div>
</view>
</view>
<view>
@@ -459,6 +403,7 @@
data() {
return {
title:'鐮佺洏',
+ ClsID:'CG_Detail',
param: {},
focusMateria:false,
head_styledef:{
@@ -472,8 +417,6 @@
detail2StyleDefList:[],
// 鍒嗘鍣ㄦ暟鎹� current: 0,
- pageType:'',
- page:{},
Before_OK_Event:{},
After_OK_Event:{},
items: [],
@@ -485,32 +428,21 @@
this.$data.param = JSON.parse(options.param);
// console.log(this.$data.param);
//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�- this.Head_UIStyleGetInfo(this.$data.param.Cls.ID,this.$data.param.Grid_Style.ID);
+ this.Head_UIStyleGetInfo(this.$data.ClsID,this.$data.param.Input_UI_Style.ID);
- var $this = this;
//鍔犺浇鍒濆鐣岄潰
- this.$data.param.Page_Def.forEach(async ele=>{
- if($this.$data.param.Start_Page == ele.Name){
- if(ele.Type=="img_msg"){ //鍥炬枃
- ele.Img = ele.Img.replace(/ /g,'+');
- ele.Width = parseInt(ele.Width);
- ele.Height = parseInt(ele.Height);
- } else if(ele.Type=="msg"){ //鏂囨湰
- } else if(ele.Type=="mulit_page_datalist"){ //澶氶〉绛炬暟鎹垪琛�- $this.$data.items.push(ele.Page[0].Name);
- $this.$data.items.push(ele.Page[1].Name);
- await $this.Detail1_UIstyleGetInfo(ele.Page[0].Cls.ID,ele.Page[0].UI_Style.ID);
- await $this.Detail2_UIstyleGetInfo(ele.Page[1].Cls.ID,ele.Page[1].UI_Style.ID);
- } else if(ele.Type=="datalist"){ //鍗曟暟鎹垪琛�- await $this.Detail1_UIstyleGetInfo(ele.Cls.ID,ele.UI_Style.ID);
- }
- $this.$data.pageType = ele.Type;
- $this.$data.page = ele;
- console.log(this.page);
+ 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);
}
- });
- // this.Detail1_UIstyleGetInfo('CG_Detail',this.$data.param.Detail_List_Panel1_Style.ID);
- // this.Detail2_UIstyleGetInfo('CG_Detail',this.$data.param.Detail_List_Panel2_Style.ID);
+ //鍔犺浇Tab椤电
+ this.$data.items.push(this.$data.param.Coder_Page[0].Name);
+ this.$data.items.push(this.$data.param.Coder_Page[1].Name);
+ this.Detail1_UIstyleGetInfo(this.ClsID,this.$data.param.Coder_Page[0].UI_Style.ID);
+ this.Detail2_UIstyleGetInfo(this.ClsID,this.$data.param.Coder_Page[1].UI_Style.ID);
+
+ console.log(this.$data.param);
//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� // this.focusMateria=true;
},
@@ -719,10 +651,12 @@
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;
var value = item.value;
$this.viewAceionRow(value);
}
else if(item.action_type == "set_subtable_page_content"){ //宸茬爜鐩�+ $this.$data.param.Show_Welcom_Page=false;
var value = item.value;
if(value.clear == true && $this.$data.detail1StyleDefList.length>0){ //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹� uni.showModal({
@@ -744,25 +678,6 @@
$this.viewAceionContent(value);
}
}
- else if(item.action_type == "show_page"){ //鏄剧ず鐣岄潰
- var value = item.value;
- $this.$data.param.Page_Def.forEach(async ele=>{
- if(value == ele.Name){ //鍒ゆ柇鑴氭湰鎸囧畾鐨勭晫闈㈠悕绉版槸鍚︾浉鍚�- if(ele.Type=="img_msg"){
- ele.Width = parseInt(ele.Width);
- ele.Height = parseInt(ele.Height);
- } else if(ele.Type=="msg"){
- } else if(ele.Type=="mulit_page_datalist"){
- await $this.Detail1_UIstyleGetInfo(ele.Page[0].Cls.ID,ele.Page[0].UI_Style.ID);
- await $this.Detail2_UIstyleGetInfo(ele.Page[1].Cls.ID,ele.Page[1].UI_Style.ID);
- } else if(ele.Type=="datalist"){
- await $this.Detail1_UIstyleGetInfo(ele.Cls.ID,ele.UI_Style.ID);
- }
- $this.pageType = ele.Type;
- $this.page = ele;//杞浇鎸囧畾鐣岄潰style
- }
- });
- }
});
}else{
// this.detail2StyleDefList=[];
@@ -819,8 +734,9 @@
},
//鍔犺浇宸茬爜鐩樺唴瀹� viewAceionContent(data){
+ var $this = this;
data.content.forEach(cont=>{
- var styleStr = JSON.stringify(this.$data.detail2_styledef);
+ var styleStr = JSON.stringify($this.$data.detail2_styledef);
var detailStyle = JSON.parse(styleStr);
detailStyle.form.objId = cont.id;
cont.attrs.forEach(attr=>{
@@ -836,9 +752,9 @@
}
});
});
- this.$data.detail2StyleDefList.push(detailStyle);
+ $this.$data.detail2StyleDefList.push(detailStyle);
});
- // console.log(this.detail2StyleDefList);
+ // console.log(this.$data.detail2StyleDefList);
},
onClickItem(e) { //閫夋嫨椤电
// console.log(e);
@@ -898,26 +814,13 @@
//纭畾
ok(){
- var $this = this;
- this.$data.param.Page_Def.forEach(async ele=>{
- if($this.pageType == ele.Type){
- if(ele.Type=="img_msg"){
- } else if(ele.Type=="msg"){
- } else if(ele.Type=="mulit_page_datalist"){
- $this.Before_OK_Event = ele.Page[1].Before_ok.ID;
- $this.After_OK_Event = ele.Page[1].After_OK_Event.ID;
-
- } else if(ele.Type=="datalist"){
- $this.Before_OK_Event = ele.Before_ok.ID;
- $this.After_OK_Event = ele.After_OK_Event.ID;
- }
- }
- });
- // console.log(this.Before_OK_Event);
- // console.log(this.After_OK_Event);
- if(this.$data.Before_OK_Event) //鏄惁鏈夌‘瀹氬墠浜嬩欢
+ this.Before_OK_Event = this.param.Coder_Page[1].Before_ok;
+ this.After_OK_Event = this.param.Coder_Page[1].After_ok;
+ // console.log(this.Before_OK_Event);
+ // console.log(this.After_OK_Event);
+ if(this.$data.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
this.sava(this.$data.Before_OK_Event);
- else if(this.$data.After_OK_Event) //鏄惁鏈夌‘瀹氬悗浜嬩欢
+ else if(this.$data.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
this.sava(this.$data.After_OK_Event);
},
sava(event){
@@ -944,15 +847,12 @@
}else
detail_attr[item.fieldId] = item.value;
});
- //鍒ゆ柇绫诲瀷鏄惁涓哄椤电鏁版嵁鍒楄〃/鍗曟暟鎹垪琛�- if($this.pageType=='mulit_page_datalist' || $this.pageType=='datalist'){
- if($this.page.Page[0].Select_Button==true){ //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
- if(style.SelBut_Checked==true)
- detailAttrList.push(detail_attr);
- } else
+
+ if($this.param.Coder_Page[0].Select_Button==true){ //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+ if(style.SelBut_Checked==true)
detailAttrList.push(detail_attr);
} else
- detailAttrList.push(detail_attr);
+ detailAttrList.push(detail_attr);
});
// console.log(detailAttrList);
//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
@@ -1004,7 +904,7 @@
var dataInfo={
ed_type: 0,
start_transaction: true,
- class_id: this.$data.head_styledef.form.clsId,
+ class_id: this.$data.ClsID,
class_name: '',
event_id: event.ID,
event_name: '',
--
Gitblit v1.9.1