ibiz4j 发布系统代码

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

@@ -68,6 +68,14 @@
             }
         ]
     }, 
+    {
+        "srfkey": "DstAppList",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DstApp",
+        "appdedataset":"FetchDefault",
+        "items": []
+    }, 
     {
         "srfkey": "AppType",
         "emptytext": "未定义",
@@ -96,5 +104,13 @@
                 "disabled": false
             }
         ]
+    }, 
+    {
+        "srfkey": "DstSystemList",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DstSystem",
+        "appdedataset":"FetchDefault",
+        "items": []
     } 
 ]
\ No newline at end of file

app_web/src/codelist/codelist-register.ts

@@ -39,7 +39,9 @@ export class CodeListRegister {
      * @memberof CodeListRegister
      */
     protected init(): void {
-        }
+            this.allCodeList.set('DstAppList', () => import('@/codelist/dst-app-list'));
+        this.allCodeList.set('DstSystemList', () => import('@/codelist/dst-system-list'));
+    }
 
     /**
      * 加载实体数据服务

app_web/src/codelist/dst-app-list.ts

+import DstAppService from '@service/dst-app/dst-app-service';
+/**
+ * 代码表--DstAppList
+ *
+ * @export
+ * @class DstAppList
+ */
+export default class DstAppList {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof DstAppList
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof DstAppList
+     */
+    public static expirationTime:any;
+
+    /**
+     * 预定义类型
+     *
+     * @type string
+     * @memberof DstAppList
+     */
+    public predefinedType:string ='';
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof DstAppList
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof DstAppList
+     */
+    public codelistModel:any = {
+        codelistid:"DstAppList"
+    };
+
+    /**
+     * 获取过期时间
+     *
+     * @type any
+     * @memberof DstAppList
+     */
+    public getExpirationTime(){
+        return DstAppList.expirationTime;
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @type any
+     * @memberof DstAppList
+     */
+    public setExpirationTime(value:any){
+        DstAppList.expirationTime = value; 
+    }
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof DstAppList
+     */
+    public userParamNames:any ={
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof DstAppList
+     */
+    public queryParamNames:any ={
+    }
+
+    /**
+     * 应用应用实体服务对象
+     *
+     * @type {DstAppService}
+     * @memberof DstAppList
+     */
+    public dstappService: DstAppService = new DstAppService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof DstAppList
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.id});
+            Object.assign(itemdata,{value:item.id});
+            Object.assign(itemdata,{text:item.label});
+            Object.assign(itemdata,{label:item.label});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DstAppList
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.dstappService.FetchDefault(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof DstAppList
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_web/src/codelist/dst-system-list.ts

+import DstSystemService from '@service/dst-system/dst-system-service';
+/**
+ * 代码表--DstSystemList
+ *
+ * @export
+ * @class DstSystemList
+ */
+export default class DstSystemList {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof DstSystemList
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public static expirationTime:any;
+
+    /**
+     * 预定义类型
+     *
+     * @type string
+     * @memberof DstSystemList
+     */
+    public predefinedType:string ='';
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public codelistModel:any = {
+        codelistid:"DstSystemList"
+    };
+
+    /**
+     * 获取过期时间
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public getExpirationTime(){
+        return DstSystemList.expirationTime;
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public setExpirationTime(value:any){
+        DstSystemList.expirationTime = value; 
+    }
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public userParamNames:any ={
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public queryParamNames:any ={
+    }
+
+    /**
+     * 系统应用实体服务对象
+     *
+     * @type {DstSystemService}
+     * @memberof DstSystemList
+     */
+    public dstsystemService: DstSystemService = new DstSystemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof DstSystemList
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.pssystemid});
+            Object.assign(itemdata,{value:item.pssystemid});
+            Object.assign(itemdata,{text:item.pssystemname});
+            Object.assign(itemdata,{label:item.pssystemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DstSystemList
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.dstsystemService.FetchDefault(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof DstSystemList
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_web/src/locale/lanres/codelist/codelist_en_US.ts

@@ -10,9 +10,15 @@ export default {
         "DynamicGrid": "动态表格",
         "empty": ""
     },
+    DstAppList: {
+        "empty": "",
+    },
     AppType: {
         "INNER": "内置应用",
         "THIRD-PARTY": "第三方应用",
         "empty": ""
     },
+    DstSystemList: {
+        "empty": "",
+    },
 };
\ No newline at end of file

app_web/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -10,9 +10,15 @@ export default {
         "DynamicGrid": "动态表格",
         "empty": "",
     },
+    DstAppList: {
+        "empty": "",
+    },
     AppType: {
         "INNER": "内置应用",
         "THIRD-PARTY": "第三方应用",
         "empty": "",
     },
+    DstSystemList: {
+        "empty": "",
+    },
 };
\ No newline at end of file

app_web/src/mock/codelist/codelist.ts

@@ -76,6 +76,14 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        "srfkey": "DstAppList",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DstApp",
+        "appdedataset":"FetchDefault",
+        "items": []
+    },
     {
         srfkey: "AppType",
         emptytext: "未定义",
@@ -104,6 +112,14 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 disabled: false,
             },
         ]
+    },
+    {
+        "srfkey": "DstSystemList",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DstSystem",
+        "appdedataset":"FetchDefault",
+        "items": []
     }
     ]];
 });

app_web/src/widgets/dst-component/main-form/main-form-base.vue

@@ -87,6 +87,46 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.systemid.visible" :style="{}"  :sm="{ span: 6, offset: 0 }" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='systemid' :itemRules="this.rules().systemid" class='' :caption="$t('entities.dstcomponent.main_form.details.systemid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.systemid.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+    v-model="data.systemid" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.systemid.disabled" 
+    valueType="string"
+    tag='DstSystemList' 
+    codelistType='DYNAMIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.appid.visible" :style="{}"  :sm="{ span: 6, offset: 0 }" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='appid' :itemRules="this.rules().appid" class='' :caption="$t('entities.dstcomponent.main_form.details.appid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.appid.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+    v-model="data.appid" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.appid.disabled" 
+    valueType="string"
+    tag='DstAppList' 
+    codelistType='DYNAMIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
+
+</app-form-item>
+
 </i-col>
     
     </row>

config.xml

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

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

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

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

@@ -3,22 +3,9 @@ services:
   ibzlite-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
     ports:
-      - "30010:30010"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30010
-      - 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&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzlite-core/src/main/resources/liquibase/h2_table.xml

@@ -8,7 +8,7 @@
 
 
     <!--输出实体[DST_COMPONENT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_component-47-1">
+    <changeSet author="a_A_5d9d78509" id="tab-dst_component-48-1">
         <createTable tableName="IBZCOMPONENT">
                 <column name="CID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
@@ -297,7 +297,7 @@
     </changeSet>
 
         <!--输出实体[DST_COMPONENT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-dst_component-47-13">
+    <changeSet author="a_A_5d9d78509" id="fk-dst_component-48-13">
        <addForeignKeyConstraint baseColumnNames="ENTITYID" baseTableName="IBZCOMPONENT" constraintName="DER1N_DST_COMPONENT_META_ENTIT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ENTITYID" referencedTableName="IBZENTITY" validate="true"/>
     </changeSet>
         <!--输出实体[DST_CONFIG]外键关系 -->