ibizdev提交

app_web/src/app-register.ts

@@ -62,6 +62,7 @@ import AppBuild from './components/app-build/app-build.vue'
 import AppStudioAction from './components/app-studioaction/app-studioaction.vue'
 import AppDebugActions from './components/app-debug-actions/app-debug-actions.vue'
 import AppHeaderMenus from './components/app-header-menus/app-header-menus.vue'
+import AppColumnLink from './components/app-column-link/app-column-link.vue'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -133,5 +134,6 @@ export const AppComponents = {
         v.component('app-studioaction', AppStudioAction);
         v.component('app-debug-actions', AppDebugActions);
         v.component('app-header-menus', AppHeaderMenus);
+        v.component('app-column-link', AppColumnLink);
     },
 };
\ No newline at end of file

app_web/src/components/app-column-link/app-column-link.less

+.app-column-link{
+    display: inline-block;
+    cursor:pointer;
+}
\ No newline at end of file

app_web/src/components/app-column-link/app-column-link.vue

+<template>
+    <a class="app-column-link" @click="openLinkView($event)">
+        <slot></slot>
+    </a>
+</template>
+
+<script lang="ts">
+import { Vue, Component,Prop } from 'vue-property-decorator';
+import { Subject } from 'rxjs';
+/**
+ * 表格列链接
+ */
+@Component({
+    i18n: {
+        messages: {
+            'zh-CN': {
+                info: {
+                    error: '错误',
+                    valueItemException:"值项异常",
+                    rowDataException:"表格行数据异常"
+                }
+            },
+            'en-US': {
+                info: {
+                    error: 'error',
+                    valueItemException:"value item exception",
+                    rowDataException:"table row data exception"
+                }
+            }
+        }
+    }
+})
+export default class AppColumnLink extends Vue {
+
+    /**
+     * 表格行数据
+     *
+     * @type {*}
+     * @memberof AppColumnLink
+     */
+    @Prop() public data!: any;
+
+    /**
+     * 数据链接视图
+     *
+     * @type {*}
+     * @memberof AppColumnLink
+     */
+    @Prop() public linkview?: any;
+
+    /**
+     * 值项名称
+     *
+     * @type {string}
+     * @memberof AppColumnLink
+     */
+    @Prop() public valueitem?: string;
+
+    /**
+     * 导航上下文
+     *
+     * @type {*}
+     * @memberof AppColumnLink
+     */
+    @Prop({default:{}}) public context?:any;
+
+    /**
+     * 导航参数
+     *
+     * @type {*}
+     * @memberof AppColumnLink
+     */
+    @Prop({default:{}}) public viewparams?:any;
+
+    /**
+     * 应用实体主键属性名称
+     *
+     * @type {string}
+     * @memberof AppColumnLink
+     */
+    @Prop() public deKeyField!:string;
+
+    /**
+     * 打开链接视图
+     *
+     * @memberof AppColumnLink
+     */
+    public openLinkView($event: any): void {
+        $event.stopPropagation();
+        if (!this.data || !this.valueitem || !this.data[this.valueitem]) {
+            this.$Notice.error({ title: (this.$t('info.error') as string), desc: (this.$t('info.valueItemException') as string) });
+            return;
+        }
+        // 公共参数处理
+        let data: any = {};
+        const bcancel: boolean = this.handlePublicParams(data);
+        if (!bcancel) {
+            return;
+        }
+        // 参数处理
+        let _context = data.context;
+        let _param = data.param;
+        Object.assign(_context, { [this.deKeyField]: this.data[this.valueitem] });
+        const view = JSON.parse(JSON.stringify(this.linkview));
+        const viewname2: string = this.$util.srfFilePath2(view.viewname);
+        view.viewname = viewname2;
+
+        if (view.isRedirectView) {
+            this.openRedirectView($event, view, data);
+        } else if (Object.is(view.placement, 'INDEXVIEWTAB') || Object.is(view.placement, '')) {
+            this.openIndexViewTab(view, _context, _param);
+        } else if (Object.is(view.placement, 'POPOVER')) {
+            this.openPopOver($event, view, _context, _param);
+        } else if (Object.is(view.placement, 'POPUPMODAL')) {
+            this.openPopupModal(view, _context, _param);
+        } else if (view.placement.startsWith('DRAWER')) {
+            this.openDrawer(view, _context, _param);
+        }
+    }
+
+    /**
+     * 路由模式打开视图
+     *
+     * @private
+     * @param {string} viewpath
+     * @param {*} data
+     * @memberof AppColumnLink
+     */
+    private openIndexViewTab(view: any, context: any, param: any): void {
+        const routePath = this.$viewTool.buildUpRoutePath(this.$route, this.context, view.deResParameters, view.parameters, [context] , param);
+        this.$router.push(routePath);
+    }
+
+    /**
+     * 模态模式打开视图
+     *
+     * @private
+     * @param {*} view
+     * @param {*} data
+     * @memberof AppColumnLink
+     */
+    private openPopupModal(view: any, context: any, param: any): void {
+        let container: Subject<any> = this.$appmodal.openModal(view, context, param);
+        container.subscribe((result: any) => {
+            if (!result || !Object.is(result.ret, 'OK')) {
+                return;
+            }
+            this.openViewClose(result);
+        });
+    }
+
+    /**
+     * 抽屉模式打开视图
+     *
+     * @private
+     * @param {*} view
+     * @param {*} data
+     * @memberof AppColumnLink
+     */
+    private openDrawer(view: any, context: any, param: any): void {
+        let container: Subject<any> = this.$appdrawer.openDrawer(view, context, param);
+        container.subscribe((result: any) => {
+            if (!result || !Object.is(result.ret, 'OK')) {
+                return;
+            }
+            this.openViewClose(result);
+        });
+    }
+
+    /**
+     * 气泡卡片模式打开
+     *
+     * @private
+     * @param {*} $event
+     * @param {*} view
+     * @param {*} data
+     * @memberof AppColumnLink
+     */
+    private openPopOver($event: any, view: any, context: any, param: any): void {
+        let container: Subject<any> = this.$apppopover.openPop($event, view, context, param);
+        container.subscribe((result: any) => {
+            if (!result || !Object.is(result.ret, 'OK')) {
+                return;
+            }
+            this.openViewClose(result);
+        });
+    }
+
+    /**
+     * 独立里面弹出
+     *
+     * @private
+     * @param {string} url
+     * @memberof AppColumnLink
+     */
+    private openPopupApp(url: string): void {
+        window.open(url, '_blank');
+    }
+
+    /**
+     * 打开重定向视图
+     *
+     * @private
+     * @param {*} $event
+     * @param {*} view
+     * @param {*} data
+     * @memberof AppColumnLink
+     */
+    private openRedirectView($event: any, view: any, data: any): void {
+        this.$http.get(view.url, data).then((response: any) => {
+            if (!response || response.status !== 200) {
+                this.$Notice.error({ title: '错误', desc: '请求异常' });
+            }
+            if (response.status === 401) {
+                return;
+            }
+            const { data: result } = response;
+
+            if (result.viewparams && !Object.is(result.viewparams.srfkey, '')) {
+                Object.assign(data, { srfkey: result.viewparams.srfkey });
+            }
+
+            if (Object.is(result.openmode, 'POPUPAPP') && result.url && !Object.is(result.url, '')) {
+                this.openPopupApp(result.url);
+            } else if (Object.is(result.openmode, 'INDEXVIEWTAB') || Object.is(result.openmode, '')) {
+                // 所有数据保持在同一级
+                if (data.srfparentdata) {
+                    Object.assign(data, data.srfparentdata);
+                    delete data.srfparentdata;
+                }
+                this.openIndexViewTab(view, null, data);
+            } else if (Object.is(result.openmode, 'POPUPMODAL')) {
+                const viewname = this.$util.srfFilePath2(result.viewname);
+                const view: any = {
+                    viewname: viewname,
+                    title: result.title,
+                    width: result.width,
+                    height: result.height,
+                }
+                this.openPopupModal(view, null,data);
+            } else if (result.openmode.startsWith('DRAWER')) {
+                const viewname = this.$util.srfFilePath2(result.viewname);
+                const view: any = {
+                    viewname: viewname,
+                    title: result.title,
+                    width: result.width,
+                    height: result.height,
+                    placement: result.openmode,
+                }
+                this.openDrawer(view, null, data);
+            } else if (Object.is(result.openmode, 'POPOVER')) {
+                const viewname = this.$util.srfFilePath2(result.viewname);
+                const view: any = {
+                    viewname: viewname,
+                    title: result.title,
+                    width: result.width,
+                    height: result.height,
+                    placement: result.openmode,
+                }
+                this.openPopOver($event, view, null, data);
+            }
+        }).catch((response: any) => {
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常！' });
+                return;
+            }
+            if (response.status === 401) {
+                return;
+            }
+        });
+    }
+
+    /**
+     * 打开页面关闭
+     *
+     * @param {*} result
+     * @memberof AppColumnLink
+     */
+    public openViewClose(result: any) {
+        let item: any = {};
+        if (result.datas && Array.isArray(result.datas)) {
+            Object.assign(item, result.datas[0]);
+        }
+        console.log(item);
+    }
+
+    /**
+     * 公共参数处理
+     *
+     * @param {*} arg
+     * @returns
+     * @memberof AppColumnLink
+     */
+    public handlePublicParams(arg: any): boolean {
+        if (!this.data) {
+            this.$Notice.error({ title: (this.$t('info.error') as string), desc: (this.$t('info.rowDataException') as string) });
+            return false;
+        }
+        // 合并表单参数
+        arg.param = JSON.parse(JSON.stringify(this.viewparams));
+        arg.context = JSON.parse(JSON.stringify(this.context));
+        return true;
+    }
+
+
+
+}
+</script>
+
+<style lang='less'>
+@import './app-column-link.less';
+</style>
\ No newline at end of file

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

@@ -8,6 +8,29 @@ spring:
     nacos:
       discovery:
         server-addr: 172.16.102.211:8848
+  datasource:
+    password: 'E6@8@7ce'
+    username: a_A_5ae9eb39a
+    url: jdbc:mysql://172.16.180.232:3306/a_A_5ae9eb39a?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+    driver-class-name: com.mysql.jdbc.Driver
+    filters: stat,wall,log4j2
+    #配置初始化大小/最小/最大
+    initial-size: 1
+    min-idle: 1
+    max-active: 20
+    #获取连接等待超时时间
+    max-wait: 60000
+    #间隔多久进行一次检测，检测需要关闭的空闲连接
+    time-between-eviction-runs-millis: 60000
+    #一个连接在池中最小生存的时间
+    min-evictable-idle-time-millis: 300000
+    validation-query: SELECT 1 FROM DUAL
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+    pool-prepared-statements: false
+    max-pool-prepared-statement-per-connection-size: 20
 
 feign:
   sentinel: