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

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

@@ -28,6 +28,7 @@ function getLocaleResourceBase(){
 		main_form: {
 			details: {
 				druipart1: commonLogic.appcommonhandle("副本",null), 
+				tabpage1: commonLogic.appcommonhandle("副本",null), 
 				tabpanel1: commonLogic.appcommonhandle("",null), 
 				group1: commonLogic.appcommonhandle("动态模型基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -129,7 +130,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("帮助",null),
 			},
 		},
-		dynainstgridviewtoolbar_toolbar: {
+		gridviewtoolbar_toolbar: {
 			tbitem1_publish: {
 				caption: commonLogic.appcommonhandle("发布模型",null),
 				tip: commonLogic.appcommonhandle("发布模型",null),
@@ -195,7 +196,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("帮助",null),
 			},
 		},
-		gridviewtoolbar_toolbar: {
+		dynainstgridviewtoolbar_toolbar: {
 			tbitem1_publish: {
 				caption: commonLogic.appcommonhandle("发布模型",null),
 				tip: commonLogic.appcommonhandle("发布模型",null),

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

@@ -28,6 +28,7 @@ function getLocaleResourceBase(){
 		main_form: {
 			details: {
 				druipart1: commonLogic.appcommonhandle("副本",null), 
+				tabpage1: commonLogic.appcommonhandle("副本",null), 
 				tabpanel1: commonLogic.appcommonhandle("",null), 
 				group1: commonLogic.appcommonhandle("动态模型基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -129,7 +130,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("Help",null),
 			},
 		},
-		dynainstgridviewtoolbar_toolbar: {
+		gridviewtoolbar_toolbar: {
 			tbitem1_publish: {
 				caption: commonLogic.appcommonhandle("发布模型",null),
 				tip: commonLogic.appcommonhandle("发布模型",null),
@@ -195,7 +196,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("Help",null),
 			},
 		},
-		gridviewtoolbar_toolbar: {
+		dynainstgridviewtoolbar_toolbar: {
 			tbitem1_publish: {
 				caption: commonLogic.appcommonhandle("发布模型",null),
 				tip: commonLogic.appcommonhandle("发布模型",null),

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

@@ -28,6 +28,7 @@ function getLocaleResourceBase(){
 		main_form: {
 			details: {
 				druipart1: commonLogic.appcommonhandle("副本",null), 
+				tabpage1: commonLogic.appcommonhandle("副本",null), 
 				tabpanel1: commonLogic.appcommonhandle("",null), 
 				group1: commonLogic.appcommonhandle("动态模型基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -129,7 +130,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("帮助",null),
 			},
 		},
-		dynainstgridviewtoolbar_toolbar: {
+		gridviewtoolbar_toolbar: {
 			tbitem1_publish: {
 				caption: commonLogic.appcommonhandle("发布模型",null),
 				tip: commonLogic.appcommonhandle("发布模型",null),
@@ -195,7 +196,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("帮助",null),
 			},
 		},
-		gridviewtoolbar_toolbar: {
+		dynainstgridviewtoolbar_toolbar: {
 			tbitem1_publish: {
 				caption: commonLogic.appcommonhandle("发布模型",null),
 				tip: commonLogic.appcommonhandle("发布模型",null),

app_web/src/pages/lite/lite-index/page-register.ts

@@ -15,7 +15,6 @@ export const PageComponents = {
         Vue.component('dst-view-edit-view', () => import('@pages/lite/dst-view-edit-view/dst-view-edit-view.vue'));
         Vue.component('meta-entity-pickup-view', () => import('@pages/lite/meta-entity-pickup-view/meta-entity-pickup-view.vue'));
         Vue.component('dst-config-edit-view', () => import('@pages/lite/dst-config-edit-view/dst-config-edit-view.vue'));
-        Vue.component('meta-dynamic-model-dyna-inst-grid-view', () => import('@pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view.vue'));
         Vue.component('meta-data-set-edit-view', () => import('@pages/lite/meta-data-set-edit-view/meta-data-set-edit-view.vue'));
         Vue.component('meta-model-grid-view', () => import('@pages/lite/meta-model-grid-view/meta-model-grid-view.vue'));
         Vue.component('meta-module-pickup-view', () => import('@pages/lite/meta-module-pickup-view/meta-module-pickup-view.vue'));

app_web/src/pages/lite/lite-index/router.ts

@@ -445,20 +445,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/lite/dst-config-edit-view/dst-config-edit-view.vue'),
                 },
-                {
-                    path: 'metadynamicmodels/:metadynamicmodel?/dynainstgridview/:dynainstgridview?',
-                    meta: {
-                        caption: 'entities.metadynamicmodel.views.dynainstgridview.caption',
-                        info:'',
-                        parameters: [
-                            { pathName: 'liteindex', parameterName: 'liteindex' },
-                            { pathName: 'metadynamicmodels', parameterName: 'metadynamicmodel' },
-                            { pathName: 'dynainstgridview', parameterName: 'dynainstgridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view.vue'),
-                },
                 {
                     path: 'dstsystems/:dstsystem?/metaentities/:metaentity?/metadatasets/:metadataset?/editview/:editview?',
                     meta: {
@@ -1871,19 +1857,6 @@ const router = new Router({
         },
         component: () => import('@pages/lite/meta-relationship-edit-view/meta-relationship-edit-view.vue'),
     },
-    {
-        path: '/metadynamicmodels/:metadynamicmodel?/dynainstgridview/:dynainstgridview?',
-        meta: {
-            caption: 'entities.metadynamicmodel.views.dynainstgridview.caption',
-            info:'',
-            parameters: [
-                { pathName: 'metadynamicmodels', parameterName: 'metadynamicmodel' },
-                { pathName: 'dynainstgridview', parameterName: 'dynainstgridview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view.vue'),
-    },
     {
         path: '/dstsystems/:dstsystem?/metaentities/:metaentity?/metarelationships/:metarelationship?/pickupgridview/:pickupgridview?',
         meta: {

app_web/src/service/meta-dynamic-model/meta-dynamic-model-service-base.ts

@@ -73,6 +73,7 @@ export default class MetaDynamicModelServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/metadynamicmodels`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_metadynamicmodels',JSON.stringify(res.data.metadynamicmodels?res.data.metadynamicmodels:[]));
         
         return res;
     }

app_web/src/store/modules/view-action/state.ts

@@ -39,7 +39,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '409f7ea81d15d2e2f1ee295d189d965b',
+                '4f66aaf7857f97a00ab6cf6c1c054262',
             ],
         },
         {
@@ -165,16 +165,6 @@ export const viewstate: any = {
                 '2a68c7ba74abbda10f2be9d4905f1a7d',
             ],
         },
-        {
-            viewtag: '409f7ea81d15d2e2f1ee295d189d965b',
-            viewmodule: 'lite',
-            viewname: 'MetaDynamicModelDynaInstGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '1777e5578e41e94cdf738b950a961ab1',
-            ],
-        },
         {
             viewtag: '4dea38f94640a261d70d58a8307356b9',
             viewmodule: 'lite',

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

@@ -26,7 +26,19 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.druipart1.visible" :style="{'height': '500px !important',}"  :lg="{ span: 24, offset: 0 }">
+<i-col v-show="detailsModel.tabpanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <tabs :animated="false" name='tabpanel1' v-show="detailsModel.tabpanel1.visible" class=''  
+    :value="detailsModel.tabpanel1.activiedPage" @on-click="detailsModel.tabpanel1.clickPage($event)">
+        <tab-pane v-show="detailsModel.tabpage1.visible" name='tabpage1' :index="0" tab='tabpanel1' class=''  
+            :label="(h) =>{
+                return h('span',{
+                    class:'caption'
+                },[
+                  $t('entities.metadynamicmodel.main_form.details.tabpage1')
+                ])
+            }">
+            
+    <i-col v-show="detailsModel.druipart1.visible" :style="{'height': '500px !important',}"  :lg="{ span: 24, offset: 0 }">
     <app-form-druipart
     
     :formState="formState"
@@ -44,7 +56,7 @@
     refviewtype='DEGRIDVIEW' 
     refreshitems='' 
     :ignorefieldvaluechange="ignorefieldvaluechange"
-    viewname='meta-dynamic-model-dyna-inst-grid-view'
+    viewname='meta-dynamic-model-grid-view'
     tempMode='0'
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
@@ -52,9 +64,9 @@
 </app-form-druipart>
 
 </i-col>
-<i-col v-show="detailsModel.tabpanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <tabs :animated="false" name='tabpanel1' v-show="detailsModel.tabpanel1.visible" class=''  
-    :value="detailsModel.tabpanel1.activiedPage" @on-click="detailsModel.tabpanel1.clickPage($event)">
+
+
+        </tab-pane>
 </tabs>
 </i-col>
     
@@ -636,7 +648,9 @@ export default class MainBase extends Vue implements ControlInterface {
     public detailsModel: any = {
         druipart1: new FormDRUIPartModel({ caption: '副本', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
 , 
-        tabpanel1: new FormTabPanelModel({ caption: '', detailType: 'TABPANEL', name: 'tabpanel1', visible: true, isShowCaption: false, form: this, isControlledContent: false , tabPages: [] })
+        tabpage1: new FormTabPageModel({ caption: '副本', detailType: 'TABPAGE', name: 'tabpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
+, 
+        tabpanel1: new FormTabPanelModel({ caption: '', detailType: 'TABPANEL', name: 'tabpanel1', visible: true, isShowCaption: false, form: this, isControlledContent: false , tabPages: [{ name: 'tabpage1', index: 0, visible: true }] })
 , 
         group1: new FormGroupPanelModel({ caption: '动态模型基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.metadynamicmodel.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
@@ -852,6 +866,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

ibzlite-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[BLADE_VISUAL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual-55-1">
+    <changeSet author="root" id="tab-blade_visual-55-1">
         <createTable tableName="blade_visual">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
@@ -36,7 +36,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-23-2">
+    <changeSet author="root" id="tab-blade_visual_category-23-2">
         <createTable tableName="blade_visual_category">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
@@ -52,7 +52,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3">
+    <changeSet author="root" id="tab-blade_visual_config-18-3">
         <createTable tableName="blade_visual_config">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
@@ -68,7 +68,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4">
+    <changeSet author="root" id="tab-blade_visual_map-18-4">
         <createTable tableName="blade_visual_map">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
@@ -86,7 +86,7 @@
 
 
     <!--输出实体[DST_COMPONENT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_component-59-5">
+    <changeSet author="root" id="tab-dst_component-59-5">
         <createTable tableName="IBZCOMPONENT">
                 <column name="CID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
@@ -112,7 +112,7 @@
 
 
     <!--输出实体[DST_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6">
+    <changeSet author="root" id="tab-dst_config-32-6">
         <createTable tableName="IBZCFG">
                 <column name="CFGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
@@ -134,7 +134,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-75-7">
+    <changeSet author="root" id="tab-dst_datasource-75-7">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -152,7 +152,7 @@
 
 
     <!--输出实体[DST_ROUTER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_router-37-8">
+    <changeSet author="root" id="tab-dst_router-37-8">
         <createTable tableName="IBZROUTER">
                 <column name="ROUTERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
@@ -178,7 +178,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_system-45-9">
+    <changeSet author="root" id="tab-dst_system-45-9">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -198,7 +198,7 @@
 
 
     <!--输出实体[DST_VIEW]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_view-46-10">
+    <changeSet author="root" id="tab-dst_view-46-10">
         <createTable tableName="IBZVIEW">
                 <column name="VIEWID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
@@ -222,7 +222,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-33-11">
+    <changeSet author="root" id="tab-meta_dataset-33-11">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -244,7 +244,7 @@
 
 
     <!--输出实体[META_DYNAMICMODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-79-12">
+    <changeSet author="root" id="tab-meta_dynamicmodel-82-12">
         <createTable tableName="IBZDYNAMICMODEL">
                 <column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
                 </column>
@@ -266,7 +266,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-105-13">
+    <changeSet author="root" id="tab-meta_entity-105-13">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -298,7 +298,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_field-153-14">
+    <changeSet author="root" id="tab-meta_field-153-14">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -362,7 +362,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_model-44-15">
+    <changeSet author="root" id="tab-meta_model-44-15">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -388,7 +388,7 @@
 
 
     <!--输出实体[META_MODULE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_module-34-16">
+    <changeSet author="root" id="tab-meta_module-34-16">
         <createTable tableName="IBZMODULE">
                 <column name="MODULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
@@ -406,7 +406,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-106-17">
+    <changeSet author="root" id="tab-meta_relation-106-17">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
@@ -448,10 +448,10 @@
         <!--输出实体[DST_VIEW]外键关系 -->
         <!--输出实体[META_DATASET]外键关系 -->
         <!--输出实体[META_DYNAMICMODEL]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-79-18">
+    <changeSet author="root" id="fk-meta_dynamicmodel-82-18">
        <addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_DST_SY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-79-19">
+    <changeSet author="root" id="fk-meta_dynamicmodel-82-19">
        <addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[META_ENTITY]外键关系 -->