Skip to content

iBiz-Vue-R7
iBiz-Vue-R7
提交 f7a0a322 编写于 作者: tony001's avatar tony001
浏览文件
操作

Merge branch 'dev'

上级 4794cfc7 e64ccb32
显示空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 89 行删除
@CONTROL/列表/CONTROL-BASE.vue.ftl
浏览文件 @ f7a0a322
......@@ -40,10 +40,10 @@
<span class="date">{{ item.srfdate }}</span>
</div>
<div class="app-list-item-action">
<template v-for="(action,index) in Object.keys(ActionModel)">
<template v-for="(action,index) in Object.keys(actionModel)">
<a :key="index" style="display: inline-block;margin: 0 12px;" @click="uiAction(item, action, $event)">
<i :class="ActionModel[action].icon" style="margin-right:2px;"></i>
<span>{{ActionModel[action].caption}}</span>
<i :class="actionModel[action].icon" style="margin-right:2px;"></i>
<span>{{actionModel[action].caption}}</span>
</a>
</template>
</div>
......@@ -67,10 +67,10 @@
<#else>
<div class="app-list-item-content">{{item.srfmajortext}}</div>
<div calss="app-list-item-action">
<template v-for="(action,index) in Object.keys(ActionModel)">
<template v-for="(action,index) in Object.keys(actionModel)">
<a :key="index" style="display: inline-block;margin: 0 12px;" @click="uiAction(item, action, $event)">
<i :class="ActionModel[action].icon" style="margin-right:2px;"></i>
<span>{{ActionModel[action].caption}}</span>
<i :class="actionModel[action].icon" style="margin-right:2px;"></i>
<span>{{actionModel[action].caption}}</span>
</a>
</template>
</div>
......@@ -238,12 +238,12 @@ import CodeListService from "@/codelist/codelist-service";
public groupField: string = "<#if ctrl.getGroupPSDEField?? && ctrl.getGroupPSDEField()??>${ctrl.getGroupPSDEField().getCodeName()?lower_case}</#if>";
/**
* 分组属性代码表
* 分组属性是否配置代码表
*
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public groupFieldCodelist: any = {<#if ctrl.getGroupPSDEField()?? && ctrl.getGroupPSDEField().getPSCodeList?? && ctrl.getGroupPSDEField().getPSCodeList()??>type: '${ctrl.getGroupPSDEField().getPSCodeList().getCodeListType()}',tag: '${ctrl.getGroupPSDEField().getPSCodeList().getCodeName()}'</#if>};
public groupFieldCodelist: boolean = <#if ctrl.getGroupPSDEField()?? && ctrl.getGroupPSDEField().getPSCodeList?? && ctrl.getGroupPSDEField().getPSCodeList()??>true<#else>false</#if>;
/**
* 分组数据
......@@ -301,22 +301,17 @@ import CodeListService from "@/codelist/codelist-service";
groups = Util.deepCopy(groupCodelist);
}
if(Object.keys(this.groupFieldCodelist).length > 0){
let fieldCodelist: any = await this.codeListService.getDataItems(this.groupFieldCodelist);
fields = Util.deepCopy(fieldCodelist);
}
if(groups.length == 0){
console.warn("分组数据无效");
}
groups.forEach((group: any,i: number)=>{
let children:Array<any> = [];
data.forEach((item: any,j: number)=>{
if(fields && fields.length > 0){
const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
if(arr && arr.length>0 && Object.is(group.label,arr[0].label)) {
if(this.groupFieldCodelist){
if(Object.is(group.label,item[this.groupField])) {
children.push(item);
}
}else if(Object.is(group.label,item[this.groupField])){
}else if(Object.is(group.value,item[this.groupField])){
children.push(item);
}
});
......@@ -329,13 +324,10 @@ import CodeListService from "@/codelist/codelist-service";
let child:Array<any> = [];
data.forEach((item: any)=>{
let i: number = 0;
if(fields && fields.length > 0){
const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
if(arr && arr.length>0) {
i = groups.findIndex((group: any)=>Object.is(group.label,arr[0].label));
}
}else{
if(this.groupFieldCodelist){
i = groups.findIndex((group: any)=>Object.is(group.label,item[this.groupField]));
}else{
i = groups.findIndex((group: any)=>Object.is(group.value,item[this.groupField]));
}
if(i < 0){
child.push(item);
......@@ -362,19 +354,10 @@ import CodeListService from "@/codelist/codelist-service";
let data:Array<any> = [...this.items];
let groups:Array<any> = [];
let fields: Array<any> = [];
if(Object.keys(this.groupFieldCodelist).length > 0){
let fieldCodelist: any = await this.codeListService.getDataItems(this.groupFieldCodelist);
fields = Util.deepCopy(fieldCodelist);
}
data.forEach((item: any)=>{
if(item.hasOwnProperty(this.groupField)){
if(fields && fields.length > 0){
const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
groups.push(arr[0].label);
}else{
groups.push(item[this.groupField]);
}
}
});
groups = [...new Set(groups)];
if(groups.length == 0){
......@@ -941,7 +924,7 @@ import CodeListService from "@/codelist/codelist-service";
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public ActionModel:any ={
public actionModel:any ={
<#if ctrl.getPSDEListItems?? && ctrl.getPSDEListItems()??>
<#list ctrl.getPSDEListItems() as listItem>
<#if listItem.getPSDEUIActionGroup?? && listItem.getPSDEUIActionGroup()??>
......
@CONTROL/数据视图/CONTROL-BASE.vue.ftl
浏览文件 @ f7a0a322
......@@ -46,10 +46,10 @@
</div>
</div>
<div class="data-view-item-action">
<template v-for="(action,index) in Object.keys(ActionModel)">
<template v-for="(action,index) in Object.keys(actionModel)">
<button type="info" :key="index" @click="uiAction(item, action, $event)">
<i :class="ActionModel[action].icon" style="margin-right:2px;"></i>
<span>{{ActionModel[action].caption}}</span>
<i :class="actionModel[action].icon" style="margin-right:2px;"></i>
<span>{{actionModel[action].caption}}</span>
</button>
</template>
</div>
......@@ -85,10 +85,10 @@
</div>
</div>
<div class="data-view-item-action">
<template v-for="(action,index) in Object.keys(ActionModel)">
<template v-for="(action,index) in Object.keys(actionModel)">
<button type="info" :key="index" @click="uiAction(item, action, $event)">
<i :class="ActionModel[action].icon" style="margin-right:2px;"></i>
<span>{{ActionModel[action].caption}}</span>
<i :class="actionModel[action].icon" style="margin-right:2px;"></i>
<span>{{actionModel[action].caption}}</span>
</button>
</template>
</div>
......@@ -258,12 +258,12 @@ import CodeListService from "@/codelist/codelist-service";
public groupField: string = "<#if ctrl.getGroupPSDEField?? && ctrl.getGroupPSDEField()??>${ctrl.getGroupPSDEField().getCodeName()?lower_case}</#if>";
/**
* 分组属性代码表
* 分组属性是否配置代码表
*
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public groupFieldCodelist: any = {<#if ctrl.getGroupPSDEField()?? && ctrl.getGroupPSDEField().getPSCodeList?? && ctrl.getGroupPSDEField().getPSCodeList()??>type: '${ctrl.getGroupPSDEField().getPSCodeList().getCodeListType()}',tag: '${ctrl.getGroupPSDEField().getPSCodeList().getCodeName()}'</#if>};
public groupFieldCodelist: boolean = <#if ctrl.getGroupPSDEField()?? && ctrl.getGroupPSDEField().getPSCodeList?? && ctrl.getGroupPSDEField().getPSCodeList()??>true<#else>false</#if>;
/**
* 分组数据
......@@ -358,11 +358,6 @@ import CodeListService from "@/codelist/codelist-service";
if(Object.keys(this.groupCodelist).length > 0){
let groupCodelist: any = await this.codeListService.getDataItems(this.groupCodelist);
groups = Util.deepCopy(groupCodelist);
}
if(Object.keys(this.groupFieldCodelist).length > 0){
let fieldCodelist: any = await this.codeListService.getDataItems(this.groupFieldCodelist);
fields = Util.deepCopy(fieldCodelist);
}
if(groups.length == 0){
console.warn("分组数据无效");
......@@ -370,12 +365,11 @@ import CodeListService from "@/codelist/codelist-service";
groups.forEach((group: any,i: number)=>{
let children:Array<any> = [];
data.forEach((item: any,j: number)=>{
if(fields && fields.length > 0){
const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
if(arr && arr.length>0 && Object.is(group.label,arr[0].label)) {
if(this.groupFieldCodelist){
if(Object.is(group.label,item[this.groupField])) {
children.push(item);
}
}else if(Object.is(group.label,item[this.groupField])){
}else if(Object.is(group.value,item[this.groupField])){
children.push(item);
}
});
......@@ -388,13 +382,10 @@ import CodeListService from "@/codelist/codelist-service";
let child:Array<any> = [];
data.forEach((item: any)=>{
let i: number = 0;
if(fields && fields.length > 0){
const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
if(arr && arr.length>0) {
i = groups.findIndex((group: any)=>Object.is(group.label,arr[0].label));
}
}else{
if(this.groupFieldCodelist){
i = groups.findIndex((group: any)=>Object.is(group.label,item[this.groupField]));
}else{
i = groups.findIndex((group: any)=>Object.is(group.value,item[this.groupField]));
}
if(i < 0){
child.push(item);
......@@ -421,19 +412,10 @@ import CodeListService from "@/codelist/codelist-service";
let data:Array<any> = [...this.items];
let groups:Array<any> = [];
let fields: Array<any> = [];
if(Object.keys(this.groupFieldCodelist).length > 0){
let fieldCodelist: any = await this.codeListService.getDataItems(this.groupFieldCodelist);
fields = Util.deepCopy(fieldCodelist);
}
data.forEach((item: any)=>{
if(item.hasOwnProperty(this.groupField)){
if(fields && fields.length > 0){
const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
groups.push(arr[0].label);
}else{
groups.push(item[this.groupField]);
}
}
});
groups = [...new Set(groups)];
if(groups.length == 0){
......@@ -489,7 +471,7 @@ import CodeListService from "@/codelist/codelist-service";
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public ActionModel:any ={
public actionModel:any ={
<#if ctrl.getPSDEDataViewItems?? && ctrl.getPSDEDataViewItems()??>
<#list ctrl.getPSDEDataViewItems() as dataViewItem>
<#if dataViewItem.getPSDEUIActionGroup?? && dataViewItem.getPSDEUIActionGroup()??>
......
@CONTROL/树视图/CONTROL-BASE.vue.ftl
浏览文件 @ f7a0a322
......@@ -699,7 +699,7 @@ import UIService from '@/uiservice/ui-service';
this.selectedNodes = [this.currentselectedNode];
}else{
this.selectedNodes = this.selectedNodes.concat(checkedNodes);
const tree: any = this.$refs.treeexpbar_tree;
const tree: any = this.$refs.${ctrl.name};
tree.setCheckedNodes(this.selectedNodes);
}
}
......
@CONTROL/表格/CONTROL-BASE.vue.ftl
浏览文件 @ f7a0a322
......@@ -176,7 +176,7 @@ ${gridColumn.getName()}
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public ActionModel:any ={
public actionModel:any ={
<#if ctrl.getPSUIActions()??>
<#list ctrl.getPSUIActions() as item>
${item.getUIActionTag()}: { name: '${item.getUIActionTag()}',disabled: false, visabled: true,noprivdisplaymode:<#if item.getNoPrivDisplayMode(view)??>${item.getNoPrivDisplayMode(view)}</#if>,dataaccaction: '<#if item.getDataAccessAction()??>${item.getDataAccessAction()}</#if>', actiontarget: '${item.getActionTarget()}'}<#if item_has_next>,</#if>
......@@ -655,7 +655,7 @@ ${gridColumn.getName()}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public getActionState(data:any){
let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
let tempActionModel:any = JSON.parse(JSON.stringify(this.actionModel));
let targetData:any = this.transformData(data);
ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
return tempActionModel;
......@@ -1360,6 +1360,10 @@ ${gridColumn.getName()}
return;
}
if(Object.is(action,'appRefresh')){
if(this.selections && this.selections.length > 0) {
this.selections = [];
this.$emit('selectionchange', this.selections);
}
this.refresh([data]);
}
})
......@@ -1481,6 +1485,7 @@ ${gridColumn.getName()}
}
return codelist;
}
/**
* 根据分组代码表绘制分组列表
*
......@@ -1501,13 +1506,12 @@ ${gridColumn.getName()}
let children:Array<any> = [];
this.items.forEach((item: any,j: number)=>{
if(allGroupField && allGroupField.length > 0){
const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
if(Object.is(group.label,arr[0].label)){
if(Object.is(group.label,item[this.groupAppField])){
item.groupById = Number((i+1) * 100 + (j+1) * 1);
item.group = '';
children.push(item);
}
}else if(Object.is(group.label,item[this.groupAppField])){
}else if(Object.is(group.value,item[this.groupAppField])){
item.groupById = Number((i+1) * 100 + (j+1) * 1);
item.group = '';
children.push(item);
......@@ -1546,10 +1550,9 @@ ${gridColumn.getName()}
this.items.forEach((item: any,index: number)=>{
let i: number = 0;
if(allGroupField && allGroupField.length > 0){
const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
i = allGroup.findIndex((group: any)=>Object.is(group.label,arr[0].label));
}else{
i = allGroup.findIndex((group: any)=>Object.is(group.label,item[this.groupAppField]));
}else{
i = allGroup.findIndex((group: any)=>Object.is(group.value,item[this.groupAppField]));
}
if(i < 0){
item.groupById = Number((allGroup.length+1) * 100 + (index+1) * 1);
......@@ -1609,17 +1612,10 @@ ${gridColumn.getName()}
if(!this.isEnableGroup) return;
// 分组
let allGroup: Array<any> = [];
let allGroupField: Array<any> =[];
allGroupField = this.getGroupCodelist(this.groupAppFieldCodelistType,this.groupAppFieldCodelistTag);
this.items.forEach((item: any)=>{
if(item.hasOwnProperty(this.groupAppField)){
if(allGroupField && allGroupField.length > 0){
const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
allGroup.push(arr[0].label);
}else{
allGroup.push(item[this.groupAppField]);
}
}
});
let groupTree:Array<any> = [];
allGroup = [...new Set(allGroup)];
......@@ -1630,14 +1626,7 @@ ${gridColumn.getName()}
allGroup.forEach((group: any, groupIndex: number)=>{
let children:Array<any> = [];
this.items.forEach((item: any,itemIndex: number)=>{
if(allGroupField && allGroupField.length > 0){
const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
if(Object.is(group,arr[0].label)){
item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
item.group = '';
children.push(item);
}
}else if(Object.is(group,item[this.groupAppField])){
if(Object.is(group,item[this.groupAppField])){
item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
item.group = '';
children.push(item);
......
@CONTROL/面板/CONTROL-BASE.vue.ftl
浏览文件 @ f7a0a322
......@@ -50,6 +50,14 @@ import UIService from '@/uiservice/ui-service';
*/
@Prop() public inputData?: any;
/**
* 操作栏模型数据
*
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() public actionModel?: any;
/**
* UI数据对象
*
......
@CONTROL/面板/CONTROL.html.ftl
浏览文件 @ f7a0a322
......@@ -4,6 +4,8 @@
:context="context"
:parentRef="thisRef"
:inputData="item"
:actionModel="actionModel ? actionModel : null"
@uiAction="(item, action, event) => { uiAction(item, action, event); }"
@panelDataChange="($event)=>{onPanelDataChange(item,$event)}"
name="${ctrl.name}"
ref='${ctrl.name}'>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或