ibiz4j 部署微服务应用

app_Web/src/components/app-form-item/app-form-item.less

@@ -17,3 +17,30 @@
         padding: 0 0 10px;
     }
 }
+
+.app-form-item-label-left{
+  .app-form-item-label{
+    float: left;
+    text-align: right;
+    padding-right: 12px;
+  }
+}
+.app-form-item-label-right{
+  .app-form-item-label{
+    float: right;
+    text-align: left;
+    padding-left: 12px;
+  }
+}
+.app-form-item-label-top{
+  .app-form-item-label{
+    display: block;
+    padding-bottom: 10px;
+  }
+}
+.app-form-item-label-bottom{
+  .app-form-item-label{
+    display: block;
+    padding-top: 10px;
+  }
+}
\ No newline at end of file

app_Web/src/components/app-form-item/app-form-item.vue

@@ -21,12 +21,16 @@
                 :error="error"
                 :required="required"
                 :rules="rules"
-                :class="classes"
-                :label-width="this.isShowCaption ? !Object.is(this.labelPos, 'TOP') ? this.labelWidth : null : 0">
-                    <span slot='label' v-if="this.isShowCaption && this.labelWidth > 0"  :class="labelclasses">
+                :class="classes">
+                  <div v-if="Object.is(this.labelPos,'BOTTOM') || Object.is(this.labelPos,'NONE') || !this.labelPos" class="slot-editor" :style="slotstyle">
+                    <slot></slot>
+                  </div>
+                  <span v-if="!Object.is(this.labelPos,'NONE') && this.isShowCaption && this.labelWidth > 0" :style="labelstyle"  :class="labelclasses">
                       {{this.isEmptyCaption ? '' : this.caption}}
                   </span>
+                  <div v-if="Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT')" class="slot-editor" :style="slotstyle">
                     <slot></slot>
+                  </div>
             </form-item>
         </div>
     </div>
