ibiz4j 发布系统代码

app_web/src/components/login/login.less

@@ -26,28 +26,45 @@
         top: 50%;
         transform: translateY(-60%);
         width: 300px;
-        .ivu-card-head {
-            padding: 14px 6px;
-            >p{
-                line-height: 20px;
-                font-size: 14px;
-                color: #17233d;
-                font-weight: 700;
+        .ivu-card{
+            border-radius: 15px;
+            .ivu-card-head {
+                padding: 14px 6px;
+                >p{
+                    line-height: 20px;
+                    font-size: 20px;
+                    color: #17233d;
+                    font-weight: 700;
+                    text-align:center;
+                }
             }
-        }
-        &-header{
-            font-size: 16px;
-            font-weight: 300;
-            text-align: center;
-            padding: 30px 0;
-        }
-        .form-con{
-            padding: 10px 0 0;
-        }
-        .login-tip{
-            font-size: 10px;
-            text-align: center;
-            color: #c3c3c3;
-        }
+            &-header{
+                font-size: 16px;
+                font-weight: 300;
+                text-align: center;
+                padding: 30px 0;
+            }
+            .form-con{
+                padding: 10px 0 0;
+                .ivu-form-item{
+                    margin-bottom: 20px;
+                }
+                p{
+                    font-size: 14px;
+                    font-weight: bold;
+                    height: 21px;
+                    line-height: 21px;
+                }
+                button{
+                    background-image: linear-gradient(to bottom,#8bbcf1 0%,#2d8cf0 100%);
+                    border-color:#8bbcf1;
+                }
+            }
+            .login-tip{
+                font-size: 10px;
+                text-align: center;
+                color: #5f4949;    
+            }
+        }    
     }
 }
\ No newline at end of file

app_web/src/components/login/login.vue

@@ -10,12 +10,14 @@
         <div class='login-con'>
             <card :bordered="false">
                 <p slot='title'>
-                    <icon type='ios-log-in'></icon>
-                    &nbsp;&nbsp;{{this.$t('components.login.caption')}}
+                    <!-- <icon type='ios-log-in'></icon> -->
+                    <!-- &nbsp;&nbsp; -->
+                    {{this.$t('components.login.caption')}}
                 </p>
                 <div class='form-con'>
                     <i-form ref='loginForm' :rules="rules" :model="form">
                         <form-item prop='loginname'>
+                            <p>用户名</p>
                             <i-input
                                 prefix='ios-contact'
                                 v-model="form.loginname"
@@ -23,6 +25,7 @@
                             </i-input>
                         </form-item>
                         <form-item prop='password'>
+                            <p>密码</p>
                             <i-input
                                 prefix='ios-key'
                                 v-model="form.password"

app_web/src/engine/view/pickup-tree-view-engine.ts

@@ -35,4 +35,20 @@ export default class PickupTreeViewEngine extends TreeViewEngine {
             this.view.$emit('viewdataschange', args);
         }
     }
+
+    /**
+     * 双击选中激活数据
+     *
+     * @param {string} ctrlName
+     * @param {string} eventName
+     * @param {*} args
+     * @memberof PickupTreeViewEngine
+     */
+    public onCtrlEvent(ctrlName: string, eventName: string, args: any): void {
+      if (Object.is(ctrlName, 'tree') && Object.is(eventName, 'nodedblclick')) {
+          this.view.$emit('viewdatasactivated', args);
+          return ;
+      }
+      super.onCtrlEvent(ctrlName, eventName, args);
+    }
 }
\ No newline at end of file

app_web/src/widgets/ibzdepartment/dept-tree-treeview/dept-tree-treeview-base.vue

@@ -756,6 +756,7 @@ export default class DeptTreeBase extends Vue implements ControlInterface {
             const data: any = node.data;
             const tags: string[] = data.id.split(';');
         }
+        this.$emit('nodedblclick', this.selectedNodes);
     }
 
 }

app_web/src/widgets/ibzorganization/org-tree-treeview/org-tree-treeview-base.vue

@@ -756,6 +756,7 @@ export default class OrgTreeBase extends Vue implements ControlInterface {
             const data: any = node.data;
             const tags: string[] = data.id.split(';');
         }
+        this.$emit('nodedblclick', this.selectedNodes);
     }
 
 }

config.xml

@@ -37,11 +37,6 @@
 	  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      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZDepartmentSearchContext.java

@@ -98,7 +98,9 @@ public class IBZDepartmentSearchContext extends QueryWrapperContext<IBZDepartmen
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-			this.getSelectCond().or().like("deptname",query);
+            this.getSelectCond().and( wrapper ->
+                     wrapper.like("deptname", query)   
+            );
 		 }
 	}
 }

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZDeptMemberSearchContext.java

@@ -77,7 +77,9 @@ public class IBZDeptMemberSearchContext extends QueryWrapperContext<IBZDeptMembe
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-			this.getSelectCond().or().like("personname",query);
+            this.getSelectCond().and( wrapper ->
+                     wrapper.like("personname", query)   
+            );
 		 }
 	}
 }

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZEmployeeSearchContext.java

@@ -91,7 +91,9 @@ public class IBZEmployeeSearchContext extends QueryWrapperContext<IBZEmployee> {
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-			this.getSelectCond().or().like("personname",query);
+            this.getSelectCond().and( wrapper ->
+                     wrapper.like("personname", query)   
+            );
 		 }
 	}
 }

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZOrganizationSearchContext.java

@@ -98,7 +98,9 @@ public class IBZOrganizationSearchContext extends QueryWrapperContext<IBZOrganiz
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-			this.getSelectCond().or().like("orgname",query);
+            this.getSelectCond().and( wrapper ->
+                     wrapper.like("orgname", query)   
+            );
 		 }
 	}
 }

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,21 +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
-      - SERVER_PORT=40001
-      - 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:
       mode: replicated
       replicas: 1