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

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

@@ -58,6 +58,7 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				formitem: commonLogic.appcommonhandle("模型文件",null), 
+				modelname: commonLogic.appcommonhandle("名称",null), 
 				createdate: commonLogic.appcommonhandle("创建时间",null), 
 				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 
 				modelid: commonLogic.appcommonhandle("标识",null), 

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

@@ -58,6 +58,7 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				formitem: commonLogic.appcommonhandle("模型文件",null), 
+				modelname: commonLogic.appcommonhandle("名称",null), 
 				createdate: commonLogic.appcommonhandle("创建时间",null), 
 				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 
 				modelid: commonLogic.appcommonhandle("标识",null), 

app_web/src/widgets/meta-model/fileupload-form/fileupload-form-base.vue

@@ -26,6 +26,13 @@
     </row>
 </app-form-group>
 
+</i-col>
+<i-col v-show="detailsModel.modelname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='modelname' :itemRules="this.rules().modelname" class='' :caption="$t('entities.metamodel.fileupload_form.details.modelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.modelname.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='modelname' :value="data.modelname" :disabled="detailsModel.modelname.disabled" :uploadparams='{}' :exportparams='{}'  style="overflow: auto;"></app-file-upload>
+
+</app-form-item>
+
 </i-col>
 
 
@@ -464,6 +471,7 @@ export default class FileuploadBase extends Vue implements ControlInterface {
         srfdeid: null,
         srfsourcekey: null,
         formitem: null,
+        modelname: null,
         createdate: null,
         updatedate: null,
         modelid: null,
@@ -508,7 +516,7 @@ export default class FileuploadBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof FileuploadBase
      */
-    public majorMessageField: string = "";
+    public majorMessageField: string = "modelname";
 
     /**
      * 值规则
@@ -522,6 +530,10 @@ export default class FileuploadBase extends Vue implements ControlInterface {
             { required: this.detailsModel.formitem.required, type: 'string', message: '模型文件 值不能为空', trigger: 'change' },
             { required: this.detailsModel.formitem.required, type: 'string', message: '模型文件 值不能为空', trigger: 'blur' },
         ],
+        modelname: [
+            { required: this.detailsModel.modelname.required, type: 'string', message: '名称 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.modelname.required, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
+        ],
         createdate: [
             { required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'change' },
             { required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'blur' },
@@ -662,6 +674,8 @@ export default class FileuploadBase extends Vue implements ControlInterface {
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         formitem: new FormItemModel({ caption: '模型文件', detailType: 'FORMITEM', name: 'formitem', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        modelname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'modelname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         createdate: new FormItemModel({ caption: '创建时间', detailType: 'FORMITEM', name: 'createdate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -780,6 +794,18 @@ export default class FileuploadBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'formitem', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 modelname 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof FileuploadBase
+     */
+    @Watch('data.modelname')
+    onModelnameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'modelname', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 createdate 值
      *
@@ -886,6 +912,7 @@ export default class FileuploadBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

app_web/src/widgets/meta-model/fileupload-form/fileupload-form-model.ts

@@ -59,6 +59,11 @@ export default class FileuploadModel {
         name: 'formitem',
         dataType:'FORMITEM',
       },
+      {
+        name: 'modelname',
+        prop: 'name',
+        dataType: 'TEXT',
+      },
       {
         name: 'createdate',
         prop: 'createdate',

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

@@ -328,7 +328,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="root" id="tab-meta_model-58-12">
+    <changeSet author="root" id="tab-meta_model-60-12">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>