提交 d5933320 编写于 作者: JunZai's avatar JunZai

update

上级 501a6b69
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<i-input v-model="query" placeholder="<#if ctrl.getPSSearchBarQuickSearchs()??><#list ctrl.getPSSearchBarQuickSearchs() as search><#if search_index gt 0>,</#if><#if search.getPSDEField()??>${search.getPSDEField().getLogicName()}</#if></#list></#if>" style="<#if ctrl.getQuickSearchWidth() gt 0>width: ${ctrl.getQuickSearchWidth()?c}px;</#if>"></i-input> <i-input v-model="query" placeholder="<#if ctrl.getPSSearchBarQuickSearchs()??><#list ctrl.getPSSearchBarQuickSearchs() as search><#if search_index gt 0>,</#if><#if search.getPSDEField()??>${search.getPSDEField().getLogicName()}</#if></#list></#if>" style="<#if ctrl.getQuickSearchWidth() gt 0>width: ${ctrl.getQuickSearchWidth()?c}px;</#if>"></i-input>
</#if> --> </#if> -->
<modal <modal
class="searchbar-modal"
v-model="isShow" v-model="isShow"
:fullscreen="false" :fullscreen="false"
title="设置名称" title="设置名称"
...@@ -34,7 +35,18 @@ ...@@ -34,7 +35,18 @@
</el-select> </el-select>
<i-button type="primary" @click="onSearch">搜索</i-button> <i-button type="primary" @click="onSearch">搜索</i-button>
<i-button @click="onReset">重置</i-button> <i-button @click="onReset">重置</i-button>
<i-button @click="setName"><i class="fa fa-floppy-o" aria-hidden="true"></i></i-button> <Poptip ref="propip" trigger="hover" placement="top-end" title="存储自定义查询" :width="250" @on-popper-show="openPoper">
<i-button><i class="fa fa-floppy-o" aria-hidden="true"></i></i-button>
<template slot="content">
<div>
<i-input v-model="saveItemName" placeholder="名称"></i-input>
<div class="save-action">
<i-button @click="onCancel">取消</i-button>
<i-button type="primary" @click="onOk">保存</i-button>
</div>
</div>
</template>
</Poptip>
</div> </div>
</div> </div>
</div> </div>
...@@ -137,22 +149,6 @@ FilterTree, ...@@ -137,22 +149,6 @@ FilterTree,
*/ */
protected selectItem: any = null; protected selectItem: any = null;
/**
* 弹框层级下标
*
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected zIndex: number = 0;
/**
* 是否显示弹框
*
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected isShow: boolean = false;
/** /**
* 存储项名称 * 存储项名称
* *
...@@ -325,7 +321,7 @@ FilterTree, ...@@ -325,7 +321,7 @@ FilterTree,
let time = moment(); let time = moment();
this.historyItems.push({ this.historyItems.push({
name: (name ? name : time.format('YYYY-MM-DD HH:mm:ss')), name: (name ? name : time.format('YYYY-MM-DD HH:mm:ss')),
value: time.unix(), value: time.unix().toString(),
data: JSON.parse(JSON.stringify(this.filterItems)) data: JSON.parse(JSON.stringify(this.filterItems))
}) })
this.selectItem = time.unix(); this.selectItem = time.unix();
...@@ -395,17 +391,12 @@ FilterTree, ...@@ -395,17 +391,12 @@ FilterTree,
} }
/** /**
* 设置存储名称 * 打开弹框
* *
* @return {*} * @return {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public setName() { public openPoper() {
const zIndex = this.$store.getters.getZIndex();
if (zIndex) {
this.zIndex = zIndex + 100;
}
this.isShow = true;
this.saveItemName = ''; this.saveItemName = '';
} }
......
...@@ -4,8 +4,15 @@ ...@@ -4,8 +4,15 @@
float: right; float: right;
display: flex; display: flex;
align-items: center; align-items: center;
> .ivu-btn { > * {
margin-left: 5px; margin-left: 5px;
.save-action {
text-align: right;
margin-top: 10px;
> * {
margin-left: 5px;
}
}
} }
} }
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册