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

app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_BO_CN_base.ts

@@ -43,10 +43,12 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				configid: commonLogic.appcommonhandle("ID",null),
 				dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
 				configname: commonLogic.appcommonhandle("名称",null),
 				systemid: commonLogic.appcommonhandle("系统标识",null),
 				status: commonLogic.appcommonhandle("状态",null),
+				pdynainstid: commonLogic.appcommonhandle("父ID",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_en_US_base.ts

@@ -43,10 +43,12 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				configid: commonLogic.appcommonhandle("ID",null),
 				dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
 				configname: commonLogic.appcommonhandle("名称",null),
 				systemid: commonLogic.appcommonhandle("系统标识",null),
 				status: commonLogic.appcommonhandle("状态",null),
+				pdynainstid: commonLogic.appcommonhandle("父ID",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_zh_CN_base.ts

@@ -43,10 +43,12 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				configid: commonLogic.appcommonhandle("ID",null),
 				dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
 				configname: commonLogic.appcommonhandle("名称",null),
 				systemid: commonLogic.appcommonhandle("系统标识",null),
 				status: commonLogic.appcommonhandle("状态",null),
+				pdynainstid: commonLogic.appcommonhandle("父ID",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-base.vue

@@ -22,6 +22,18 @@
             <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-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.metadynamicmodel.main_grid.columns.configid')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.configid}}</span>
+                    </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="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
@@ -72,6 +84,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('pdynainstid')">
+                <el-table-column show-overflow-tooltip :prop="'pdynainstid'" :label="$t('entities.metadynamicmodel.main_grid.columns.pdynainstid')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.metadynamicmodel.main_grid.columns.pdynainstid')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.pdynainstid}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -629,6 +653,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public allColumns: any[] = [
+        {
+            name: 'configid',
+            label: 'ID',
+            langtag: 'entities.metadynamicmodel.main_grid.columns.configid',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
         {
             name: 'dynainstid',
             label: '动态实例标识',
@@ -665,6 +698,15 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'pdynainstid',
+            label: '父ID',
+            langtag: 'entities.metadynamicmodel.main_grid.columns.pdynainstid',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
     ]
 
     /**
@@ -1369,7 +1411,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['dynainstid','configname','systemid','status'];
+        let allColumns:Array<any> = ['configid','dynainstid','configname','systemid','status','pdynainstid'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1449,10 +1491,12 @@ export default class MainBase extends Vue implements ControlInterface {
             const tree: any ={
                 groupById: Number((i+1)*100),
                 group: group.label,
+                configid:'',
                 dynainstid:'',
                 configname:'',
                 systemid:'',
                 status:'',
+                pdynainstid:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1479,10 +1523,12 @@ 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:'',
             status:'',
+            pdynainstid:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1529,10 +1575,12 @@ export default class MainBase extends Vue implements ControlInterface {
             const tree: any ={
                 groupById: Number((groupIndex+1)*100),
                 group: group,
+                configid:'',
                 dynainstid:'',
                 configname:'',
                 systemid:'',
                 status:'',
+                pdynainstid:'',
                 children: children,
             }
             groupTree.push(tree);
@@ -1962,10 +2010,16 @@ 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.saveFailed') as string),
-                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
                             });
+                        }
                     }else {
                         this.$Notice.error({
                             title: (this.$t('app.commonWords.saveFailed') as string),
@@ -2074,6 +2128,7 @@ 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

@@ -41,6 +41,11 @@ export default class MainModel {
           prop: 'status',
           dataType: 'SSCODELIST',
         },
+        {
+          name: 'configid',
+          prop: 'configid',
+          dataType: 'TEXT',
+        },
         {
           name: 'configname',
           prop: 'configname',