kuaikuai 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lanres/entities/ibizappview/ibizappview_en_US.ts

@@ -70,8 +70,8 @@ export default {
 	viewlist_list: {
 		nodata:"",
 		uiactions: {
-        ibizappview_openinstance: "打开示例",
         ibizappview_opendocument: "打开文档",
+        ibizappview_openinstance: "打开示例",
 		},
 	},
 	viewchart_chart: {

app_Web/src/locale/lanres/entities/ibizappview/ibizappview_zh_CN.ts

@@ -69,8 +69,8 @@ export default {
 	viewlist_list: {
 		nodata:"",
 		uiactions: {
-			ibizappview_openinstance: "打开示例",
 			ibizappview_opendocument: "打开文档",
+			ibizappview_openinstance: "打开示例",
 		},
 	},
 	viewchart_chart: {

app_Web/src/locale/lanres/entities/micro-component/micro-component_en_US.ts

@@ -96,7 +96,7 @@ export default {
 			field34: "磁盘图片", 
 			formitem: "表格样式", 
 			formitem1: "时光轴样式", 
-			field35: "用户自定义动态表单", 
+			field35: "", 
 			microcomponentid: "微组件标识", 
 			field28: "属性28", 
 			field18: "属性18", 

app_Web/src/locale/lanres/entities/micro-component/micro-component_zh_CN.ts

@@ -95,7 +95,7 @@ export default {
 			field34: "磁盘图片", 
 			formitem: "表格样式", 
 			formitem1: "时光轴样式", 
-			field35: "用户自定义动态表单", 
+			field35: "", 
 			microcomponentid: "微组件标识", 
 			field28: "属性28", 
 			field18: "属性18", 

app_Web/src/pages/sample/ibizsample0001-sf6-edit-view/ibizsample0001-sf6-edit-view-base.vue

@@ -24,10 +24,10 @@
 </div>
 
         <div class='view-top-messages'>
-        </div>
+        <app-alert-group position='TOP' :context="context" :viewparam="viewparams" infoGroup='VMGroup' viewname='ibizsample0001sf6editview'></app-alert-group>        </div>
         <div class="content-container">
         <div class='view-body-messages'>
-        </div>
+        <app-alert-group position='BODY' :context="context" :viewparam="viewparams" infoGroup='VMGroup' viewname='ibizsample0001sf6editview'></app-alert-group>        </div>
         <view_form 
             :viewState="viewState"  
             :viewparams="viewparams" 
@@ -52,7 +52,7 @@
         </view_form>
         </div>
         <div class='view-bottom-messages'>
-        </div>
+        <app-alert-group position='BOTTOM' :context="context" :viewparam="viewparams" infoGroup='VMGroup' viewname='ibizsample0001sf6editview'></app-alert-group>        </div>
     </card>
 </div>
 </template>

app_Web/src/widgets/ibizappview/view-list-list/view-list-list-base.vue

@@ -148,7 +148,7 @@ export default class ViewListBase extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public list_operation_ued88b09_click(params: any = {}, tag?: any, $event?: any) {
+    public list_operation_u59112f7_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -165,7 +165,7 @@ export default class ViewListBase extends Vue implements ControlInterface {
         }
         // 界面行为
         const curUIService:IBIZAPPVIEWUIService  = new IBIZAPPVIEWUIService();
-        curUIService.IBIZAPPVIEW_openInstance(datas,contextJO, paramJO,  $event, xData,this,"IBIZAPPVIEW");
+        curUIService.IBIZAPPVIEW_openDocument(datas,contextJO, paramJO,  $event, xData,this,"IBIZAPPVIEW");
     }
 
     /**
@@ -176,7 +176,7 @@ export default class ViewListBase extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public list_operation_u59112f7_click(params: any = {}, tag?: any, $event?: any) {
+    public list_operation_ued88b09_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -193,7 +193,7 @@ export default class ViewListBase extends Vue implements ControlInterface {
         }
         // 界面行为
         const curUIService:IBIZAPPVIEWUIService  = new IBIZAPPVIEWUIService();
-        curUIService.IBIZAPPVIEW_openDocument(datas,contextJO, paramJO,  $event, xData,this,"IBIZAPPVIEW");
+        curUIService.IBIZAPPVIEW_openInstance(datas,contextJO, paramJO,  $event, xData,this,"IBIZAPPVIEW");
     }
 
 
@@ -865,8 +865,8 @@ export default class ViewListBase extends Vue implements ControlInterface {
      * @memberof ViewListBase
      */ 
     public actionModel:any ={
-         "openInstance":{name:"openInstance",icon:"",caption:"打开示例",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "SINGLEKEY"},
          "openDocument":{name:"openDocument",icon:"",caption:"打开文档",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "SINGLEKEY"},
+         "openInstance":{name:"openInstance",icon:"",caption:"打开示例",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "SINGLEKEY"},
     };
 
     /**
@@ -879,12 +879,12 @@ export default class ViewListBase extends Vue implements ControlInterface {
      */
 	public uiAction(data: any, tag: any, $event: any) {
         $event.stopPropagation();
-        if(Object.is('openInstance', tag)) {
-            this.list_operation_ued88b09_click(data, tag, $event);
-        }
         if(Object.is('openDocument', tag)) {
             this.list_operation_u59112f7_click(data, tag, $event);
         }
+        if(Object.is('openInstance', tag)) {
+            this.list_operation_ued88b09_click(data, tag, $event);
+        }
     }
 
 }

app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue

@@ -237,6 +237,14 @@ export default class UsrBase extends Vue implements ControlInterface {
             },
             labelField: 'text',
             columns: [
+                {
+                    label: '归还日期',
+                    value: 'returntime',
+                    render: (task: any) => {
+                        return this.getColumnValue(task, 'returntime')
+                    },
+                    width: 200,
+                },
                 {
                     label: '图书名称',
                     value: 'ibizbookname',
@@ -269,14 +277,6 @@ export default class UsrBase extends Vue implements ControlInterface {
                     },
                     width: 200,
                 },
-                {
-                    label: '归还日期',
-                    value: 'returntime',
-                    render: (task: any) => {
-                        return this.getColumnValue(task, 'returntime')
-                    },
-                    width: 200,
-                },
             ]
         }
     };

app_Web/src/widgets/micro-component/main-form/main-form-base.vue

@@ -334,7 +334,7 @@
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel5.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel5.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel5')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel5.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.microcomponent.main_form.details.grouppanel5')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.field35.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='field35' :itemRules="this.rules().field35" class='' :caption="$t('entities.microcomponent.main_form.details.field35')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field35.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='field35' :itemRules="this.rules().field35" class='' :caption="$t('entities.microcomponent.main_form.details.field35')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="true" :error="detailsModel.field35.error" :isEmptyCaption="true" labelPos="LEFT">
     <avue-custom-form :isSubForm="false" :isParseString="false" :isFormData="false"  v-model="data.field35" :formData="data"  :formState="formState"></avue-custom-form>
 </app-form-item>
 
@@ -913,8 +913,8 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.formitem1.required, type: 'string', message: '时光轴样式 值不能为空', trigger: 'blur' },
         ],
         field35: [
-            { required: this.detailsModel.field35.required, type: 'string', message: '用户自定义动态表单 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.field35.required, type: 'string', message: '用户自定义动态表单 值不能为空', trigger: 'blur' },
+            { required: this.detailsModel.field35.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field35.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
         ],
         }
     }