@@ -167,9 +171,27 @@ export default class AppFormItem extends Vue {
      * @memberof AppFormItem
      */
     get classes(): string[] {
+        let posClass = '';
+        switch (this.labelPos) {
+          case 'TOP':
+            posClass = 'app-form-item-label-top';
+            break;
+          case 'LEFT':
+            posClass = 'app-form-item-label-left';
+            break;
+          case 'BOTTOM':
+            posClass = 'app-form-item-label-bottom';
+            break;
+          case 'RIGHT':
+            posClass = 'app-form-item-label-right';
+            break;
+          case 'NONE':
+            posClass = 'app-form-item-label-none';
+            break;
+        }
         return [
             'app-form-item',
-            Object.is(this.labelPos, 'TOP') ? 'app-form-item-label-top' : ''
+            posClass
         ];
     }
 
@@ -181,7 +203,33 @@ export default class AppFormItem extends Vue {
      * @memberof AppFormItem
      */
     get labelclasses():string{
-        return this.labelStyle?this.labelStyle:'';
+        return this.labelStyle?this.labelStyle+' app-form-item-label':'app-form-item-label';
+    }
+
+    /**
+     * label行内样式
+     *
+     * @readonly
+     * @type {string}
+     * @memberof AppFormItem
+     */
+    get labelstyle():any{
+        return {width:this.labelWidth+'px'};
+    }
+
+    /**
+     * slot行内样式
+     *
+     * @readonly
+     * @type {string}
+     * @memberof AppFormItem
+     */
+    get slotstyle():any{
+      if(Object.is(this.labelPos,'LEFT')){
+          return {marginLeft:this.labelWidth+'px'};
+      }else if(Object.is(this.labelPos,'RIGHT')){
+          return {marginRight:this.labelWidth+'px'};
+      }
     }
 
     /**

app_Web/src/components/app-transfer/app-transfer.vue

@@ -3,7 +3,7 @@
     @on-open-change="transferRefresh"
     @on-change="dataChange"
     v-model="dataRight"
-    :style="{width:width}"
+    :style="{width:width===undefined?'586px':width}"
     multiple
   >
     <Option class="hidden" :value="item" v-for="(item,i) in dataRight" :key="i">{{findLabel(item)}}</Option>
@@ -17,7 +17,6 @@ import { ElSelect } from "element-ui/types/select";
 
 @Component({})
 export default class AppTransfer extends Vue {
-  
   /**
    * 左侧框数据
    */
@@ -31,7 +30,7 @@ export default class AppTransfer extends Vue {
   /**
    * 穿梭框宽度
    */
-  @Prop() public width:any;
+  @Prop() public width: any ;
 
   /**
    * 代码表服务对象
@@ -54,7 +53,7 @@ export default class AppTransfer extends Vue {
   /**
    * 表单传入字符串值分隔符
    */
-  @Prop() public valueSeparator?: string;
+  @Prop() public valueSeparator!: string;
   /**
    * 当前选中值
    * @type {any}
@@ -83,14 +82,26 @@ export default class AppTransfer extends Vue {
    * @memberof AppTransfer
    */
   dataChange(e: any) {
+    let _valueSeparator: any;
+    _valueSeparator = this.initValueSeparator(_valueSeparator);
     let newVal: any;
-    newVal = e.join(`${this.valueSeparator}`);
+    newVal = e.join(`${_valueSeparator}`);
     if (newVal) {
       this.$emit("change", newVal);
     } else {
       this.$emit("change", null);
     }
   }
+  /**
+   * 初始化valueSeparator
+   */
+  public initValueSeparator(_valueSeparator: any) {
+    if (this.valueSeparator === undefined) {
+      return ",";
+    } else {
+      return this.valueSeparator;
+    }
+  }
 
   /**
    * 传入额外参数
@@ -170,8 +181,12 @@ export default class AppTransfer extends Vue {
       this.codeListService
         .getItems(this.tag, _context, _param)
         .then((res: any) => {
+          console.log(res);
           this.dataLeft = res;
+
           this.initLeft();
+          console.log(this.dataLeft);
+
           this.initRight();
         })
         .catch((error: any) => {
@@ -222,7 +237,7 @@ export default class AppTransfer extends Vue {
       this.dataLeft.push({
         key: elem.id,
         value: elem.value,
-        label: elem.label,
+        label: elem.text,
         disabled: elem.disabled
       });
     });
@@ -231,9 +246,11 @@ export default class AppTransfer extends Vue {
    * 初始化右侧框数据
    */
   public initRight() {
+    let _valueSeparator: any;
+    _valueSeparator = this.initValueSeparator(_valueSeparator);
     let _data: any = this.itemValue;
     if (_data) {
-      let newData: any[] = _data.split(`${this.valueSeparator}`);
+      let newData: any[] = _data.split(`${_valueSeparator}`);
       this.dataLeft.forEach((elem: any) => {
         newData.forEach((item: any) => {
           if (item === elem.value) {

app_Web/src/engine/view/edit-view2-engine.ts

@@ -89,6 +89,7 @@ export default class EditView2Engine extends EditViewEngine {
      */
     public onFormLoad(arg: any = {}): void {
         super.onFormLoad(arg);
+        this.view.formData = arg;
         if (this.getDRBar()) {
             const tag = this.getDRBar().name;
             this.setViewState2({ tag: tag, action: 'state', viewdata: this.view.vieparams });
@@ -103,6 +104,7 @@ export default class EditView2Engine extends EditViewEngine {
      */
     public onFormSave(arg: any = {}): void {
         super.onFormSave(arg);
+        this.view.formData = arg;
         if (this.getDRBar()) {
             const tag = this.getDRBar().name;
             this.setViewState2({ tag: tag, action: 'state', viewdata: this.view.viewparams });

app_Web/src/engine/view/edit-view3-engine.ts

@@ -89,6 +89,7 @@ export default class EditView3Engine extends EditViewEngine {
      */
     public onFormLoad(arg: any = {}): void {
         super.onFormLoad(arg);
+        this.view.formData = arg;
         if (this.getDrTab()) {
             const tag = this.getDrTab().name;
             this.setViewState2({ tag: tag, action: 'state', viewdata: this.view.viewparams });
@@ -103,6 +104,7 @@ export default class EditView3Engine extends EditViewEngine {
      */
     public onFormSave(arg: any = {}): void {
         super.onFormSave(arg);
+        this.view.formData = arg;
         if (this.getDrTab()) {
             const tag = this.getDrTab().name;
             this.setViewState2({ tag: tag, action: 'state', viewdata: this.view.viewparams });

app_Web/src/utils/uiaction-tool/uiaction-tool.ts

@@ -44,7 +44,7 @@ export class UIActionTool {
      */
     private static formatData(actionTarget: any, args: any,parentContext:any,parentParams:any, _params: any): any {
         let _data: any = {};
-        if (Object.is(actionTarget, 'SINGLEKEY')) {
+        if (Object.is(actionTarget, 'SINGLEKEY') || Object.is(actionTarget, 'NONE')) {
             let [arg] = args;
             Object.keys(_params).forEach((name: string) => {
                 let hasProperty = true;

app_Web/src/utils/view-tool/view-tool.ts

@@ -128,7 +128,7 @@ export class ViewTool {
             const [{ pathName, parameterName }] = parameters;
             routePath = `/${pathName}`;
             if (Object.keys(data).length > 0) {
-                routePath = `${routePath}/${qs.stringify(data, { delimiter: ';' })}`;
+                routePath = `${routePath}?${qs.stringify(data, { delimiter: ';' })}`;
             }
         } else if (parameters.length === 2) {
             let [arg] = args;
@@ -138,7 +138,7 @@ export class ViewTool {
                 arg[_parameterName] : null;
             routePath = `/${_pathName}/${_value}/${_pathName2}`;
             if (Object.keys(data).length > 0) {
-                routePath = `${routePath}/${qs.stringify(data, { delimiter: ';' })}`;
+                routePath = `${routePath}?${qs.stringify(data, { delimiter: ';' })}`;
             }
         }
         return routePath;

app_Web/src/widgets/ibzdepartment/main-grid/main-grid-base.vue

@@ -1479,6 +1479,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue

@@ -1284,6 +1284,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/ibzemployee/main-grid/main-grid-base.vue

@@ -1432,6 +1432,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/ibzorganization/main-grid/main-grid-base.vue

@@ -1403,6 +1403,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue

@@ -1389,6 +1389,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -1251,6 +1251,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/sys-role/main-grid/main-grid-base.vue

@@ -1270,6 +1270,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -1284,6 +1284,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/sys-user/main-grid/main-grid-base.vue

@@ -1270,6 +1270,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/wfgroup/main-grid/main-grid-base.vue

@@ -1284,6 +1284,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/wfmember/main-grid/main-grid-base.vue

@@ -1265,6 +1265,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/wfprocess-definition/main-grid/main-grid-base.vue

@@ -1332,6 +1332,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

app_Web/src/widgets/wfuser/main-grid/main-grid-base.vue

@@ -1270,6 +1270,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
 	public uiAction(row: any, tag: any, $event: any) {
         // this.rowClick(row, true);
+        $event.stopPropagation();
     }
 
     /**

config.xml

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

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

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

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

@@ -3,9 +3,21 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "8080:8080"
+      - "30000:30000"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30000
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       resources:
            limits:

ibzrt-app/ibzrt-app-web/src/main/resources/application-web-prod.yml

@@ -71,5 +71,9 @@ zuul:
       path: /uaa/**
       serviceId: ibzuaa-api
       stripPrefix: false
+    config:
+      path: /config/**
+      serviceId: ibzuaa-api
+      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibzrt-boot/src/main/resources/application-dev.yml

@@ -104,5 +104,9 @@ zuul:
         path: /uaa/**
         serviceId: ibzuaa-api
         stripPrefix: false
+      config:
+        path: /config/**
+        serviceId: ibzuaa-api
+        stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization