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

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

@@ -288,69 +288,13 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_publish: {
-				caption: commonLogic.appcommonhandle("发布模型",null),
-				tip: commonLogic.appcommonhandle("发布模型",null),
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem2: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem3: {
-				caption: commonLogic.appcommonhandle("新建",null),
-				tip: commonLogic.appcommonhandle("新建",null),
-			},
-			tbitem4: {
-				caption: commonLogic.appcommonhandle("编辑",null),
-				tip: commonLogic.appcommonhandle("编辑",null),
-			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("拷贝",null),
-				tip: commonLogic.appcommonhandle("拷贝",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem8: {
-				caption: commonLogic.appcommonhandle("删除",null),
-				tip: commonLogic.appcommonhandle("删除",null),
-			},
-			tbitem9: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem13: {
-				caption: commonLogic.appcommonhandle("导出",null),
-				tip: commonLogic.appcommonhandle("导出",null),
-			},
-			tbitem10: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem16: {
-				caption: commonLogic.appcommonhandle("其它",null),
-				tip: commonLogic.appcommonhandle("其它",null),
-			},
-			tbitem21: {
-				caption: commonLogic.appcommonhandle("导出数据模型",null),
-				tip: commonLogic.appcommonhandle("导出数据模型",null),
-			},
-			tbitem23: {
-				caption: commonLogic.appcommonhandle("数据导入",null),
-				tip: commonLogic.appcommonhandle("数据导入",null),
-			},
-			tbitem17: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem19: {
-				caption: commonLogic.appcommonhandle("过滤",null),
-				tip: commonLogic.appcommonhandle("过滤",null),
-			},
-			tbitem18: {
-				caption: commonLogic.appcommonhandle("帮助",null),
-				tip: commonLogic.appcommonhandle("帮助",null),
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
 			},
 		},
 	};

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

@@ -288,69 +288,13 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_publish: {
-				caption: commonLogic.appcommonhandle("发布模型",null),
-				tip: commonLogic.appcommonhandle("发布模型",null),
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem2: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem3: {
-				caption: commonLogic.appcommonhandle("New",null),
-				tip: commonLogic.appcommonhandle("New",null),
-			},
-			tbitem4: {
-				caption: commonLogic.appcommonhandle("Edit",null),
-				tip: commonLogic.appcommonhandle("Edit {0}",null),
-			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("Copy",null),
-				tip: commonLogic.appcommonhandle("Copy {0}",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem8: {
-				caption: commonLogic.appcommonhandle("Remove",null),
-				tip: commonLogic.appcommonhandle("Remove {0}",null),
-			},
-			tbitem9: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem13: {
-				caption: commonLogic.appcommonhandle("Export",null),
-				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
-			},
-			tbitem10: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem16: {
-				caption: commonLogic.appcommonhandle("其它",null),
-				tip: commonLogic.appcommonhandle("其它",null),
-			},
-			tbitem21: {
-				caption: commonLogic.appcommonhandle("Export Data Model",null),
-				tip: commonLogic.appcommonhandle("导出数据模型",null),
-			},
-			tbitem23: {
-				caption: commonLogic.appcommonhandle("数据导入",null),
-				tip: commonLogic.appcommonhandle("数据导入",null),
-			},
-			tbitem17: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem19: {
-				caption: commonLogic.appcommonhandle("Filter",null),
-				tip: commonLogic.appcommonhandle("Filter",null),
-			},
-			tbitem18: {
-				caption: commonLogic.appcommonhandle("Help",null),
-				tip: commonLogic.appcommonhandle("Help",null),
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
 			},
 		},
 	};

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

@@ -288,69 +288,13 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_publish: {
-				caption: commonLogic.appcommonhandle("发布模型",null),
-				tip: commonLogic.appcommonhandle("发布模型",null),
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem2: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem3: {
-				caption: commonLogic.appcommonhandle("新建",null),
-				tip: commonLogic.appcommonhandle("新建",null),
-			},
-			tbitem4: {
-				caption: commonLogic.appcommonhandle("编辑",null),
-				tip: commonLogic.appcommonhandle("编辑",null),
-			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("拷贝",null),
-				tip: commonLogic.appcommonhandle("拷贝",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem8: {
-				caption: commonLogic.appcommonhandle("删除",null),
-				tip: commonLogic.appcommonhandle("删除",null),
-			},
-			tbitem9: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem13: {
-				caption: commonLogic.appcommonhandle("导出",null),
-				tip: commonLogic.appcommonhandle("导出",null),
-			},
-			tbitem10: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem16: {
-				caption: commonLogic.appcommonhandle("其它",null),
-				tip: commonLogic.appcommonhandle("其它",null),
-			},
-			tbitem21: {
-				caption: commonLogic.appcommonhandle("导出数据模型",null),
-				tip: commonLogic.appcommonhandle("导出数据模型",null),
-			},
-			tbitem23: {
-				caption: commonLogic.appcommonhandle("数据导入",null),
-				tip: commonLogic.appcommonhandle("数据导入",null),
-			},
-			tbitem17: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem19: {
-				caption: commonLogic.appcommonhandle("过滤",null),
-				tip: commonLogic.appcommonhandle("过滤",null),
-			},
-			tbitem18: {
-				caption: commonLogic.appcommonhandle("帮助",null),
-				tip: commonLogic.appcommonhandle("帮助",null),
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
 			},
 		},
 	};

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

@@ -25,20 +25,6 @@
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.systemid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='systemid' :itemRules="this.rules().systemid" class='' :caption="$t('entities.metadynamicmodel.dynainst_form.details.systemid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.systemid.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.systemid"  
-    @enter="onEnter($event)"  
-     unit=""  
-    :disabled="detailsModel.systemid.disabled" 
-    type='text' 
-    style="">
-</input-box>
-
-</app-form-item>
-
 </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=''  
@@ -554,10 +540,6 @@ export default class DynaInstBase extends Vue implements ControlInterface {
             { required: this.detailsModel.formitem.required, type: 'string', message: '文件 值不能为空', trigger: 'change' },
             { required: this.detailsModel.formitem.required, type: 'string', message: '文件 值不能为空', trigger: 'blur' },
         ],
-        systemid: [
-            { required: this.detailsModel.systemid.required, type: 'string', message: '系统 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.systemid.required, type: 'string', message: '系统 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 

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

@@ -25,39 +25,11 @@
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.systemid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='systemid' :itemRules="this.rules().systemid" class='' :caption="$t('entities.metadynamicmodel.main_form.details.systemid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.systemid.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.systemid"  
-    @enter="onEnter($event)"  
-     unit=""  
-    :disabled="detailsModel.systemid.disabled" 
-    type='text' 
-    style="">
-</input-box>
-
-</app-form-item>
-
 </i-col>
     
     </row>
 </app-form-group>
 
-</i-col>
-<i-col v-show="detailsModel.pdynainstid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='pdynainstid' :itemRules="this.rules().pdynainstid" class='' :caption="$t('entities.metadynamicmodel.main_form.details.pdynainstid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pdynainstid.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.pdynainstid"  
-    @enter="onEnter($event)"  
-     unit=""  
-    :disabled="detailsModel.pdynainstid.disabled" 
-    type='text' 
-    style="">
-</input-box>
-
-</app-form-item>
-
 </i-col>
 
 
@@ -526,14 +498,6 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.formitem.required, type: 'string', message: '文件 值不能为空', trigger: 'change' },
             { required: this.detailsModel.formitem.required, type: 'string', message: '文件 值不能为空', trigger: 'blur' },
         ],
-        systemid: [
-            { required: this.detailsModel.systemid.required, type: 'string', message: '系统 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.systemid.required, type: 'string', message: '系统 值不能为空', trigger: 'blur' },
-        ],
-        pdynainstid: [
-            { required: this.detailsModel.pdynainstid.required, type: 'string', message: '父实例 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.pdynainstid.required, type: 'string', message: '父实例 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 

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

@@ -244,7 +244,7 @@
 
 
     <!--输出实体[META_DYNAMICMODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-120-12">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-139-12">
         <createTable tableName="IBZDYNAMICMODEL">
                 <column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
                 </column>
@@ -448,10 +448,10 @@
         <!--输出实体[DST_VIEW]外键关系 -->
         <!--输出实体[META_DATASET]外键关系 -->
         <!--输出实体[META_DYNAMICMODEL]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-120-18">
+    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-139-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-120-19">
+    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-139-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]外键关系 -->