@@ -1093,7 +1093,7 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         formitem1: new FormItemModel({ caption: '时光轴样式', detailType: 'FORMITEM', name: 'formitem1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field35: new FormItemModel({ caption: '用户自定义动态表单', detailType: 'FORMITEM', name: 'field35', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field35: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'field35', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         microcomponentid: new FormItemModel({ caption: '微组件标识', detailType: 'FORMITEM', name: 'microcomponentid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZBOOKDataImport.java

@@ -12,10 +12,10 @@ public interface IBIZBOOKDataImport {
         @Mapping(target = "ibizbookname", source = "ibizbookname"),
         @Mapping(target = "updateman", source = "updateman"),
         @Mapping(target = "updatedate", source = "updatedate"),
+        @Mapping(target = "type", source = "type"),
         @Mapping(target = "press", source = "press"),
         @Mapping(target = "author", source = "author"),
         @Mapping(target = "price", source = "price"),
-        @Mapping(target = "type", source = "type"),
         @Mapping(target = "booknumber", source = "booknumber"),
         @Mapping(target = "createman", source = "createman"),
     })

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZOrderImport.java

@@ -10,8 +10,8 @@ public interface IBIZOrderImport {
         @Mapping(target = "ibizorderid", source = "ibizorderid"),
         @Mapping(target = "ordertype", source = "ordertype"),
         @Mapping(target = "ordertime", source = "ordertime"),
-        @Mapping(target = "ibizordername", source = "ibizordername"),
         @Mapping(target = "orderuid", source = "orderuid"),
+        @Mapping(target = "ibizordername", source = "ibizordername"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZOrder toDomain(IBIZOrder entity);

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

@@ -500,7 +500,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0001]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-409-18">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-411-18">
         <createTable tableName="T_IBIZSAMPLE0001">
                 <column name="FIELD01" remarks="" type="VARCHAR(100)">
                 </column>
@@ -1280,7 +1280,7 @@
 
 
     <!--输出实体[MICROCOMPONENT]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-microcomponent-73-44">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-microcomponent-75-44">
         <createTable tableName="T_MICROCOMPONENT">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -1396,7 +1396,7 @@
         <!--输出实体[IBIZQJ]外键关系 -->
         <!--输出实体[IBIZSAMPLE]外键关系 -->
         <!--输出实体[IBIZSAMPLE0001]外键关系 -->
-    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-409-45">
+    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-411-45">
        <addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0002ID" baseTableName="T_IBIZSAMPLE0001" constraintName="DER1N_IBIZSAMPLE0001_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0002ID" referencedTableName="T_IBIZSAMPLE0002" validate="true"/>
     </changeSet>
         <!--输出实体[IBIZSAMPLE0002]外键关系 -->

demo-core/src/main/resources/liquibase/view.xml

@@ -67,7 +67,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0001]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-409-13" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-411-13" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0001">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[FIELD02], t1.[FIELD05], t1.[FIELD06], t1.[FIELD07], t1.[FIELD08], t1.[FIELD09], t1.[FIELD10], t1.[FIELD11], t1.[FIELD12], t1.[FIELD13], t1.[FIELD14], t1.[FIELD15], t1.[FIELD16], t1.[FIELD17], t1.[FIELD18], t1.[FIELD19], t1.[FIELD20], t1.[FIELD21], t1.[FIELD22], t1.[FIELD23], t1.[FIELD24], t1.[FIELD25], t1.[FIELD26], t1.[FIELD27], t1.[IBIZSAMPLE0001ID], t1.[IBIZSAMPLE0001NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0001] t1  ]]>
          </createView>