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

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

@@ -57,8 +57,7 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				formitem: commonLogic.appcommonhandle("模型文件",null), 
-				modelname: 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

@@ -57,8 +57,7 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				formitem: commonLogic.appcommonhandle("模型文件",null), 
-				modelname: 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

@@ -15,9 +15,9 @@
                     <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.metamodel.fileupload_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
-        <i-col v-show="detailsModel.formitem.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem' :itemRules="this.rules().formitem" class='' :caption="$t('entities.metamodel.fileupload_form.details.formitem')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='formitem' :value="data.formitem" :disabled="detailsModel.formitem.disabled" :uploadparams='{}' :exportparams='{}'  style="overflow: auto;"></app-file-upload>
+        <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>
 
@@ -26,13 +26,6 @@
     </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>
 
 
@@ -470,7 +463,6 @@ export default class FileuploadBase extends Vue implements ControlInterface {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        formitem: null,
         modelname: null,
         createdate: null,
         updatedate: null,
@@ -526,13 +518,9 @@ export default class FileuploadBase extends Vue implements ControlInterface {
      */
     public rules() :any {
     return {
-        formitem: [
-            { 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' },
+            { 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' },
@@ -673,9 +661,7 @@ 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 })
+        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 })
 , 
@@ -782,18 +768,6 @@ export default class FileuploadBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 formitem 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof FileuploadBase
-     */
-    @Watch('data.formitem')
-    onFormitemChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem', newVal: newVal, oldVal: oldVal });
-    }
-
     /**
      * 监控表单属性 modelname 值
      *
@@ -912,7 +886,6 @@ export default class FileuploadBase extends Vue implements ControlInterface {
 
 
 
-
     }
 
     /**

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

@@ -55,10 +55,6 @@ export default class FileuploadModel {
       {
         name: 'srfsourcekey',
       },
-      {
-        name: 'formitem',
-        dataType:'FORMITEM',
-      },
       {
         name: 'modelname',
         prop: 'name',

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

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