ibizdev提交

app_web/public/assets/json/data-dictionary.json

@@ -8,6 +8,7 @@
                 "id": "男",
                 "label": "男性",
                 "text": "男性",
+                "data":"",
                 "value": "男",
                 
                 "disabled": false
@@ -16,6 +17,7 @@
                 "id": "女",
                 "label": "女性",
                 "text": "女性",
+                "data":"",
                 "value": "女",
                 
                 "disabled": false
@@ -24,6 +26,7 @@
                 "id": "性别不详",
                 "label": "性别不详",
                 "text": "性别不详",
+                "data":"",
                 "value": "性别不详",
                 
                 "disabled": false

app_web/src/components/app-checkbox-list/app-checkbox-list.vue

@@ -43,7 +43,7 @@ export default class AppCheckBox extends Vue {
      * @type {string}
      * @memberof AppCheckBox
      */
-    @Prop({default:';'}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否禁用
@@ -97,28 +97,6 @@ export default class AppCheckBox extends Vue {
         }
     }
 
-    /**
-     * 分隔符
-     *
-     * @type {*}
-     * @memberof AppCheckBox
-     */
-    @Prop() separator: any;
-
-    /**
-     * 获取分隔符
-     *
-     * @readonly
-     * @memberof AppCheckBox
-     */
-    get currentseparator() {
-        if (this.separator) {
-            return this.separator;
-        } else {
-            return ';';
-        }
-    }
-
     /** 
      * 选中值
      *

app_web/src/components/app-span/app-span.vue

@@ -55,14 +55,14 @@ export default class AppSpan extends Vue {
      * @type {boolean}
      * @memberof AppSpan
      */
-    @Prop({default:"、"}) public textSeparator?: string;
+    @Prop({default:'、'}) public textSeparator?: string;
 
     /**
      * 值分隔符
      * @type {boolean}
      * @memberof AppSpan
      */
-    @Prop({default:";"}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 监控表单属性 data 值

app_web/src/components/codelist/codelist.vue

@@ -61,14 +61,14 @@ export default class CodeList extends Vue {
      * @type {boolean}
      * @memberof SelectPicker
      */
-    @Prop({default:"、"}) public textSeparator?: string;
+    @Prop({default:'、'}) public textSeparator?: string;
 
     /**
      * 值分隔符
      * @type {boolean}
      * @memberof SelectPicker
      */
-    @Prop({default:";"}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否为空

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -60,7 +60,7 @@ export default class DropDownListMpicker extends Vue {
      * @type {string}
      * @memberof DropDownListMpicker
      */
-    @Prop({default:';'}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否禁用

app_web/src/mock/codelist/codelist.ts

@@ -16,6 +16,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: '男',
                 label: '男性',
                 text: '男性',
+                "data":"",
                 value: '男',
                 
                 disabled: false,
@@ -24,6 +25,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: '女',
                 label: '女性',
                 text: '女性',
+                "data":"",
                 value: '女',
                 
                 disabled: false,
@@ -32,6 +34,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: '性别不详',
                 label: '性别不详',
                 text: '性别不详',
+                "data":"",
                 value: '性别不详',
                 
                 disabled: false,

app_web/src/pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view-base.vue

@@ -243,7 +243,6 @@ export default class IBZDepartmentEditViewBase extends Vue {
      * @memberof IBZDepartmentEditViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

app_web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue

@@ -8,8 +8,8 @@
         <div class='content-container'>
             <div class='view-top-messages'>
             </div>
-            <row style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
+            <div style='margin-bottom: 6px;'>
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -53,7 +53,7 @@
                         </tooltip>
                     </div>
                 </div>
-            </row>
+            </div>
             <view_searchform 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -282,7 +282,6 @@ export default class IBZDepartmentGridViewBase extends Vue {
      * @memberof IBZDepartmentGridViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *
@@ -311,6 +310,7 @@ export default class IBZDepartmentGridViewBase extends Vue {
 
 
 
+
     /**
      * 视图引擎
      *
@@ -540,6 +540,7 @@ export default class IBZDepartmentGridViewBase extends Vue {
             _this.loadModel();
         }
         
+
     }
 
 

app_web/src/pages/ou/ibzemployee-change-pwd-view/ibzemployee-change-pwd-view-base.vue

@@ -229,7 +229,6 @@ export default class IBZEmployeeChangePwdViewBase extends Vue {
      * @memberof IBZEmployeeChangePwdViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

app_web/src/pages/ou/ibzemployee-edit-view/ibzemployee-edit-view-base.vue

@@ -243,7 +243,6 @@ export default class IBZEmployeeEditViewBase extends Vue {
      * @memberof IBZEmployeeEditViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

app_web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue

@@ -8,8 +8,8 @@
         <div class='content-container'>
             <div class='view-top-messages'>
             </div>
-            <row style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
+            <div style='margin-bottom: 6px;'>
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -60,7 +60,7 @@
                         </tooltip>
                     </div>
                 </div>
-            </row>
+            </div>
             <view_searchform 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -289,7 +289,6 @@ export default class IBZEmployeeGridViewBase extends Vue {
      * @memberof IBZEmployeeGridViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *
@@ -321,6 +320,7 @@ export default class IBZEmployeeGridViewBase extends Vue {
 
 
 
+
     /**
      * 视图引擎
      *
@@ -550,6 +550,7 @@ export default class IBZEmployeeGridViewBase extends Vue {
             _this.loadModel();
         }
         
+
     }
 
 

app_web/src/pages/ou/ibzorganization-edit-view/ibzorganization-edit-view-base.vue

@@ -243,7 +243,6 @@ export default class IBZOrganizationEditViewBase extends Vue {
      * @memberof IBZOrganizationEditViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

app_web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view-base.vue

@@ -8,8 +8,8 @@
         <div class='content-container'>
             <div class='view-top-messages'>
             </div>
-            <row style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
+            <div style='margin-bottom: 6px;'>
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -53,7 +53,7 @@
                         </tooltip>
                     </div>
                 </div>
-            </row>
+            </div>
             <view_searchform 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -282,7 +282,6 @@ export default class IBZOrganizationGridViewBase extends Vue {
      * @memberof IBZOrganizationGridViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *
@@ -311,6 +310,7 @@ export default class IBZOrganizationGridViewBase extends Vue {
 
 
 
+
     /**
      * 视图引擎
      *
@@ -540,6 +540,7 @@ export default class IBZOrganizationGridViewBase extends Vue {
             _this.loadModel();
         }
         
+
     }
 
 

app_web/src/styles/default.less

@@ -213,6 +213,17 @@
       height: 100%;
     }
   }
+  >.view-card{
+    >.ivu-card-body{
+        >.content-container{
+            .quick-group-container,.quick-search-container,.quick-search-input{
+                float: left;
+                margin-top: 6px;
+                margin-bottom: 6px;
+            }
+        }
+    }
+  }
 }
 
 /***    END:多数据视图属性布局    ***/

app_web/src/utils/app-modal/app-modal.less

@@ -10,6 +10,9 @@
             .ivu-modal-body {
                 padding: 0;
                 height: calc(100% - 52px);
+                .view-container{
+                  padding: 15px;
+                }
             }
         }
     }

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

@@ -514,6 +514,8 @@ export default class MainBase extends Vue implements ControlInterface {
     public stopRowClick: boolean = false;
 
 
+
+
     /**
      * 表格是否显示
      *

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

@@ -530,6 +530,8 @@ export default class MainBase extends Vue implements ControlInterface {
     public stopRowClick: boolean = false;
 
 
+
+
     /**
      * 表格是否显示
      *
@@ -970,7 +972,7 @@ export default class MainBase extends Vue implements ControlInterface {
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',
-            valueSeparator: ';',
+            valueSeparator: ',',
           },
         ];
         let _this = this;

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

@@ -507,6 +507,8 @@ export default class MainBase extends Vue implements ControlInterface {
     public stopRowClick: boolean = false;
 
 
+
+
     /**
      * 表格是否显示
      *

config.xml

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

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

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

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

@@ -3,9 +3,11 @@ services:
   ibzou-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
     ports:
-      - "8080:8080"
+      - "30001:30001"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzou-app/ibzou-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
+  port: 30001
\ No newline at end of file

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

 server:
-  port: 8080
+  port: 30001
 
 #zuul网关路由设置
 zuul:

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

 server:
-  port: 40001
+  port: 8080
 

ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
 
-EXPOSE 40001
+EXPOSE 8081
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml

@@ -3,11 +3,9 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "40001:40001"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 40001
+  port: 8081
\ No newline at end of file

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 40001
+  port: 8081

ibzou-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:110B1A3E-4944-47C8-B4C4-EC15FB8982F3}")
     private String systemId;
 
     @Override