Skip to content

I
ibzlite
提交 41811b87 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zoo457790531 发布系统代码 [ibz-lite，应用]

上级 67cca046
隐藏空白字符变更
内嵌 并排
正在显示 包含 21 行增加 和 60 行删除
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_BO_CN_base.ts
浏览文件 @ 41811b87
......@@ -43,10 +43,9 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
status: commonLogic.appcommonhandle("状态",null),
},
nodata:commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_en_US_base.ts
浏览文件 @ 41811b87
......@@ -43,10 +43,9 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
status: commonLogic.appcommonhandle("状态",null),
},
nodata:commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_zh_CN_base.ts
浏览文件 @ 41811b87
......@@ -43,10 +43,9 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
status: commonLogic.appcommonhandle("状态",null),
},
nodata:commonLogic.appcommonhandle("",null),
......
app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-base.vue
浏览文件 @ 41811b87
......@@ -22,20 +22,20 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('configid')">
<el-table-column show-overflow-tooltip :prop="'configid'" :label="$t('entities.metadynamicmodel.main_grid.columns.configid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('dynainstid')">
<el-table-column show-overflow-tooltip :prop="'dynainstid'" :label="$t('entities.metadynamicmodel.main_grid.columns.dynainstid')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.configid')}}
{{$t('entities.metadynamicmodel.main_grid.columns.dynainstid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.configid}}</span>
<span>{{row.dynainstid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('configname')">
<el-table-column show-overflow-tooltip :prop="'configname'" :label="$t('entities.metadynamicmodel.main_grid.columns.configname')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'configname'" :label="$t('entities.metadynamicmodel.main_grid.columns.configname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.configname')}}
......@@ -47,7 +47,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('systemid')">
<el-table-column show-overflow-tooltip :prop="'systemid'" :label="$t('entities.metadynamicmodel.main_grid.columns.systemid')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'systemid'" :label="$t('entities.metadynamicmodel.main_grid.columns.systemid')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.systemid')}}
......@@ -58,20 +58,8 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('dynainstid')">
<el-table-column show-overflow-tooltip :prop="'dynainstid'" :label="$t('entities.metadynamicmodel.main_grid.columns.dynainstid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.dynainstid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.dynainstid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('status')">
<el-table-column show-overflow-tooltip :prop="'status'" :label="$t('entities.metadynamicmodel.main_grid.columns.status')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'status'" :label="$t('entities.metadynamicmodel.main_grid.columns.status')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.status')}}
......@@ -642,9 +630,9 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public allColumns: any[] = [
{
name: 'configid',
label: 'ID',
langtag: 'entities.metadynamicmodel.main_grid.columns.configid',
name: 'dynainstid',
label: '动态实例标识',
langtag: 'entities.metadynamicmodel.main_grid.columns.dynainstid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
......@@ -668,15 +656,6 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'dynainstid',
label: '动态实例标识',
langtag: 'entities.metadynamicmodel.main_grid.columns.dynainstid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'status',
label: '状态',
......@@ -1390,7 +1369,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['configid','configname','systemid','dynainstid','status'];
let allColumns:Array<any> = ['dynainstid','configname','systemid','status'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1470,10 +1449,9 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((i+1)*100),
group: group.label,
configid:'',
dynainstid:'',
configname:'',
systemid:'',
dynainstid:'',
status:'',
children: children
}
......@@ -1501,10 +1479,9 @@ export default class MainBase extends Vue implements ControlInterface {
const Tree: any = {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
configid:'',
dynainstid:'',
configname:'',
systemid:'',
dynainstid:'',
status:'',
children: child
}
......@@ -1552,10 +1529,9 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((groupIndex+1)*100),
group: group,
configid:'',
dynainstid:'',
configname:'',
systemid:'',
dynainstid:'',
status:'',
children: children,
}
......@@ -1986,16 +1962,10 @@ export default class MainBase extends Vue implements ControlInterface {
});
}
} else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
let name: string = this.service.getNameByProp("configid");
if(name){
let desc: any = this.allColumns.find((column: any) =>{
return Object.is(column.name, name);
});
this.$Notice.error({
title: (this.$t('app.commonWords.createFailed') as string),
desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
});
}
this.$Notice.error({
title: (this.$t('app.commonWords.saveFailed') as string),
desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
});
}else {
this.$Notice.error({
title: (this.$t('app.commonWords.saveFailed') as string),
......@@ -2104,7 +2074,6 @@ export default class MainBase extends Vue implements ControlInterface {
return;
}
let tempContext: any = this.$util.deepCopy(this.context);
Object.is(tempContext, { metadynamicmodel: data.configid });
const arg: any = JSON.parse(JSON.stringify(data));
Object.assign(arg,{viewparams:this.viewparams});
const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);
......
app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-model.ts
浏览文件 @ 41811b87
......@@ -41,11 +41,6 @@ export default class MainModel {
prop: 'status',
dataType: 'SSCODELIST',
},
{
name: 'configid',
prop: 'configid',
dataType: 'TEXT',
},
{
name: 'configname',
prop: 'configname',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或