Skip to content

功
功能演示系统
提交 2da5b737 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

tony001 发布系统代码 [后台服务，演示应用]

上级 c66b3b5e
显示空白字符变更
内嵌 并排
正在显示 包含 389 行增加 和 470 行删除
app_Web/src/components/extend-action-timeline/extend-action-timeline.less
浏览文件 @ 2da5b737
......@@ -198,7 +198,7 @@
}
.timeline-wrapper__authorname {
width: 15%;
width: 10%;
min-width: 110px;
}
......
app_Web/src/components/extend-action-timeline/extend-action-timeline.vue
浏览文件 @ 2da5b737
......@@ -2,7 +2,7 @@
<div class="extend-action-timeline">
<div class="extend-action-timeline-table">
<div class="extend-action-timeline-thead"></div>
<div class="extend-action-timeline-body" v-if="data && data.usertasks">
<div class="extend-action-timeline-body" v-if="data.length > 0">
<div class="timeline-draw extend-action-timeline-body__timeline timeline-head">
<div class="timeline-wrapper">
<div class="timeline-wrapper__timeline-index">{{ $t('components.timeline.index') }}</div>
......@@ -14,8 +14,8 @@
</div>
<div class="timeline-arrow"></div>
</div>
<template v-for="(usertask, usertaskIndex) in data.usertasks">
<div v-if="usertask.comments.length > 0" class="timeline-content" :key="usertaskIndex">
<template v-for="(usertask, index) in data">
<div class="timeline-content" :key="index">
<div class="extend-action-timeline-body__timeline">
<div class="timeline-wrapper">
<div class="timeline-wrapper__timeline-index">
......@@ -25,179 +25,37 @@
</div>
<div class="icon-top" v-if="usertask.index < usertasksLength"></div>
</div>
<div class="timeline-wrapper__usertaskname">{{ usertask.userTaskName }}</div>
<div class="timeline-wrapper__authorname">
<Tooltip
placement="bottom"
theme="light"
:disabled="
acceptingOfficerNodup('authorName', usertask.comments).length > 1
? false
: true
"
>
{{
acceptingOfficerNodup('authorName', usertask.comments)
.map(item => item)
.toString()
}}
<div slot="content">
<div class="timeline-wrapper__authorname__tooltips">
<div
class="tooltips-content"
v-for="(item, toolindex) in acceptingOfficerNodup(
'authorName',
usertask.comments,
)"
:key="toolindex"
>
{{ item }}
</div>
</div>
</div>
</Tooltip>
</div>
<div class="timeline-wrapper__type">
<div class="timeline-wrapper__usertaskname">{{ usertask.usertaskname }}</div>
<div class="timeline-wrapper__authorname">{{usertask.displayNames ? usertask.displayNames.join(' , ') : usertask.authorName}}</div>
<div class="timeline-wrapper__type" v-if="usertask.type">
<div
v-if="
usertask.comments[usertask.comments.length - 1] &&
usertask.comments[usertask.comments.length - 1].type
"
class="dot"
></div>
<span>{{
usertask.comments[usertask.comments.length - 1] &&
usertask.comments[usertask.comments.length - 1].type
}}</span>
<span>{{usertask.type}}</span>
</div>
<div class="timeline-wrapper__last-time">
<div class="timeline-wrapper__last-time" v-if="usertask.time">
{{
usertask.comments[usertask.comments.length - 1] &&
formatDate(
usertask.comments[usertask.comments.length - 1].time,
usertask.time,
'MM月DD日 HH:mm:ss',
)
}}
</div>
<el-popover class="timeline-wrapper__tooltip" placement="top" :width="500" trigger="hover">
<div slot="reference">
{{
usertask.comments[usertask.comments.length - 1] &&
usertask.comments[usertask.comments.length - 1].fullMessage
}}
{{ usertask.fullMessage }}
</div>
<div class="fullmessage">
{{
usertask.comments[usertask.comments.length - 1] &&
usertask.comments[usertask.comments.length - 1].fullMessage
}}
{{ usertask.fullMessage }}
</div>
</el-popover>
</div>
<div
v-if="usertask.comments.length > 1 || usertask.identitylinks.length > 0"
class="timeline-arrow"
@click="changeExpand(usertask)"
>
<i :class="usertask.isShow ? 'el-icon-minus' : 'el-icon-plus'" />
</div>
</div>
<div v-if="usertask.isShow">
<template v-for="(comment, index) in usertask.comments">
<div class="timeline-draw extend-action-timeline-body__timeline" :key="index">
<div class="timeline-wrapper">
<div class="timeline-wrapper__timeline-index">
<div v-if="usertask.index < usertasksLength" class="icon-line"></div>
</div>
<div class="timeline-wrapper__usertaskname"></div>
<div class="timeline-wrapper__authorname">
{{ comment.authorName }}
</div>
<div class="timeline-wrapper__type">
<div class="dot"></div>
<span>{{ comment.type }}</span>
</div>
<div class="timeline-wrapper__last-time">
{{ formatDate(comment.time, 'MM月DD日 HH:mm:ss') }}
</div>
<div class="timeline-wrapper__fullmessage">{{ comment.fullMessage }}</div>
</div>
<div class="timeline-arrow"></div>
</div>
</template>
<div
v-if="usertask.identitylinks.length > 0"
class="timeline-draw extend-action-timeline-body__timeline"
>
<div class="timeline-wrapper">
<div class="timeline-wrapper__timeline-index">
<div v-if="usertask.index < usertasksLength" class="icon-line"></div>
</div>
<div class="timeline-wrapper__usertaskname">
{{ $t('components.timeline.inhand') }}
</div>
<div
class="timeline-wrapper__authorname">
<div
v-for="(identitylink, index) in usertask.identitylinks"
:key="index"
>
{{ identitylink.displayname }}
</div>
</div>
</div>
</div>
</div>
</div>
<div v-else class="timeline-content" :key="usertaskIndex">
<div class="extend-action-timeline-body__timeline">
<div class="timeline-wrapper">
<div class="timeline-wrapper__timeline-index">
<span>{{ usertask.index }}</span>
<div class="icon-bottom" v-if="usertask.index != 1">
<i class="el-icon-bottom"></i>
</div>
<div class="icon-top" v-if="usertask.index < usertasksLength"></div>
</div>
<div class="timeline-wrapper__usertaskname">{{ usertask.userTaskName }}</div>
<div class="timeline-wrapper__authorname">
<Tooltip
placement="bottom"
theme="light"
:disabled="
acceptingOfficerNodup('displayname', usertask.identitylinks).length > 1
? false
: true
"
>
{{
acceptingOfficerNodup('displayname', usertask.identitylinks)
.map(item => item)
.toString()
}}
<div slot="content">
<div class="tooltips">
<div
class="tooltips-content"
v-for="(item, toolindex) in acceptingOfficerNodup(
'displayname',
usertask.identitylinks,
)"
:key="toolindex"
>
{{ item }}
</div>
</div>
</div>
</Tooltip>
</div>
</div>
<div v-if="usertask.identitylinks.length > 1" class="timeline-arrow" @click="changeExpand(usertask)">
<div v-if="usertask.displayNames && usertask.displayNames.length > 1" class="timeline-arrow" @click="changeExpand(usertask)">
<i :class="usertask.isShow ? 'el-icon-minus' : 'el-icon-plus'" />
</div>
</div>
<div v-if="usertask.isShow">
<template v-for="(identitylink, index) in usertask.identitylinks">
<template v-for="(displayName, index) in usertask.displayNames">
<div class="timeline-draw extend-action-timeline-body__timeline" :key="index">
<div class="timeline-wrapper">
<div class="timeline-wrapper__timeline-index">
......@@ -205,7 +63,7 @@
</div>
<div class="timeline-wrapper__usertaskname"></div>
<div class="timeline-wrapper__authorname">
{{ identitylink.displayname }}
{{ displayName }}
</div>
</div>
<div class="timeline-arrow"></div>
......@@ -252,7 +110,7 @@ export default class ExtendActionTimeline extends Vue {
*
* @memberof ExtendActionTimeline
*/
public data: any = {};
public data: any[] = [];
/**
* 初始化memo
......@@ -292,8 +150,8 @@ export default class ExtendActionTimeline extends Vue {
if (this.appEntityService) {
this.appEntityService.GetWFHistory(this.context).then((response: any) => {
if (response && response.status === 200) {
this.data = response.data;
this.initUIStateData();
this.formatData(response.data);
this.initUIStateData(this.data);
} else {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response });
}
......@@ -309,19 +167,47 @@ export default class ExtendActionTimeline extends Vue {
*
* @memberof ExtendActionTimeline
*/
public initUIStateData() {
if (this.data && this.data.usertasks) {
public initUIStateData(items: any) {
if (items.length > 0) {
this.usertasksIndex = 1;
for (let i in this.data.usertasks) {
this.data.usertasks[i].isShow = false;
this.data.usertasks[i].index = this.usertasksIndex;
items.forEach((item: any) => {
item.isShow = false;
item.index = this.usertasksIndex;
this.usertasksIndex++;
}
})
this.usertasksLength = this.usertasksIndex - 1;
this.$forceUpdate();
}
}
/**
* 格式化数据
*
* @memberof ExtendActionTimeline
*/
public formatData(data: any) {
const historyTasks = data.historytasks || [];
const waitTasks = data.waittasks || [];
if (historyTasks.length > 0) {
this.data.push(...historyTasks);
}
if (waitTasks.length > 0) {
const taskItems: any[] = [];
waitTasks.forEach((task: any) => {
const index = taskItems.findIndex((item: any) => Object.is(task.usertaskid, item.usertaskid));
if (task.usertaskid && index == -1) {
task.displayNames = [task.displayname];
taskItems.push(task);
}
if (index != -1) {
const index = taskItems.findIndex((item: any) => Object.is(item.usertaskid, task.usertaskid));
taskItems[index].displayNames.push(task.displayname);
}
})
this.data.push(...taskItems);
}
}
/**
* 时间转换
*
......@@ -350,7 +236,7 @@ export default class ExtendActionTimeline extends Vue {
*/
public acceptingOfficerNodup(tag: string, data: any[]): any[] {
let tempData: any[] = [];
if (data.length > 0 && tag) {
if (data && data.length > 0 && tag) {
data.forEach((data: any) => {
tempData.push(data[tag]);
});
......
app_Web/src/uiservice/ibizbook/custom-view-grid-load-ui-logic-base.ts
浏览文件 @ 2da5b737
......@@ -30,15 +30,20 @@ export default class CustomViewGridLoadUILogicBase {
*/
protected logicParams: any[] = [
{
name: '搜索表单部件',
codeName: 'searchForm',
name: '视图参数',
codeName: 'viewParam',
viewNavDataParam: true,
},
{
name: '当前激活部件',
codeName: 'curCtrl',
activeCtrlParam: true,
ctrlParam: true,
},
{
name: '传入变量',
codeName: 'Default',
default: true,
entityParam: true,
name: '表格部件',
codeName: 'grid',
ctrlParam: true,
},
{
name: '当前视图',
......@@ -46,20 +51,19 @@ export default class CustomViewGridLoadUILogicBase {
activeViewParam: true,
},
{
name: '表格部件',
codeName: 'grid',
name: '搜索表单部件',
codeName: 'searchForm',
ctrlParam: true,
},
{
name: '视图参数',
codeName: 'viewParam',
viewNavDataParam: true,
name: '路由参数变量',
codeName: 'routeViewParam',
},
{
name: '当前激活部件',
codeName: 'curCtrl',
activeCtrlParam: true,
ctrlParam: true,
name: '传入变量',
codeName: 'Default',
default: true,
entityParam: true,
},
];
......@@ -142,6 +146,45 @@ export default class CustomViewGridLoadUILogicBase {
await this.execute_bindparam1_node(actionContext);
}
/**
* 绑定表格
*
* @param {UIActionContext} actionContext 界面逻辑上下文
* @memberof CustomViewGridLoadUILogicBase
*/
protected async execute_bindparam2_node(actionContext: UIActionContext) {
try {
// 源数据
const srcParam = actionContext.getParam('view');
// 目标数据
const dstParam = actionContext.getParam('grid');
// 源属性
const srcFieldName: string = 'grid';
if (srcFieldName) {
dstParam.bind(srcParam.get(srcFieldName));
} else {
dstParam.bind(srcParam.getReal());
}
actionContext.bindLastReturnParam(null);
} catch (error: any) {
throw new Error(`逻辑参数表格部件 ${error && error.message ? error.message : '发生未知错误!'}`);
}
console.log(`已完成执行绑定表格节点，操作参数数据如下:`);
if (actionContext.paramsMap && (actionContext.paramsMap.size > 0)) {
for (let [key, value] of actionContext.paramsMap) {
console.log(key, Util.deepCopy(value.getReal()));
}
}
if (Verify.testCond(this.getCondParam(actionContext, 'searchForm', ''), 'ISNOTNULL', '')) {
console.log(`即将执行搜索表单加载草稿节点`);
await this.execute_viewctrlinvoke2_node(actionContext);
}
if (Verify.testCond(this.getCondParam(actionContext, 'searchForm', ''), 'ISNULL', '')) {
console.log(`即将执行表格加载节点`);
await this.execute_viewctrlinvoke1_node(actionContext);
}
}
/**
* 搜索表单加载草稿
*
......@@ -281,44 +324,5 @@ export default class CustomViewGridLoadUILogicBase {
await this.execute_end1_node(actionContext);
}
/**
* 绑定表格
*
* @param {UIActionContext} actionContext 界面逻辑上下文
* @memberof CustomViewGridLoadUILogicBase
*/
protected async execute_bindparam2_node(actionContext: UIActionContext) {
try {
// 源数据
const srcParam = actionContext.getParam('view');
// 目标数据
const dstParam = actionContext.getParam('grid');
// 源属性
const srcFieldName: string = 'grid';
if (srcFieldName) {
dstParam.bind(srcParam.get(srcFieldName));
} else {
dstParam.bind(srcParam.getReal());
}
actionContext.bindLastReturnParam(null);
} catch (error: any) {
throw new Error(`逻辑参数表格部件 ${error && error.message ? error.message : '发生未知错误!'}`);
}
console.log(`已完成执行绑定表格节点，操作参数数据如下:`);
if (actionContext.paramsMap && (actionContext.paramsMap.size > 0)) {
for (let [key, value] of actionContext.paramsMap) {
console.log(key, Util.deepCopy(value.getReal()));
}
}
if (Verify.testCond(this.getCondParam(actionContext, 'searchForm', ''), 'ISNOTNULL', '')) {
console.log(`即将执行搜索表单加载草稿节点`);
await this.execute_viewctrlinvoke2_node(actionContext);
}
if (Verify.testCond(this.getCondParam(actionContext, 'searchForm', ''), 'ISNULL', '')) {
console.log(`即将执行表格加载节点`);
await this.execute_viewctrlinvoke1_node(actionContext);
}
}
}
\ No newline at end of file
app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue
浏览文件 @ 2da5b737
......@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public async loadDraft(opt: any = {},mode?:string): Promise<any> {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return;
}
const arg: any = { ...opt } ;
......
app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-base.vue
浏览文件 @ 2da5b737
......@@ -48,18 +48,18 @@
<div v-show="flag" class="batch-toolbar">
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction1.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
<i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
<i class='fa fa-edit'></i>
<span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
<span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
<div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction2.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
<i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
<i class='fa fa-remove'></i>
<span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
<span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
<div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
</tooltip>
</div>
</div>
......@@ -202,18 +202,18 @@ export default class Usr2Base extends Vue implements ControlInterface {
public appEntityService: IBIZBOOKEntityService = new IBIZBOOKEntityService({ $store: this.$store });
/**
* dataview_batchtoolbar 部件 click 事件
* dataviewexpbar_dataview_batchtoolbar 部件 click 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Usr2Base
*/
public dataview_batchtoolbar_click($event: any, $event2?: any) {
public dataviewexpbar_dataview_batchtoolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'deuiaction1')) {
this.dataview_batchtoolbar_deuiaction1_click(null, 'dataview_batchtoolbar', $event2);
this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
}
if (Object.is($event.tag, 'deuiaction2')) {
this.dataview_batchtoolbar_deuiaction2_click(null, 'dataview_batchtoolbar', $event2);
this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
}
}
......@@ -226,7 +226,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
* @param {*} [$event]
* @memberof
*/
public dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
public dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -254,7 +254,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
* @param {*} [$event]
* @memberof
*/
public dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
public dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -282,7 +282,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
* @param {*} [$event]
* @memberof
*/
public dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
public dataviewexpbar_dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
// 取数
let datas: any[] = [];
let xData: any = null;
......@@ -309,7 +309,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
* @param {*} [$event]
* @memberof
*/
public dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
public dataviewexpbar_dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
// 取数
let datas: any[] = [];
let xData: any = null;
......@@ -337,7 +337,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof IBIZBOOKUsr2DataViewBase
* @memberof IBIZBOOKDataViewExpViewBase
*/
public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) {
......@@ -363,7 +363,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof IBIZBOOKUsr2DataViewBase
* @memberof IBIZBOOKDataViewExpViewBase
*/
public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
......@@ -427,6 +427,12 @@ export default class Usr2Base extends Vue implements ControlInterface {
}
let result: boolean = true;
Object.assign(actionData, args);
if ('selectionchange'.indexOf(eventName) !== -1) {
result = await this.execute_dataviewexpbar_selectionchange_ctrl_logic(actionData) && result;
}
if ('load'.indexOf(eventName) !== -1) {
result = await this.execute_dataviewexpbar_load_ctrl_logic(actionData) && result;
}
if (!result) {
return false;
}
......@@ -434,6 +440,30 @@ export default class Usr2Base extends Vue implements ControlInterface {
return true;
}
/**
* 部件逻辑 -- dataviewexpbar_selectionchange
*
* @param {string} eventName 部件事件名称
* @param {any[]} data 数据
* @param {*} event 源事件对象
* @memberof Usr2Base
*/
public async execute_dataviewexpbar_selectionchange_ctrl_logic(actionData: any): Promise<boolean> {
console.log('暂未支持 CUSTOM 类型');
return true;
}
/**
* 部件逻辑 -- dataviewexpbar_load
*
* @param {string} eventName 部件事件名称
* @param {any[]} data 数据
* @param {*} event 源事件对象
* @memberof Usr2Base
*/
public async execute_dataviewexpbar_load_ctrl_logic(actionData: any): Promise<boolean> {
console.log('暂未支持 CUSTOM 类型');
return true;
}
......@@ -678,9 +708,9 @@ export default class Usr2Base extends Vue implements ControlInterface {
* 工具栏模型
*
* @type {*}
* @memberof IBIZBOOKUsr2DataView
* @memberof IBIZBOOKDataViewExpView
*/
public usr2dataviewdataview_batchtoolbarModels: any = {
public dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels: any = {
deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
......@@ -1005,7 +1035,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
*/
public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
return;
}
const arg: any = {...opt};
......@@ -1100,7 +1130,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
*/
public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
return;
}
let _datas:any[] = [];
......@@ -1217,7 +1247,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
try {
if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.createAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
......@@ -1225,7 +1255,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
}
}else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
if(item.ibizbook){
......@@ -1327,16 +1357,16 @@ export default class Usr2Base extends Vue implements ControlInterface {
public uiAction(data: any, tag: any, $event: any) {
$event.stopPropagation();
if(Object.is('Edit', tag)) {
this.dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
}
if(Object.is('Remove', tag)) {
this.dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
}
if(Object.is('Edit', tag)) {
this.dataview_memo1_u37f11a8_click(data, tag, $event);
this.dataviewexpbar_dataview_memo1_u37f11a8_click(data, tag, $event);
}
if(Object.is('Remove', tag)) {
this.dataview_memo1_uc365542_click(data, tag, $event);
this.dataviewexpbar_dataview_memo1_uc365542_click(data, tag, $event);
}
}
......
app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-model.ts
浏览文件 @ 2da5b737
......@@ -11,7 +11,7 @@ export default class Usr2Model {
* 获取数据项集合
*
* @returns {any[]}
* @memberof Usr2DataViewMode
* @memberof Usr2Dataviewexpbar_dataviewMode
*/
public getDataItems(): any[] {
return [
......@@ -40,17 +40,6 @@ export default class Usr2Model {
dataType: 'FONTKEY',
},
{
name: 'n_ibizbookname_like',
prop: 'n_ibizbookname_like',
dataType: 'QUERYPARAM'
},
{
name: 'n_price_gtandeq',
prop: 'n_price_gtandeq',
dataType: 'QUERYPARAM'
},
{
name:'size',
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json
浏览文件 @ 2da5b737
......@@ -2556,6 +2556,68 @@
}
} ],
"parallelOutput" : true
}, {
"codeName" : "BINDPARAM2",
"getDstPSDEUILogicParam" : {
"modelref" : true,
"id" : "grid"
},
"logicNodeType" : "BINDPARAM",
"name" : "绑定表格",
"getPSDEUILogicLinks" : [ {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "VIEWCTRLINVOKE2"
},
"linkMode" : 0,
"name" : "存在搜索表单",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "ISNOTNULL",
"getDstLogicParam" : {
"modelref" : true,
"id" : "searchForm"
},
"logicType" : "SINGLE",
"name" : "searchForm 值不为空(NotNil)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "BINDPARAM2"
}
}, {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "VIEWCTRLINVOKE1"
},
"linkMode" : 0,
"name" : "不存在搜索表单",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "ISNULL",
"getDstLogicParam" : {
"modelref" : true,
"id" : "searchForm"
},
"logicType" : "SINGLE",
"name" : "searchForm 值为空(Nil)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "BINDPARAM2"
}
} ],
"srcFieldName" : "grid",
"getSrcPSDEUILogicParam" : {
"modelref" : true,
"id" : "view"
}
}, {
"codeName" : "VIEWCTRLINVOKE2",
"getInvokeCtrl" : {
......@@ -2640,101 +2702,44 @@
"id" : "VIEWCTRLINVOKE1"
}
} ]
}, {
"codeName" : "BINDPARAM2",
"getDstPSDEUILogicParam" : {
"modelref" : true,
"id" : "grid"
},
"logicNodeType" : "BINDPARAM",
"name" : "绑定表格",
"getPSDEUILogicLinks" : [ {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "VIEWCTRLINVOKE2"
},
"linkMode" : 0,
"name" : "存在搜索表单",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "ISNOTNULL",
"getDstLogicParam" : {
"modelref" : true,
"id" : "searchForm"
},
"logicType" : "SINGLE",
"name" : "searchForm 值不为空(NotNil)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "BINDPARAM2"
}
}, {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "VIEWCTRLINVOKE1"
},
"linkMode" : 0,
"name" : "不存在搜索表单",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "ISNULL",
"getDstLogicParam" : {
"modelref" : true,
"id" : "searchForm"
},
"logicType" : "SINGLE",
"name" : "searchForm 值为空(Nil)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "BINDPARAM2"
}
} ],
"srcFieldName" : "grid",
"getSrcPSDEUILogicParam" : {
"modelref" : true,
"id" : "view"
}
} ],
"getPSDEUILogicParams" : [ {
"codeName" : "searchForm",
"logicName" : "搜索表单部件",
"name" : "搜索表单部件",
"codeName" : "viewParam",
"logicName" : "视图参数",
"name" : "视图参数",
"viewNavDataParam" : true
}, {
"codeName" : "curCtrl",
"logicName" : "当前激活部件",
"name" : "当前激活部件",
"activeCtrlParam" : true,
"ctrlParam" : true
}, {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"default" : true,
"entityParam" : true
"codeName" : "grid",
"logicName" : "表格部件",
"name" : "表格部件",
"ctrlParam" : true
}, {
"codeName" : "view",
"logicName" : "当前视图",
"name" : "当前视图",
"activeViewParam" : true
}, {
"codeName" : "grid",
"logicName" : "表格部件",
"name" : "表格部件",
"codeName" : "searchForm",
"logicName" : "搜索表单部件",
"name" : "搜索表单部件",
"ctrlParam" : true
}, {
"codeName" : "viewParam",
"logicName" : "视图参数",
"name" : "视图参数",
"viewNavDataParam" : true
"codeName" : "routeViewParam",
"logicName" : "路由参数变量",
"name" : "路由参数变量",
"navViewParamParam" : true
}, {
"codeName" : "curCtrl",
"logicName" : "当前激活部件",
"name" : "当前激活部件",
"activeCtrlParam" : true,
"ctrlParam" : true
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"default" : true,
"entityParam" : true
} ],
"getStartPSDEUILogicNode" : {
"modelref" : true,
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json
浏览文件 @ 2da5b737
......@@ -11,11 +11,11 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
},
"getPSDETreeColumns" : [ {
"caption" : "归还日期",
"codeName" : "returntime",
"caption" : "作者",
"codeName" : "author",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "returntime",
"name" : "returntime",
"dataItemName" : "author",
"name" : "author",
"width" : 200,
"widthUnit" : "px",
"enableExpand" : false,
......@@ -30,6 +30,16 @@
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "归还日期",
"codeName" : "returntime",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "returntime",
"name" : "returntime",
"width" : 200,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "出版社",
"codeName" : "press",
......@@ -50,16 +60,6 @@
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "作者",
"codeName" : "author",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "author",
"name" : "author",
"width" : 200,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
} ],
"getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : {
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json
浏览文件 @ 2da5b737
......@@ -19,11 +19,11 @@
}
} ],
"getPSDETreeColumns" : [ {
"caption" : "作者",
"codeName" : "author",
"caption" : "图书描述",
"codeName" : "subtext",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "author",
"name" : "author",
"dataItemName" : "subtext",
"name" : "subtext",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
......@@ -39,11 +39,11 @@
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "图书描述",
"codeName" : "subtext",
"caption" : "作者",
"codeName" : "author",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "subtext",
"name" : "subtext",
"dataItemName" : "author",
"name" : "author",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json
浏览文件 @ 2da5b737
......@@ -34,11 +34,11 @@
"id" : "GANTT"
},
"getPSDETreeColumns" : [ {
"caption" : "归还日期",
"codeName" : "returntime",
"caption" : "作者",
"codeName" : "author",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "returntime",
"name" : "returntime",
"dataItemName" : "author",
"name" : "author",
"width" : 200,
"widthUnit" : "px",
"enableExpand" : false,
......@@ -53,6 +53,16 @@
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "归还日期",
"codeName" : "returntime",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "returntime",
"name" : "returntime",
"width" : 200,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "出版社",
"codeName" : "press",
......@@ -73,16 +83,6 @@
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "作者",
"codeName" : "author",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "author",
"name" : "author",
"width" : 200,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
} ],
"getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : {
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json
浏览文件 @ 2da5b737
......@@ -75,11 +75,11 @@
"id" : "TREEGRIDEX"
},
"getPSDETreeColumns" : [ {
"caption" : "作者",
"codeName" : "author",
"caption" : "图书描述",
"codeName" : "subtext",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "author",
"name" : "author",
"dataItemName" : "subtext",
"name" : "subtext",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
......@@ -95,11 +95,11 @@
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "图书描述",
"codeName" : "subtext",
"caption" : "作者",
"codeName" : "author",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "subtext",
"name" : "subtext",
"dataItemName" : "author",
"name" : "author",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 2da5b737
......@@ -27469,6 +27469,68 @@
}
} ],
"parallelOutput" : true
}, {
"codeName" : "BINDPARAM2",
"getDstPSDEUILogicParam" : {
"modelref" : true,
"id" : "grid"
},
"logicNodeType" : "BINDPARAM",
"name" : "绑定表格",
"getPSDEUILogicLinks" : [ {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "VIEWCTRLINVOKE2"
},
"linkMode" : 0,
"name" : "存在搜索表单",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "ISNOTNULL",
"getDstLogicParam" : {
"modelref" : true,
"id" : "searchForm"
},
"logicType" : "SINGLE",
"name" : "searchForm 值不为空(NotNil)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "BINDPARAM2"
}
}, {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "VIEWCTRLINVOKE1"
},
"linkMode" : 0,
"name" : "不存在搜索表单",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "ISNULL",
"getDstLogicParam" : {
"modelref" : true,
"id" : "searchForm"
},
"logicType" : "SINGLE",
"name" : "searchForm 值为空(Nil)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "BINDPARAM2"
}
} ],
"srcFieldName" : "grid",
"getSrcPSDEUILogicParam" : {
"modelref" : true,
"id" : "view"
}
}, {
"codeName" : "VIEWCTRLINVOKE2",
"getInvokeCtrl" : {
......@@ -27553,101 +27615,44 @@
"id" : "VIEWCTRLINVOKE1"
}
} ]
}, {
"codeName" : "BINDPARAM2",
"getDstPSDEUILogicParam" : {
"modelref" : true,
"id" : "grid"
},
"logicNodeType" : "BINDPARAM",
"name" : "绑定表格",
"getPSDEUILogicLinks" : [ {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "VIEWCTRLINVOKE2"
},
"linkMode" : 0,
"name" : "存在搜索表单",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "ISNOTNULL",
"getDstLogicParam" : {
"modelref" : true,
"id" : "searchForm"
},
"logicType" : "SINGLE",
"name" : "searchForm 值不为空(NotNil)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "BINDPARAM2"
}
}, {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "VIEWCTRLINVOKE1"
},
"linkMode" : 0,
"name" : "不存在搜索表单",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "ISNULL",
"getDstLogicParam" : {
"modelref" : true,
"id" : "searchForm"
},
"logicType" : "SINGLE",
"name" : "searchForm 值为空(Nil)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "BINDPARAM2"
}
} ],
"srcFieldName" : "grid",
"getSrcPSDEUILogicParam" : {
"modelref" : true,
"id" : "view"
}
} ],
"getPSDEUILogicParams" : [ {
"codeName" : "searchForm",
"logicName" : "搜索表单部件",
"name" : "搜索表单部件",
"codeName" : "viewParam",
"logicName" : "视图参数",
"name" : "视图参数",
"viewNavDataParam" : true
}, {
"codeName" : "curCtrl",
"logicName" : "当前激活部件",
"name" : "当前激活部件",
"activeCtrlParam" : true,
"ctrlParam" : true
}, {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"default" : true,
"entityParam" : true
"codeName" : "grid",
"logicName" : "表格部件",
"name" : "表格部件",
"ctrlParam" : true
}, {
"codeName" : "view",
"logicName" : "当前视图",
"name" : "当前视图",
"activeViewParam" : true
}, {
"codeName" : "grid",
"logicName" : "表格部件",
"name" : "表格部件",
"codeName" : "searchForm",
"logicName" : "搜索表单部件",
"name" : "搜索表单部件",
"ctrlParam" : true
}, {
"codeName" : "viewParam",
"logicName" : "视图参数",
"name" : "视图参数",
"viewNavDataParam" : true
"codeName" : "routeViewParam",
"logicName" : "路由参数变量",
"name" : "路由参数变量",
"navViewParamParam" : true
}, {
"codeName" : "curCtrl",
"logicName" : "当前激活部件",
"name" : "当前激活部件",
"activeCtrlParam" : true,
"ctrlParam" : true
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"default" : true,
"entityParam" : true
} ],
"getStartPSDEUILogicNode" : {
"modelref" : true,
......
demo-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 2da5b737
......@@ -172,7 +172,7 @@
<!--输出实体[IBIZBOOK]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-850-7">
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-854-7">
<createTable tableName="T_IBIZBOOK">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或