ibiz4j 发布系统代码

app_web/src/authservice/sdfile/sdfile-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SDFileAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/codelist/sys-operator.ts

@@ -20,7 +20,7 @@ export default class SysOperator {
      * @type any
      * @memberof SysOperator
      */
-    public expirationTime:any;
+    public static expirationTime:any;
 
     /**
      * 预定义类型
@@ -48,6 +48,26 @@ export default class SysOperator {
         codelistid:"SysOperator"
     };
 
+    /**
+     * 获取过期时间
+     *
+     * @type any
+     * @memberof SysOperator
+     */
+    public getExpirationTime(){
+        return SysOperator.expirationTime;
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @type any
+     * @memberof SysOperator
+     */
+    public setExpirationTime(value:any){
+        SysOperator.expirationTime = value; 
+    }
+
     /**
      * 自定义参数集合
      *

app_web/src/components/app-embed-picker/app-embed-picker.vue

@@ -101,7 +101,7 @@ export default class AppEmbedPicker extends Vue {
      * @type {string}
      * @memberof AppEmbedPicker
      */
-    @Prop() public valueItem?: string;
+    @Prop() public valueItem!: string;
 
     /**
      * 关联视图名称
@@ -176,17 +176,28 @@ export default class AppEmbedPicker extends Vue {
         if (!this.data) {
             return;
         }
+        let formData:any = JSON.parse(this.data);
         let arg: any = {};
         // 合并视图上下文参数和视图参数
         arg.param = JSON.parse(JSON.stringify(this.viewparams));
         arg.context = JSON.parse(JSON.stringify(this.context));
+        if(formData[this.name] && formData[this.valueItem]){
+            let selectItems:Array<any> = [];
+            let tempvalue: Array<any> = formData[this.valueItem].split(',');
+            let temptext: Array<any> = formData[this.name].split(',');
+            tempvalue.forEach((srfkey: any, index: number)=>{
+                selectItems.push({ srfmajortext : temptext[index], srfkey: srfkey });
+            });
+            arg.param.selectedData = selectItems;
+            this.$forceUpdate();
+        }
         // 附加参数处理
          if (this.localContext && Object.keys(this.localContext).length >0) {
-            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
+            let _context = this.$util.computedNavData(formData,arg.context,arg.param,this.localContext);
             Object.assign(arg.context,_context);
         }
         if (this.localParam && Object.keys(this.localParam).length >0) {
-            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
+            let _param = this.$util.computedNavData(formData,arg.context,arg.param,this.localParam);
             Object.assign(arg.param,_param);
         }
         this.viewdata = JSON.stringify(arg.context);
@@ -257,12 +268,10 @@ export default class AppEmbedPicker extends Vue {
             srfkey = srfkey.substring(0,srfkey.length-1);
             srfmajortext = srfmajortext.substring(0,srfmajortext.length-1);
             if (this.valueItem) {
-                let value = srfkey;
-                this.$emit('formitemvaluechange', { name: this.valueItem, value: value });
+                this.$emit('formitemvaluechange', { name: this.valueItem, value: srfkey });
             }
             if (this.name) {
-                let value = srfmajortext;
-                this.$emit('formitemvaluechange', { name: this.name, value: value });
+                this.$emit('formitemvaluechange', { name: this.name, value: srfmajortext });
             }
         }
     }

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

@@ -3,9 +3,9 @@
         class='dropdown-list-dynamic'
         :transfer="true"
         v-model="currentVal"
-        :disabled="disabled === true ? true : false"
+        :disabled="disabled"
         :clearable="true"
-        :filterable="filterable === true ? true : false"
+        :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownListDynamic.placeholder')">
         <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
@@ -114,7 +114,7 @@ export default class DropDownListDynamic extends Vue {
      * @type {boolean}
      * @memberof DropDownListDynamic
      */
-    @Prop() public filterable?: boolean;
+    public filterable: boolean = true;
 
     /**
      * 下拉选提示内容

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

@@ -7,9 +7,9 @@
             :transfer="true"
             transfer-class-name="dropdown-list-mpicker-transfer"
             v-model="currentVal"
-            :disabled="disabled === true ? true : false"
+            :disabled="disabled"
             :clearable="true"
-            :filterable="filterable === true ? true : false"
+            :filterable="filterable"
             @on-open-change="onClick"
             :placeholder="$t('components.dropDownListMpicker.placeholder')">
             <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text">
@@ -88,7 +88,7 @@ export default class DropDownListMpicker extends Vue {
      * @type {boolean}
      * @memberof DropDownListMpicker
      */
-    @Prop() public filterable?: boolean;
+    public filterable: boolean = true;
 
     /**
      * 下拉选提示内容

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

@@ -4,9 +4,9 @@
         class='dropdown-list'
         :transfer="true"
         v-model="currentVal"
-        :disabled="disabled === true ? true : false"
+        :disabled="disabled"
         :clearable="true"
-        :filterable="filterable === true ? true : false"
+        :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownList.placeholder')">
         <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
@@ -141,7 +141,7 @@ export default class DropDownList extends Vue {
      * @type {boolean}
      * @memberof DropDownList
      */
-    @Prop() public filterable?: boolean;
+    public filterable: boolean = true;
 
     /**
      * 下拉选提示内容

app_web/src/service/app/codelist-service.ts

@@ -148,49 +148,36 @@ export default class CodeListService {
                 let cacheTimeout:any = codelist.cacheTimeout;
                     // 启用缓存
                     if(isEnableCache){
+                        const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
+                            promise.then((result:any) =>{
+                                if(result.length > 0){
+                                    CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
+                                    CodeListService.codelistCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`);
+                                    return resolve(result);
+                                }else{
+                                    return resolve([]);
+                                }
+                            }).catch((result:any) =>{
+                                return reject(result);
+                            })
+                        }
                         // 加载完成,从本地缓存获取
                         if(CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
                             let items:any = CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items;
                             if(items.length >0){
-                                if(cacheTimeout !== -1){
-                                    if(new Date().getTime() > codelist.expirationTime){
-                                        codelist.getItems(context,data,isloading).then((result:any) =>{
-                                            CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
-                                            codelist.expirationTime = new Date().getTime() + cacheTimeout;
-                                            resolve(result);
-                                        }).catch((error:any) =>{
-                                            Promise.reject([]);
-                                        })
-                                    }else{
-                                        return resolve(items); 
-                                    }
-                                }else{
-                                    return resolve(items);
+                                if(new Date().getTime() <= codelist.getExpirationTime()){
+                                    return resolve(items); 
                                 }
                             }
                         }
                         if (codelist) {
-                            const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
-                                promise.then((result:any) =>{
-                                    if(result.length > 0){
-                                        CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
-                                        return resolve(result);
-                                    }else{
-                                        return resolve([]);
-                                    }
-                                }).catch((result:any) =>{
-                                    return reject(result);
-                                })
-                            }
                             // 加载中，UI又需要数据，解决连续加载同一代码表问题
                             if(CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
                                 callback(context,data,tag,CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`));
                             }else{
                                 let result:Promise<any> = codelist.getItems(context,data,isloading);
                                 CodeListService.codelistCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result);
-                                if(cacheTimeout !== -1){
-                                    codelist.expirationTime = new Date().getTime() + cacheTimeout;
-                                }
+                                codelist.setExpirationTime(new Date().getTime() + cacheTimeout);
                                 callback(context,data,tag,result);
                             }
                         }

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

@@ -4,5 +4,5 @@ Tip: If the failing expression is known to be legally refer to something that's
 
 ----
 FTL stack trace ("~" means nesting-related):
-	- Failed at: ${ctrl.getPSAppDataEntity().getMajorP...  [in template "TEMPLCODE_zh_CN" at line 977, column 39]
+	- Failed at: ${ctrl.getPSAppDataEntity().getMajorP...  [in template "TEMPLCODE_zh_CN" at line 1100, column 39]
 ----
\ No newline at end of file

ibzdisk-boot/src/main/docker/mysql.yml

+version: "3.2"
+services:
+    ibzdisk-mysql:
+    image: mysql:5.7.20
+    volumes:
+      - $PWD/../../../../volumes/mysql/:/var/lib/mysql/
+    networks:
+      - agent_network
+    environment:
+      - TZ=Asia/Shanghai
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=a_A_5d9d78509
+    ports:
+      - 3306:3306
+    command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8 --explicit_defaults_for_timestamp
+networks:
+  agent_network:
+    attachable: true

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

@@ -36,5 +36,9 @@ zuul:
         path: /dictionarys/**
         serviceId: ${ibiz.ref.service.dict:ibzdict-api}
         stripPrefix: false
+      disk:
+        path: /net-disk/**
+        serviceId: ${ibiz.ref.service.disk:disk-api}
+        stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

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

 server:
-  port: 8081
+  port: 40006
 #Log配置
 logging:
   level:

ibzdisk-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -67,6 +67,33 @@ public class SearchContextBase implements ISearchContext{
      * 工作流流程标识
      */
     public String processDefinitionKey;
+
+    /**
+     * 获取工作流步骤标识
+     */
+    public String getUserTaskId() {
+        if(StringUtils.isEmpty(userTaskId)){
+            Object taskId=params.get("usertaskid");
+            return StringUtils.isEmpty(taskId)?null:String.valueOf(taskId);
+        }else{
+            return userTaskId;
+        }
+    }
+
+    /**
+     * 获取工作流流程标识
+     * @return
+     */
+    public String getProcessDefinitionKey() {
+        if(StringUtils.isEmpty(processDefinitionKey)){
+            Object processKey=params.get("processdefinitionkey");
+            return StringUtils.isEmpty(processKey)?null:String.valueOf(processKey);
+        }
+        else{
+            return processDefinitionKey;
+        }
+    }
+
     /**
      * 获取分页参数
      * @return

ibzdisk-util/src/main/resources/application-nacos.yml

@@ -3,7 +3,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 172.16.102.211:8848
         enabled: true
 
 eureka:

ibzdisk-util/src/main/resources/application-sys.yml

@@ -7,7 +7,7 @@ spring:
     caffeine:
       spec: initialCapacity=5,maximumSize=500,expireAfterWrite=3600s
   redis:
-    host: 127.0.0.1
+    host: 172.16.100.243
     port: 6379
     password:
     database: 0
@@ -22,9 +22,9 @@ spring:
       max-file-size: 100MB
       max-request-size: 100MB
   datasource:
-    username: root
-    password: 'root'
-    url: jdbc:mysql://127.0.0.1:3306/ibzdisk?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+    username: a_A_5d9d78509
+    password: '@6dEfb3@'
+    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat,wall,log4j2
     #配置初始化大小/最小/最大
@@ -45,7 +45,7 @@ spring:
     pool-prepared-statements: false
     max-pool-prepared-statement-per-connection-size: 20
     isSyncDBSchema: false
-    defaultSchema: root
+    defaultSchema: a_A_5d9d78509
     conf: classpath:liquibase/master.xml
 
 #Mybatis-plus配置