ibiz4j 发布系统代码

app_web/src/components/app-department-select/app-department-select.vue

@@ -199,11 +199,11 @@ export default class AppDepartmentSelect extends Vue {
         if(this.fillMap && Object.keys(this.fillMap).length > 0){
             Object.keys(this.fillMap).forEach((attribute:string) => {
                 let _name = this.fillMap[attribute];
-                let _value = selectArr.map((item:any) => item[attribute]);
-                this.$emit('select-change',{name: this.fillMap[attribute], value: _value.join(",")})
+                let values = selectArr.map((item:any) => item[attribute]);
+                let _value = $event === "[]" ? null : values.join(",");
+                this.$emit('select-change',{name: this.fillMap[attribute], value: _value})
             });
         }
-
     }
 }
 </script>

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/model/chart-detail/chart-radar-series.ts

+import { ChartSeries } from './chart-series';
+
+/**
+ * 雷达图序列模型
+ *
+ * @export
+ * @class ChartRadarSeries
+ */
+export class ChartRadarSeries extends ChartSeries{
+
+    /**
+     * 分类属性
+     *
+     * @type {string}
+     * @memberof ChartRadarSeries
+     */
+    public categorField: string = '';
+
+    /**
+     * 值属性
+     *
+     * @type {string}
+     * @memberof ChartRadarSeries
+     */
+    public valueField: string = '';
+
+    /**
+     * 雷达图指示器
+     *
+     * @type {string}
+     * @memberof ChartRadarSeries
+     */
+    public indicator: Array<any> = [];
+
+    /**
+     * 分类代码表
+     *
+     * @type {string}
+     * @memberof ChartRadarSeries
+     */
+    public categorCodeList: any = null;
+
+    /**
+     * 维度编码
+     *
+     * @type {*}
+     * @memberof ChartRadarSeries
+     */
+    public encode:any = null;
+
+
+    /**
+     * Creates an instance of ChartRadarSeries.
+     * ChartRadarSeries 实例
+     * 
+     * @param {*} [opts={}]
+     * @memberof ChartRadarSeries
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.categorField = !Object.is(opts.categorField, '') ? opts.categorField : '';
+        this.categorCodeList = opts.categorCodeList ? opts.categorCodeList : null;
+        this.valueField = !Object.is(opts.valueField, '') ? opts.valueField : '';
+        this.encode = opts.encode ? opts.encode : null;
+        this.indicator = opts.indicator ? opts.indicator:[];
+    }
+
+    /**
+     * 设置分类属性
+     *
+     * @param {string} state
+     * @memberof ChartRadarSeries
+     */
+    public setCategorField(state: string): void {
+        this.categorField = state;
+    }
+
+    /**
+     * 设置序列名称
+     *
+     * @param {string} state
+     * @memberof ChartRadarSeries
+     */
+    public setValueField(state: string): void {
+        this.valueField = state;
+    }
+
+    /**
+     * 分类代码表
+     *
+     * @param {*} state
+     * @memberof ChartRadarSeries
+     */
+    public setCategorCodeList(state: any): void {
+        this.categorCodeList = state;
+    }
+
+    /**
+     * 设置编码
+     *
+     * @param {*} state
+     * @memberof ChartRadarSeries
+     */
+    public setEncode(state: any): void {
+        this.encode = state;
+    }
+
+    /**
+     * 设置雷达图指示器
+     *
+     * @param {*} state
+     * @memberof ChartRadarSeries
+     */
+    public setIndicator(state: any): void {
+        this.indicator = state;
+    }
+
+}
\ No newline at end of file

app_web/src/model/chart-detail/index.ts

@@ -2,4 +2,5 @@ export { ChartDataSetField } from './chart-dataset-field';
 export { ChartLineSeries } from './chart-line-series';
 export { ChartFunnelSeries } from './chart-funnel-series';
 export { ChartPieSeries } from './chart-pie-series';
-export { ChartBarSeries } from './chart-bar-series';
+export { ChartBarSeries } from './chart-bar-series';
\ No newline at end of file
+export { ChartRadarSeries } from './chart-radar-series';
\ No newline at end of file

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

@@ -41,6 +41,7 @@ export class UIActionTool {
         if (Object.is(actionTarget, 'SINGLEKEY')) {
             let [arg] = args;
             Object.keys(_params).forEach((name: string) => {
+                let hasProperty = true;
                 if (!name) {
                     return;
                 }
@@ -50,13 +51,16 @@ export class UIActionTool {
                     if (arg && arg.hasOwnProperty(key)) {
                         value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
                     } else {
-                        value = null;
+                        hasProperty = false;
                     }
                 }
-                Object.assign(_data, { [name]: value });
+                if(hasProperty){
+                    Object.assign(_data, { [name]: value });
+                }
             });
         } else if (Object.is(actionTarget, 'MULTIKEY')) {
             Object.keys(_params).forEach((name: string) => {
+                let noPropertyNum = 0;
                 if (!name) {
                     return;
                 }
@@ -69,11 +73,14 @@ export class UIActionTool {
                             value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
                         } else {
                             value = null;
+                            noPropertyNum++;
                         }
                         values.push(value);
                     });
                 }
-                Object.assign(_data, { [name]: values.length > 0 ? values.join(',') : value });
+                if(values.length !== noPropertyNum){
+                    Object.assign(_data, { [name]: values.length > 0 ? values.join(';') : value });
+                }
             });
         }
         return _data;

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

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -124,7 +124,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -160,6 +160,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

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

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -50,7 +50,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -86,6 +86,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -76,7 +76,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -112,6 +112,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

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

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -74,7 +74,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -110,6 +110,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

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

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -76,7 +76,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -112,6 +112,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

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

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -62,7 +62,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -98,6 +98,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

app_web/vue.config.js

@@ -15,7 +15,7 @@ module.exports = {
         port: 8111,
         compress: true,
         disableHostCheck: true,
-        // proxy: "http://127.0.0.1:8080/web",
+        // proxy: "http://127.0.0.1:8080/",
         historyApiFallback: {
             rewrites: [
             ]

config.xml

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

ibzuaa-provider/ibzuaa-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 /ibzuaa-provider-api.jar
 
-EXPOSE 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

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

@@ -3,21 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40002
-      - 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