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

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts

@@ -294,6 +294,30 @@ export default {
 		uiactions: {
 		},
 	},
+	guidereturnform_form: {
+		details: {
+			group1: "图书基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "图书标识", 
+			srfmajortext: "图书名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			ibizbookname: "图书名称", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			ibizbookid: "图书标识", 
+		},
+		uiactions: {
+		},
+	},
 	rulesform_form: {
 		details: {
 			group1: "系统值规则", 

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts

@@ -293,6 +293,30 @@ export default {
 		uiactions: {
 		},
 	},
+	guidereturnform_form: {
+		details: {
+			group1: "图书基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "图书标识", 
+			srfmajortext: "图书名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			ibizbookname: "图书名称", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			ibizbookid: "图书标识", 
+		},
+		uiactions: {
+		},
+	},
 	rulesform_form: {
 		details: {
 			group1: "系统值规则", 

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

 <template>
-    <i-form :model="this.data" class='app-form' ref='wizardpanel_form_secondForm'  id='ibizbook_guideborrowform' style="" @on-validate="formItemValidate">
+    <i-form :model="this.data" class='app-form' ref='wizardpanel_form_SecondForm'  id='ibizbook_guideborrowform' style="" @on-validate="formItemValidate">
     <input style="display:none;" />
     <row >
-    <tabs :animated="false" name='guideborrowform' :value="detailsModel.wizardpanel_form_secondForm.activiedPage" 
-        @on-click="detailsModel.wizardpanel_form_secondForm.clickPage($event)">
+    <tabs :animated="false" name='guideborrowform' :value="detailsModel.wizardpanel_form_SecondForm.activiedPage" 
+        @on-click="detailsModel.wizardpanel_form_SecondForm.clickPage($event)">
             <tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='guideborrowform' class=''  
                 :label="(h) =>{
                     return h('span',{
@@ -708,7 +708,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
 , 
         ibizbookid: new FormItemModel({ caption: '图书标识', detailType: 'FORMITEM', name: 'ibizbookid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        wizardpanel_form_secondForm: new FormTabPanelModel({ caption: 'wizardpanel_form_secondForm', detailType: 'TABPANEL', name: 'wizardpanel_form_secondForm', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
+        wizardpanel_form_SecondForm: new FormTabPanelModel({ caption: 'wizardpanel_form_SecondForm', detailType: 'TABPANEL', name: 'wizardpanel_form_SecondForm', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
     };
 
     /**
@@ -1108,7 +1108,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      * @memberof GuideBorrowFormBase
      */
     public formValidateStatus(): boolean {
-        const form: any = this.$refs.wizardpanel_form_secondForm;
+        const form: any = this.$refs.wizardpanel_form_SecondForm;
         let validatestate: boolean = true;
         form.validate((valid: boolean) => {
             validatestate = valid ? true : false;

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-model.ts

+/**
+ * GuideReturnForm 部件模型
+ *
+ * @export
+ * @class GuideReturnFormModel
+ */
+export default class GuideReturnFormModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof GuideReturnFormModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'srforikey',
+      },
+      {
+        name: 'srfkey',
+        prop: 'ibizbookid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'ibizbookname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'ibizbookname',
+        prop: 'ibizbookname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'createman',
+        prop: 'createman',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'createdate',
+        prop: 'createdate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'updateman',
+        prop: 'updateman',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'updatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'ibizbookid',
+        prop: 'ibizbookid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'ibizbook',
+        prop: 'ibizbookid',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form.less

+.ivu-tabs-no-animation>.ivu-tabs-content{
+    padding: 0 16px;
+}
+.ivu-card-head{
+    padding: 14px 0;
+}
+.app-form {
+    overflow: auto;
+    padding: 6px;
+    > .ivu-row {
+        > .ivu-tabs {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            > .ivu-tabs-content {
+                flex-grow: 1;
+                overflow: auto;
+                > .ivu-tabs-tabpane {
+                    height: 100%;
+                }
+            }
+        }
+    }
+}
+.app-tabpanel-flex {
+    height: 100%;
+    > .ivu-tabs-content {
+        height: calc(100% - 52px);
+        > .ivu-tabs-tabpane {
+            height: 100%;
+        }
+    }
+}
+
+.app-form {
+    >.ivu-row:nth-child(2) {
+        >.ivu-col:nth-child(1) {
+            >.ivu-row.app-form-group.app-group-hiddden-caption:nth-child(1) {
+                margin-top: 12px;
+            }
+        }
+    }
+}
+.app-form{
+  // 表单行间距
+  .app-form-item{
+    margin-bottom: 20px;
+  }
+  // 表单按钮margin
+  .app-form-button{
+      margin:0 6px;
+  }
+}
+// this is less

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import GuideReturnFormBase from './guide-return-form-form-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class GuideReturnForm extends GuideReturnFormBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue

 <template>
-    <i-form :model="this.data" class='app-form' ref='wizardpanel_form_firstForm'  id='ibizbook_guideviewform' style="" @on-validate="formItemValidate">
+    <i-form :model="this.data" class='app-form' ref='wizardpanel_form_FirstForm'  id='ibizbook_guideviewform' style="" @on-validate="formItemValidate">
     <input style="display:none;" />
     <row >
-    <tabs :animated="false" name='guideviewform' :value="detailsModel.wizardpanel_form_firstForm.activiedPage" 
-        @on-click="detailsModel.wizardpanel_form_firstForm.clickPage($event)">
+    <tabs :animated="false" name='guideviewform' :value="detailsModel.wizardpanel_form_FirstForm.activiedPage" 
+        @on-click="detailsModel.wizardpanel_form_FirstForm.clickPage($event)">
             <tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='guideviewform' class=''  
                 :label="(h) =>{
                     return h('span',{
@@ -708,7 +708,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
 , 
         ibizbookid: new FormItemModel({ caption: '图书标识', detailType: 'FORMITEM', name: 'ibizbookid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        wizardpanel_form_firstForm: new FormTabPanelModel({ caption: 'wizardpanel_form_firstForm', detailType: 'TABPANEL', name: 'wizardpanel_form_firstForm', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
+        wizardpanel_form_FirstForm: new FormTabPanelModel({ caption: 'wizardpanel_form_FirstForm', detailType: 'TABPANEL', name: 'wizardpanel_form_FirstForm', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
     };
 
     /**
@@ -1108,7 +1108,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      * @memberof GuideViewFormBase
      */
     public formValidateStatus(): boolean {
-        const form: any = this.$refs.wizardpanel_form_firstForm;
+        const form: any = this.$refs.wizardpanel_form_FirstForm;
         let validatestate: boolean = true;
         form.validate((valid: boolean) => {
             validatestate = valid ? true : false;

app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-base.vue

@@ -6,34 +6,48 @@
       <el-step title="归还图书"></el-step>
     </el-steps>
         <i-content class="app-wizard-content">
-            <view_wizardpanel_form_firstForm 
-              v-show="activeForm == 'wizardpanel_form_firstForm'" 
-              :key="'wizardpanel_form_firstForm'" 
+            <view_wizardpanel_form_FirstForm 
+              v-show="activeForm == 'wizardpanel_form_FirstForm'" 
+              :key="'wizardpanel_form_FirstForm'" 
               :viewState='wizardState'
               :context="context"
               :viewparams="viewparams"
               updateAction="Update"
               removeAction=""
               loadAction="Get"
-              @save="wizardpanel_form_firstForm_save" 
-              @load="wizardpanel_form_firstForm_load" 
-              name='wizardpanel_form_firstForm' 
-              ref='wizardpanel_form_firstForm'>
-            </view_wizardpanel_form_firstForm>
-            <view_wizardpanel_form_secondForm 
-              v-show="activeForm == 'wizardpanel_form_secondForm'" 
-              :key="'wizardpanel_form_secondForm'" 
+              @save="wizardpanel_form_FirstForm_save" 
+              @load="wizardpanel_form_FirstForm_load" 
+              name='wizardpanel_form_FirstForm' 
+              ref='wizardpanel_form_FirstForm'>
+            </view_wizardpanel_form_FirstForm>
+            <view_wizardpanel_form_SecondForm 
+              v-show="activeForm == 'wizardpanel_form_SecondForm'" 
+              :key="'wizardpanel_form_SecondForm'" 
               :viewState='wizardState'
               :context="context"
               :viewparams="viewparams"
               updateAction="Update"
               removeAction=""
               loadAction="Get"
-              @save="wizardpanel_form_secondForm_save" 
-              @load="wizardpanel_form_secondForm_load" 
-              name='wizardpanel_form_secondForm' 
-              ref='wizardpanel_form_secondForm'>
-            </view_wizardpanel_form_secondForm>
+              @save="wizardpanel_form_SecondForm_save" 
+              @load="wizardpanel_form_SecondForm_load" 
+              name='wizardpanel_form_SecondForm' 
+              ref='wizardpanel_form_SecondForm'>
+            </view_wizardpanel_form_SecondForm>
+            <view_wizardpanel_form_ThirdForm 
+              v-show="activeForm == 'wizardpanel_form_ThirdForm'" 
+              :key="'wizardpanel_form_ThirdForm'" 
+              :viewState='wizardState'
+              :context="context"
+              :viewparams="viewparams"
+              updateAction="Update"
+              removeAction=""
+              loadAction="Get"
+              @save="wizardpanel_form_ThirdForm_save" 
+              @load="wizardpanel_form_ThirdForm_load" 
+              name='wizardpanel_form_ThirdForm' 
+              ref='wizardpanel_form_ThirdForm'>
+            </view_wizardpanel_form_ThirdForm>
         </i-content>
         <footer class="app-wizard-footer">
             <i-button v-show="!isHidden('PREV')" @click="onClickPrev()" type="primary">{{$t('app.wizardPanel.back')}}</i-button>
@@ -140,47 +154,69 @@ export default class GuideBase extends Vue implements ControlInterface {
     public appEntityService: IBIZBOOKService = new IBIZBOOKService({ $store: this.$store });
 
     /**
-     * wizardpanel_form_firstForm 部件 save 事件
+     * wizardpanel_form_ThirdForm 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof GuideBase
+     */
+    public wizardpanel_form_ThirdForm_save($event: any, $event2?: any) {
+        this.wizardpanel_formsave($event, 'wizardpanel_form_ThirdForm', $event2);
+    }
+
+    /**
+     * wizardpanel_form_ThirdForm 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof GuideBase
+     */
+    public wizardpanel_form_ThirdForm_load($event: any, $event2?: any) {
+        this.wizardpanel_formload($event, 'wizardpanel_form_ThirdForm', $event2);
+    }
+
+    /**
+     * wizardpanel_form_FirstForm 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof GuideBase
      */
-    public wizardpanel_form_firstForm_save($event: any, $event2?: any) {
-        this.wizardpanel_formsave($event, 'wizardpanel_form_firstForm', $event2);
+    public wizardpanel_form_FirstForm_save($event: any, $event2?: any) {
+        this.wizardpanel_formsave($event, 'wizardpanel_form_FirstForm', $event2);
     }
 
     /**
-     * wizardpanel_form_firstForm 部件 load 事件
+     * wizardpanel_form_FirstForm 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof GuideBase
      */
-    public wizardpanel_form_firstForm_load($event: any, $event2?: any) {
-        this.wizardpanel_formload($event, 'wizardpanel_form_firstForm', $event2);
+    public wizardpanel_form_FirstForm_load($event: any, $event2?: any) {
+        this.wizardpanel_formload($event, 'wizardpanel_form_FirstForm', $event2);
     }
 
     /**
-     * wizardpanel_form_secondForm 部件 save 事件
+     * wizardpanel_form_SecondForm 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof GuideBase
      */
-    public wizardpanel_form_secondForm_save($event: any, $event2?: any) {
-        this.wizardpanel_formsave($event, 'wizardpanel_form_secondForm', $event2);
+    public wizardpanel_form_SecondForm_save($event: any, $event2?: any) {
+        this.wizardpanel_formsave($event, 'wizardpanel_form_SecondForm', $event2);
     }
 
     /**
-     * wizardpanel_form_secondForm 部件 load 事件
+     * wizardpanel_form_SecondForm 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof GuideBase
      */
-    public wizardpanel_form_secondForm_load($event: any, $event2?: any) {
-        this.wizardpanel_formload($event, 'wizardpanel_form_secondForm', $event2);
+    public wizardpanel_form_SecondForm_load($event: any, $event2?: any) {
+        this.wizardpanel_formload($event, 'wizardpanel_form_SecondForm', $event2);
     }
     
 
@@ -302,7 +338,7 @@ export default class GuideBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof GuideBase
      */
-    public activeForm: string = 'wizardpanel_form_firstForm';
+    public activeForm: string = 'wizardpanel_form_FirstForm';
 
     /**
      * 向导表单参数
@@ -382,8 +418,9 @@ export default class GuideBase extends Vue implements ControlInterface {
      * @memberof GuideBase
      */
     public regFormActions() {
-        this.regFormAction('wizardpanel_form_firstForm',{loadAction:"Get",saveAction:'Update',actions:['NEXT']},'viewbook');
-        this.regFormAction('wizardpanel_form_secondForm',{loadAction:"Get",saveAction:'Update',actions:['PREV','NEXT']},'borrow');
+        this.regFormAction('wizardpanel_form_FirstForm',{loadAction:"Get",saveAction:'Update',actions:['NEXT']},'viewbook');
+        this.regFormAction('wizardpanel_form_SecondForm',{loadAction:"Get",saveAction:'Update',actions:['PREV','NEXT']},'borrow');
+        this.regFormAction('wizardpanel_form_ThirdForm',{loadAction:"Get",saveAction:'Update',actions:['PREV','FINISH']},'return');
     }
 
     /**

app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel.vue

 <script lang='tsx'>
 import { Component } from 'vue-property-decorator';
 import GuideBase from './guide-wizardpanel-base.vue';
-import view_wizardpanel_form_firstForm from '@widgets/ibizbook/guide-view-form-form/guide-view-form-form.vue';
-import view_wizardpanel_form_secondForm from '@widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form.vue';
+import view_wizardpanel_form_ThirdForm from '@widgets/ibizbook/guide-return-form-form/guide-return-form-form.vue';
+import view_wizardpanel_form_FirstForm from '@widgets/ibizbook/guide-view-form-form/guide-view-form-form.vue';
+import view_wizardpanel_form_SecondForm from '@widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form.vue';
 
  
 @Component({
     components: {
-        view_wizardpanel_form_firstForm, 
-        view_wizardpanel_form_secondForm, 
+        view_wizardpanel_form_ThirdForm, 
+        view_wizardpanel_form_FirstForm, 
+        view_wizardpanel_form_SecondForm, 
          
     }
 })

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pweb
-      cd demo-app/demo-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-app/demo-app-web/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar
 
-EXPOSE 51001
+EXPOSE 8080
 
 ADD demo-app-web.jar /demo-app-web.jar

demo-app/demo-app-web/src/main/docker/demo-app-web.yaml

@@ -3,24 +3,9 @@ services:
   demo-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
     ports:
-      - "51001:51001"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: