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

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US.ts

@@ -1631,60 +1631,6 @@ export default {
 			tip: "Print",
 		},
 	},
-	dashboardviewdashboard_sysportlet4_toolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		deuiaction2: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		deuiaction1: {
-			caption: "导入",
-			tip: "导入",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-	},
 	odsp_d20_wfgridviewtoolbar_toolbar: {
 		tbitem26: {
 			caption: "New",

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN.ts

@@ -1630,60 +1630,6 @@ export default {
 			tip: "打印",
 		},
 	},
-	dashboardviewdashboard_sysportlet4_toolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		deuiaction2: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		deuiaction1: {
-			caption: "导入",
-			tip: "导入",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-	},
 	odsp_d20_wfgridviewtoolbar_toolbar: {
 		tbitem26: {
 			caption: "新建",

app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_en_US.ts

@@ -278,6 +278,8 @@ export default {
 			address: "地图定位address", 
 			longitude: "地图定位longitude", 
 			latitude: "地图定位latitude", 
+			formitem14: "树分组选", 
+			formitem16: "树选择", 
 			formitem1: "颜色选择", 
 			ibizsample0001id: "IBIZSAMPLE0001标识", 
 		},

app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_zh_CN.ts

@@ -277,6 +277,8 @@ export default {
 			address: "地图定位address", 
 			longitude: "地图定位longitude", 
 			latitude: "地图定位latitude", 
+			formitem14: "树分组选", 
+			formitem16: "树选择", 
 			formitem1: "颜色选择", 
 			ibizsample0001id: "IBIZSAMPLE0001标识", 
 		},

app_Web/src/pages/sample/ibizorder-detail-f6-grid-view/ibizorder-detail-f6-grid-view-base.vue

@@ -1276,7 +1276,12 @@ export default class IBIZOrderDetailF6GridViewBase extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibizorder && true){
+            deResParameters = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
             { pathName: 'f6editview', parameterName: 'f6editview' },
@@ -1317,7 +1322,12 @@ export default class IBIZOrderDetailF6GridViewBase extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibizorder && true){
+            deResParameters = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
             { pathName: 'f6editview', parameterName: 'f6editview' },

app_Web/src/pages/sample/ibizorder-detail-grid-view/ibizorder-detail-grid-view-base.vue

@@ -1276,7 +1276,12 @@ export default class IBIZOrderDetailGridViewBase extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibizorder && true){
+            deResParameters = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -1317,7 +1322,12 @@ export default class IBIZOrderDetailGridViewBase extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibizorder && true){
+            deResParameters = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
             { pathName: 'editview', parameterName: 'editview' },

app_Web/src/pages/sample/ibizorder-detail-sgrid-view/ibizorder-detail-sgrid-view-base.vue

@@ -1276,7 +1276,12 @@ export default class IBIZOrderDetailSGridViewBase extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibizorder && true){
+            deResParameters = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -1317,7 +1322,12 @@ export default class IBIZOrderDetailSGridViewBase extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibizorder && true){
+            deResParameters = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
             { pathName: 'editview', parameterName: 'editview' },

app_Web/src/pages/sample/ibizorder-detail-sgrid-view9/ibizorder-detail-sgrid-view9-base.vue

@@ -946,7 +946,12 @@ export default class IBIZOrderDetailSGridView9Base extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibizorder && true){
+            deResParameters = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
             { pathName: 'seditview9', parameterName: 'seditview9' },
@@ -987,7 +992,12 @@ export default class IBIZOrderDetailSGridView9Base extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibizorder && true){
+            deResParameters = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
             { pathName: 'seditview9', parameterName: 'seditview9' },

app_Web/src/service/ibizorder/ibizorder-service-base.ts

@@ -86,6 +86,7 @@ export default class IBIZOrderServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibizorders`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_ibizorderdetails',JSON.stringify(res.data.ibizorderdetails?res.data.ibizorderdetails:[]));
         
         return res;
     }

app_Web/src/widgets/ibizorder-detail/main-multieditviewpanel/main-multieditviewpanel-base.vue

@@ -313,6 +313,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public deResParameters: any[] = [
+        { pathName: 'ibizorders', parameterName: 'ibizorder' },
     ];
 
     /**

app_Web/src/widgets/ibizorder/data-0024-form/data-0024-form-base.vue

@@ -143,6 +143,7 @@
     paramItem='ibizorder' 
     :parentdata='{"srfparentdefname":"IBIZORDERID","srfparentdename":"IBIZORDER","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID","SRFDER1NID":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID"}'
     :parameters="[
+        { pathName: 'ibizorders', parameterName: 'ibizorder' },
     ]"
     :context="context"
     :viewparams="viewparams"

app_Web/src/widgets/ibizorder/logic-0007-form/logic-0007-form-base.vue

@@ -133,6 +133,7 @@
     paramItem='ibizorder' 
     :parentdata='{"srfparentdefname":"IBIZORDERID","srfparentdename":"IBIZORDER","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID","SRFDER1NID":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID"}'
     :parameters="[
+        { pathName: 'ibizorders', parameterName: 'ibizorder' },
     ]"
     :context="context"
     :viewparams="viewparams"

app_Web/src/widgets/ibizorder/main-form/main-form-base.vue

@@ -158,6 +158,7 @@
     paramItem='ibizorder' 
     :parentdata='{"srfparentdefname":"IBIZORDERID","srfparentdename":"IBIZORDER","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID","SRFDER1NID":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID"}'
     :parameters="[
+        { pathName: 'ibizorders', parameterName: 'ibizorder' },
     ]"
     :context="context"
     :viewparams="viewparams"

app_Web/src/widgets/ibizorder/ui-0007-form/ui-0007-form-base.vue

@@ -133,6 +133,7 @@
     paramItem='ibizorder' 
     :parentdata='{"srfparentdefname":"IBIZORDERID","srfparentdename":"IBIZORDER","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID","SRFDER1NID":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID"}'
     :parameters="[
+        { pathName: 'ibizorders', parameterName: 'ibizorder' },
     ]"
     :context="context"
     :viewparams="viewparams"

app_Web/src/widgets/ibizorder/usr-dashboard/usr-dashboard-base.vue

@@ -9,7 +9,7 @@
           <span>
                       <div class='portlet-container dashboard-viewdashboard-container1 ' :style="{}">
                 <row>
-                  <i-col :md="{ span: 24, offset: 0 }" :lg="{ span: 12, offset: 0 }">
+                  <i-col :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }">
                       <div class="portlet-without-title">
                           <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
                         <span>
@@ -27,24 +27,6 @@
                       </card>
                       </div>
                   </i-col>
-                  <i-col :md="{ span: 24, offset: 0 }" :lg="{ span: 12, offset: 0 }">
-                      <div class="portlet-without-title">
-                          <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
-                        <span>
-                                        <view_dashboard_sysportlet4 
-                            :viewState="viewState"  
-                            :viewparams="viewparams" 
-                            :context="context" 
-                            :height="200"
-                            :width="0"
-                            name="dashboard_sysportlet4"  
-                            ref='dashboard_sysportlet4' 
-                            @closeview="closeView($event)">
-                        </view_dashboard_sysportlet4>
-                        </span>
-                      </card>
-                      </div>
-                  </i-col>
                   <i-col :md="{ span: 24, offset: 0 }" :lg="{ span: 12, offset: 0 }">
                       <div class="portlet-without-title">
                           <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">

app_Web/src/widgets/ibizorder/usr-dashboard/usr-dashboard.vue

 <script lang='tsx'>
 import { Component } from 'vue-property-decorator';
 import UsrBase from './usr-dashboard-base.vue';
-import view_dashboard_sysportlet4 from '@widgets/ibizorder/portal-components-tool-portlet/portal-components-tool-portlet.vue';
 import view_dashboard_sysportlet5 from '@widgets/ibizorder/portal-components-web-portlet/portal-components-web-portlet.vue';
 import view_dashboard_sysportlet2 from '@widgets/ibizorder-detail/portal-components-list3-portlet/portal-components-list3-portlet.vue';
 import view_dashboard_sysportlet3 from '@widgets/ibizorder/portal-components-operation-portlet/portal-components-operation-portlet.vue';
@@ -10,7 +9,6 @@ import view_dashboard_sysportlet1 from '@widgets/ibizorder-detail/portal-compone
  
 @Component({
     components: {
-        view_dashboard_sysportlet4, 
         view_dashboard_sysportlet5, 
         view_dashboard_sysportlet2, 
         view_dashboard_sysportlet3, 

app_Web/src/widgets/ibizsample0001/main5-form/main5-form-base.vue

@@ -248,6 +248,32 @@ dataType="LONGTEXT"     :precision="0"
 />
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.formitem14.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem14' :itemRules="this.rules().formitem14" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem14')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem14.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-group-select
+  name="formitem14"
+  :value='data.formitem14'
+  valueitem=""
+  
+  
+  
+  :disabled="detailsModel.formitem14.disabled"
+  :data="data"
+  :context="context"
+  @formitemvaluechange="onFormItemValueChange">
+</app-group-select>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.formitem16.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem16' :itemRules="this.rules().formitem16" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem16')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem16.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -692,6 +718,8 @@ export default class Main5Base extends Vue implements ControlInterface {
         address: null,
         longitude: null,
         latitude: null,
+        formitem14: null,
+        formitem16: null,
         formitem1: null,
         ibizsample0001id: null,
         ibizsample0001:null,
@@ -817,6 +845,14 @@ export default class Main5Base extends Vue implements ControlInterface {
             { required: this.detailsModel.latitude.required, type: 'string', message: '地图定位latitude 值不能为空', trigger: 'change' },
             { required: this.detailsModel.latitude.required, type: 'string', message: '地图定位latitude 值不能为空', trigger: 'blur' },
         ],
+        formitem14: [
+            { required: this.detailsModel.formitem14.required, type: 'string', message: '树分组选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem14.required, type: 'string', message: '树分组选 值不能为空', trigger: 'blur' },
+        ],
+        formitem16: [
+            { required: this.detailsModel.formitem16.required, type: 'string', message: '树选择 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem16.required, type: 'string', message: '树选择 值不能为空', trigger: 'blur' },
+        ],
         formitem1: [
             { required: this.detailsModel.formitem1.required, type: 'number', message: '颜色选择 值不能为空', trigger: 'change' },
             { required: this.detailsModel.formitem1.required, type: 'number', message: '颜色选择 值不能为空', trigger: 'blur' },
@@ -997,6 +1033,10 @@ export default class Main5Base extends Vue implements ControlInterface {
         longitude: new FormItemModel({ caption: '地图定位longitude', detailType: 'FORMITEM', name: 'longitude', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         latitude: new FormItemModel({ caption: '地图定位latitude', detailType: 'FORMITEM', name: 'latitude', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        formitem14: new FormItemModel({ caption: '树分组选', detailType: 'FORMITEM', name: 'formitem14', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        formitem16: new FormItemModel({ caption: '树选择', detailType: 'FORMITEM', name: 'formitem16', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         formitem1: new FormItemModel({ caption: '颜色选择', detailType: 'FORMITEM', name: 'formitem1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -1328,6 +1368,30 @@ export default class Main5Base extends Vue implements ControlInterface {
         this.formDataChange({ name: 'latitude', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 formitem14 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main5Base
+     */
+    @Watch('data.formitem14')
+    onFormitem14Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem14', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 formitem16 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main5Base
+     */
+    @Watch('data.formitem16')
+    onFormitem16Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem16', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 formitem1 值
      *
@@ -1441,6 +1505,8 @@ export default class Main5Base extends Vue implements ControlInterface {
 
 
 
+
+
 
 
 

app_Web/src/widgets/ibizsample0001/main5-form/main5-form-model.ts

@@ -147,6 +147,16 @@ export default class Main5Model {
         prop: 'latitude',
         dataType: 'TEXT',
       },
+      {
+        name: 'formitem14',
+        prop: 'field14',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'formitem16',
+        prop: 'field14',
+        dataType: 'SSCODELIST',
+      },
       {
         name: 'formitem1',
         prop: 'field12',

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 -Pdemoapi
-      cd demo-provider/demo-provider-demoapi
-      mvn -Pdemoapi docker:build
-      mvn -Pdemoapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-provider/demo-provider-demoapi/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-provider-demoapi.jar
 
-EXPOSE 51000
+EXPOSE 8081
 
 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar

demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml

@@ -3,24 +3,9 @@ services:
   demo-provider-demoapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
     ports:
-      - "51000:51000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51000
-      - 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: