提交 e315001d 编写于 作者: KK's avatar KK

选择变量名称事件名称调整

上级 6d516eee
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<#-- 流程操作菜单:END --> <#-- 流程操作菜单:END -->
<#elseif ctrl.getToolbarStyle() == 'MOBBOTTOMMENU'> <#elseif ctrl.getToolbarStyle() == 'MOBBOTTOMMENU'>
<#-- 底部菜单:BEGIN --> <#-- 底部菜单:BEGIN -->
<div <#if view.hasPSControl('mdctrl') || view.hasPSControl('dataview') || view.hasPSControl('calendar')>v-show="!showCheack"</#if> class = "fab_container"> <div <#if view.hasPSControl('mdctrl') || view.hasPSControl('dataview') || view.hasPSControl('calendar')>v-show="!isChoose"</#if> class = "fab_container">
<#assign itemsLength = 0/> <#assign itemsLength = 0/>
<#list ctrl.getPSDEToolbarItems() as item> <#list ctrl.getPSDEToolbarItems() as item>
<#assign itemsLength = itemsLength + 1/> <#assign itemsLength = itemsLength + 1/>
......
...@@ -92,12 +92,12 @@ ...@@ -92,12 +92,12 @@
<van-step v-for="(i,index) in evendata[activeItem]" :key="index"> <van-step v-for="(i,index) in evendata[activeItem]" :key="index">
<p>{{i.time}}</p> <p>{{i.time}}</p>
<div class="touch" v-for="(item,index) in i.evens" :key="index"> <div class="touch" v-for="(item,index) in i.evens" :key="index">
<ion-checkbox v-show="showCheack" class="touch-checkbox" @click.stop="checkboxSelect(item)"></ion-checkbox> <ion-checkbox v-show="isChoose" class="touch-checkbox" @click.stop="checkboxSelect(item)"></ion-checkbox>
<div :key="item.id" class="even-box"> <div :key="item.id" class="even-box">
<#-- BENGIN: 事件内容项 --> <#-- BENGIN: 事件内容项 -->
<#ibizinclude>./EVENTS_CONTENT.vue.ftl</#ibizinclude> <#ibizinclude>./EVENTS_CONTENT.vue.ftl</#ibizinclude>
<#-- END: 事件内容项 --> <#-- END: 事件内容项 -->
<ion-icon v-show="!showCheack" @click="remove([item])" class="event-delete" name="close-outline"></ion-icon> <ion-icon v-show="!isChoose" @click="remove([item])" class="event-delete" name="close-outline"></ion-icon>
</div> </div>
</div> </div>
</van-step> </van-step>
......
...@@ -672,7 +672,7 @@ import moment from 'moment'; ...@@ -672,7 +672,7 @@ import moment from 'moment';
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
@Prop({default:false}) showCheack?: boolean; @Prop({default:false}) isChoose?: boolean;
/** /**
* 选中或取消事件 * 选中或取消事件
......
<#-- content --> <#-- content -->
<#assign content> <#assign content>
:showBusyIndicator="${ctrl.isShowBusyIndicator()?c}" :showBusyIndicator="${ctrl.isShowBusyIndicator()?c}"
:showCheack="showCheack" :isChoose="isChoose"
@showCheackChange="showCheackChange" @isChooseChange="isChooseChange"
</#assign> </#assign>
<#ibizinclude> <#ibizinclude>
../@MACRO/HTML/DEFAULT.html.ftl ../@MACRO/HTML/DEFAULT.html.ftl
......
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
<#if ctrl.getPSSysPFPlugin().getPFPluginType?? && ctrl.getPSSysPFPlugin().getPFPluginType()?? && ctrl.getPSSysPFPlugin().getPFPluginType()=='LIST_ITEMRENDER'> <#if ctrl.getPSSysPFPlugin().getPFPluginType?? && ctrl.getPSSysPFPlugin().getPFPluginType()?? && ctrl.getPSSysPFPlugin().getPFPluginType()=='LIST_ITEMRENDER'>
<ion-list class="items" ref="ionlist" @touchstart="gotouchstart" @touchend="gotouchend"> <ion-list class="items" ref="ionlist" @touchstart="gotouchstart" @touchend="gotouchend">
<div class="selectall"> <div class="selectall">
<ion-checkbox :checked="selectAllIschecked" v-show="showCheack" @ionChange="checkboxAll"></ion-checkbox> <ion-checkbox :checked="selectAllIschecked" v-show="isChoose" @ionChange="checkboxAll"></ion-checkbox>
<ion-label class="selectal-label" v-show="showCheack">全选</ion-label> <ion-label class="selectal-label" v-show="isChoose">全选</ion-label>
<ion-label class="exit_select-label" v-show="isChoose" @click="onCheackChange">退出选择</ion-label>
</div> </div>
<template v-if="(viewType == 'DEMOBMDVIEW9') && controlStyle != 'SWIPERVIEW' "> <template v-if="(viewType == 'DEMOBMDVIEW9') && controlStyle != 'SWIPERVIEW' ">
<ion-checkbox slot="start" :checked="item.checked" v-show="showCheack" @click.stop="checkboxSelect(item)"></ion-checkbox> <ion-checkbox slot="start" :checked="item.checked" v-show="isChoose" @click.stop="checkboxSelect(item)"></ion-checkbox>
${ctrl.render.code} ${ctrl.render.code}
<ion-button v-if="!isTempMode && !allLoaded && needLoadMore" class="loadmore_btn" @click="loadBottom">{{$t('app.button.loadmore')}}</ion-button> <ion-button v-if="!isTempMode && !allLoaded && needLoadMore" class="loadmore_btn" @click="loadBottom">{{$t('app.button.loadmore')}}</ion-button>
</template> </template>
...@@ -26,11 +27,11 @@ ...@@ -26,11 +27,11 @@
<ion-item> <ion-item>
<#--多数据视图||多数据视图(部件视图)--> <#--多数据视图||多数据视图(部件视图)-->
<template v-if="(viewType == 'DEMOBMDVIEW') && controlStyle != 'SWIPERVIEW' "> <template v-if="(viewType == 'DEMOBMDVIEW') && controlStyle != 'SWIPERVIEW' ">
<ion-checkbox slot="start" :checked="item.checked" v-show="showCheack" @click.stop="checkboxSelect(item)"></ion-checkbox> <ion-checkbox slot="start" :checked="item.checked" v-show="isChoose" @click.stop="checkboxSelect(item)"></ion-checkbox>
${ctrl.render.code} ${ctrl.render.code}
</template> </template>
<template v-else-if="(viewType == 'DEMOBMDVIEW9')"> <template v-else-if="(viewType == 'DEMOBMDVIEW9')">
<ion-checkbox slot="start" :checked="item.checked" v-show="showCheack" @click.stop="checkboxSelect(item)"></ion-checkbox> <ion-checkbox slot="start" :checked="item.checked" v-show="isChoose" @click.stop="checkboxSelect(item)"></ion-checkbox>
${ctrl.render.code} ${ctrl.render.code}
</template> </template>
<template v-else-if="(viewType == 'DEMOBMDVIEW' || viewType == 'DEMOBMDVIEW9') && controlStyle === 'SWIPERVIEW'"> <template v-else-if="(viewType == 'DEMOBMDVIEW' || viewType == 'DEMOBMDVIEW9') && controlStyle === 'SWIPERVIEW'">
...@@ -61,8 +62,9 @@ ...@@ -61,8 +62,9 @@
<ion-list class="items" ref="ionlist"> <ion-list class="items" ref="ionlist">
<template v-if="(viewType == 'DEMOBMDVIEW9') && controlStyle != 'SWIPERVIEW' "> <template v-if="(viewType == 'DEMOBMDVIEW9') && controlStyle != 'SWIPERVIEW' ">
<div class="selectall"> <div class="selectall">
<ion-checkbox :checked="selectAllIschecked" v-show="showCheack" @ionChange="checkboxAll"></ion-checkbox> <ion-checkbox :checked="selectAllIschecked" v-show="isChoose" @ionChange="checkboxAll"></ion-checkbox>
<ion-label class="selectal-label" v-show="showCheack">全选</ion-label> <ion-label class="selectal-label" v-show="isChoose">全选</ion-label>
<ion-label class="exit_select-label" v-show="isChoose" @click="onCheackChange">退出选择</ion-label>
</div> </div>
<ion-item-sliding ref="sliding" v-for="item in items" @click="item_click(item)" :key="item.srfkey" class="app-mob-mdctrl-item" :disabled="item.sliding_disabled" @ionDrag="ionDrag"> <ion-item-sliding ref="sliding" v-for="item in items" @click="item_click(item)" :key="item.srfkey" class="app-mob-mdctrl-item" :disabled="item.sliding_disabled" @ionDrag="ionDrag">
<#-- BENGIN:输出界面行为组 --> <#-- BENGIN:输出界面行为组 -->
...@@ -74,7 +76,7 @@ ...@@ -74,7 +76,7 @@
<#-- END:输出项布局面板 --> <#-- END:输出项布局面板 -->
<#else> <#else>
<ion-item> <ion-item>
<ion-checkbox slot="start" :checked="item.checked" v-show="showCheack" @click.stop="checkboxSelect(item)"></ion-checkbox> <ion-checkbox slot="start" :checked="item.checked" v-show="isChoose" @click.stop="checkboxSelect(item)"></ion-checkbox>
<#--实体列表项集合--> <#--实体列表项集合-->
<#if ctrl.getPSDEListItems()??> <#if ctrl.getPSDEListItems()??>
<!-- 列表视图样式 --> <!-- 列表视图样式 -->
...@@ -94,8 +96,9 @@ ...@@ -94,8 +96,9 @@
<#--多数据视图||多数据视图(部件视图)--> <#--多数据视图||多数据视图(部件视图)-->
<template v-if="(viewType == 'DEMOBMDVIEW') && controlStyle != 'SWIPERVIEW' "> <template v-if="(viewType == 'DEMOBMDVIEW') && controlStyle != 'SWIPERVIEW' ">
<div class="selectall"> <div class="selectall">
<ion-checkbox slot="start" :checked="selectAllIschecked" v-show="showCheack" @ionChange="checkboxAll"></ion-checkbox> <ion-checkbox slot="start" :checked="selectAllIschecked" v-show="isChoose" @ionChange="checkboxAll"></ion-checkbox>
<ion-label class="selectal-label" v-show="showCheack">全选</ion-label> <ion-label class="selectal-label" v-show="isChoose">全选</ion-label>
<ion-label class="exit_select-label" v-show="isChoose" @click="onCheackChange">退出选择</ion-label>
</div> </div>
<#if ctrl.isEnableGroup?? && ctrl.isEnableGroup()?? && ctrl.isEnableGroup()> <#if ctrl.isEnableGroup?? && ctrl.isEnableGroup()?? && ctrl.isEnableGroup()>
<div class="item-grouped" v-for="obj in group_data" :key="obj.index"> <div class="item-grouped" v-for="obj in group_data" :key="obj.index">
...@@ -114,7 +117,7 @@ ...@@ -114,7 +117,7 @@
<#-- END:输出项布局面板 --> <#-- END:输出项布局面板 -->
<#else> <#else>
<ion-item> <ion-item>
<ion-checkbox slot="start" :checked="item.checked" v-show="showCheack" @click.stop="checkboxSelect(item)"></ion-checkbox> <ion-checkbox slot="start" :checked="item.checked" v-show="isChoose" @click.stop="checkboxSelect(item)"></ion-checkbox>
<#--实体列表项集合--> <#--实体列表项集合-->
<#if ctrl.getPSDEListItems()??> <#if ctrl.getPSDEListItems()??>
<!-- 列表视图样式 --> <!-- 列表视图样式 -->
...@@ -142,7 +145,7 @@ ...@@ -142,7 +145,7 @@
<#-- END:输出项布局面板 --> <#-- END:输出项布局面板 -->
<#else> <#else>
<ion-item> <ion-item>
<ion-checkbox slot="start" :checked="item.checked" v-show="showCheack" @click.stop="checkboxSelect(item)"></ion-checkbox> <ion-checkbox slot="start" :checked="item.checked" v-show="isChoose" @click.stop="checkboxSelect(item)"></ion-checkbox>
<#--实体列表项集合--> <#--实体列表项集合-->
<#if ctrl.getPSDEListItems()??> <#if ctrl.getPSDEListItems()??>
<!-- 列表视图样式 --> <!-- 列表视图样式 -->
......
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
public onCheackChange(){ public onCheackChange(){
this.$emit('showCheackChange', !this.showCheack); this.$emit('isChooseChange', !this.isChoose);
} }
/** /**
...@@ -754,7 +754,7 @@ ...@@ -754,7 +754,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
public item_click(item:any){ public item_click(item:any){
if(this.showCheack){ if(this.isChoose){
let count = this.selectedArray.findIndex((i) => { let count = this.selectedArray.findIndex((i) => {
return i.mobentityid == item.mobentityid; return i.mobentityid == item.mobentityid;
}); });
...@@ -1011,7 +1011,7 @@ ...@@ -1011,7 +1011,7 @@
* *
* @memberof Mdctrl * @memberof Mdctrl
*/ */
@Prop({default:false}) showCheack?: boolean; @Prop({default:false}) isChoose?: boolean;
/** /**
* 选中或取消事件 * 选中或取消事件
...@@ -1165,7 +1165,7 @@ ...@@ -1165,7 +1165,7 @@
this.timeOutEvent = 0; this.timeOutEvent = 0;
this.timeOutEvent = setTimeout(() => { this.timeOutEvent = setTimeout(() => {
if(_this.timeOutEvent > 0){ if(_this.timeOutEvent > 0){
_this.showCheack = !_this.showCheack; this.onCheackChange();
} }
console.log(this.timeOutEvent); console.log(this.timeOutEvent);
this.timeOutEvent = 0 this.timeOutEvent = 0
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
fetchAction="<#if ctrl.getFetchPSControlAction?? && ctrl.getFetchPSControlAction()?? && ctrl.getFetchPSControlAction().getPSAppDEMethod()??>${ctrl.getFetchPSControlAction().getPSAppDEMethod().getCodeName()}</#if>" fetchAction="<#if ctrl.getFetchPSControlAction?? && ctrl.getFetchPSControlAction()?? && ctrl.getFetchPSControlAction().getPSAppDEMethod()??>${ctrl.getFetchPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
:isMutli="!isSingleSelect" :isMutli="!isSingleSelect"
<#if view.getViewType?? && view.getViewType()?? && view.getViewType() == 'DEMOBMDVIEW' || view.getViewType() == 'DEMOBMDVIEW9'> <#if view.getViewType?? && view.getViewType()?? && view.getViewType() == 'DEMOBMDVIEW' || view.getViewType() == 'DEMOBMDVIEW9'>
:showCheack="showCheack" :isChoose="isChoose"
@showCheackChange="showCheackChange" @isChooseChange="isChooseChange"
</#if> </#if>
<#if view.isEnableQuickGroup?? && view.isEnableQuickGroup()?? && view.isEnableQuickGroup() == true> <#if view.isEnableQuickGroup?? && view.isEnableQuickGroup()?? && view.isEnableQuickGroup() == true>
@pageTotalChange="pageTotalChange($event)" @pageTotalChange="pageTotalChange($event)"
......
...@@ -9,11 +9,19 @@ ...@@ -9,11 +9,19 @@
--inner-border-width:0; --inner-border-width:0;
} }
.selectall{ .selectall{
padding: 0 8px; padding: 0 10px;
display: flex; display: flex;
height: 30px;
line-height: 30px;
} }
.selectal-label{ .selectal-label {
padding-left: 15px; padding-left: 15px;
font-size: 13px;
}
.exit_select-label{
padding-left: 10px;
font-size: 13px;
color: #0072ff;
} }
.app-mob-mdctrl{ .app-mob-mdctrl{
height:100%; height:100%;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<#assign layoutpanel=ctrl.getItemPSLayoutPanel()> <#assign layoutpanel=ctrl.getItemPSLayoutPanel()>
<div style="width:100%;"> <div style="width:100%;">
<ion-item class="ibz-ionic-item"> <ion-item class="ibz-ionic-item">
<ion-checkbox slot="start" class="iconcheck" v-show="showCheack" @click.stop="checkboxSelect(item)"></ion-checkbox> <ion-checkbox slot="start" class="iconcheck" v-show="isChoose" @click.stop="checkboxSelect(item)"></ion-checkbox>
<layout_${layoutpanel.getName()} :context="{}" :viewparams="{}" :item="item"></layout_${layoutpanel.getName()}> <layout_${layoutpanel.getName()} :context="{}" :viewparams="{}" :item="item"></layout_${layoutpanel.getName()}>
</ion-item> </ion-item>
</div> </div>
......
...@@ -6,7 +6,7 @@ ${P.getCtrlCode('mdctrl', 'CONTROL.html').code} ...@@ -6,7 +6,7 @@ ${P.getCtrlCode('mdctrl', 'CONTROL.html').code}
<#assign view_footer> <#assign view_footer>
<#if mdctrl.getBatchPSDEToolbar?? && mdctrl.getBatchPSDEToolbar()??> <#if mdctrl.getBatchPSDEToolbar?? && mdctrl.getBatchPSDEToolbar()??>
<#assign batchToolbar = mdctrl.getBatchPSDEToolbar()> <#assign batchToolbar = mdctrl.getBatchPSDEToolbar()>
<div v-show="showCheack" > <div v-show="isChoose" >
<@ibizindent blank=8> <@ibizindent blank=8>
${P.getCtrlCode(batchToolbar, 'CONTROL.html').code} ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
</@ibizindent> </@ibizindent>
......
...@@ -6,7 +6,7 @@ ${P.getCtrlCode('calendar', 'CONTROL.html').code} ...@@ -6,7 +6,7 @@ ${P.getCtrlCode('calendar', 'CONTROL.html').code}
<#assign view_footer> <#assign view_footer>
<#if calendar.getBatchPSDEToolbar?? && calendar.getBatchPSDEToolbar()??> <#if calendar.getBatchPSDEToolbar?? && calendar.getBatchPSDEToolbar()??>
<#assign batchToolbar = calendar.getBatchPSDEToolbar()> <#assign batchToolbar = calendar.getBatchPSDEToolbar()>
<div v-show="showCheack" class="batch_btn"> <div v-show="isChoose" class="batch_btn">
<@ibizindent blank=8> <@ibizindent blank=8>
${P.getCtrlCode(batchToolbar, 'CONTROL.html').code} ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
</@ibizindent> </@ibizindent>
......
...@@ -241,8 +241,8 @@ ...@@ -241,8 +241,8 @@
* *
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public showCheackChange(value:any){ public isChooseChange(value:any){
this.showCheack = value; this.isChoose = value;
} }
/** /**
...@@ -250,14 +250,14 @@ ...@@ -250,14 +250,14 @@
* *
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public showCheack = false; public isChoose = false;
/** /**
* 取消选择状态 * 取消选择状态
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public cancelSelect() { public cancelSelect() {
this.showCheackChange(false); this.isChooseChange(false);
} }
/** /**
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
* *
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public showCheackChange(value:any){ public isChooseChange(value:any){
this.showCheack = value; this.isChoose = value;
} }
/** /**
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
* *
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public showCheack = false; public isChoose = false;
/** /**
* 取消选择状态 * 取消选择状态
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public cancelSelect() { public cancelSelect() {
this.showCheackChange(false); this.isChooseChange(false);
} }
<#if view.hasPSControl('calendar')> <#if view.hasPSControl('calendar')>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册