xignzi006 发布系统代码

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

@@ -5509,7 +5509,7 @@
                 "text": "停用",
                 "data":"",
                 "codename":"Item_1",
-                "value": "1",
+                "value": 1,
                 
                 "disabled": false
             }
@@ -5519,7 +5519,7 @@
                 "text": "可用",
                 "data":"",
                 "codename":"Item_0",
-                "value": "0",
+                "value": 0,
                 
                 "disabled": false
             }

app_CRM/public/assets/json/view-config.json

@@ -259,6 +259,16 @@
         "viewtag": "15d12c1173fcb6e742b6a6d92cbc53ed",
         "memo": ""
     },
+    "connectionrolepickupgridview": {
+        "title": "连接角色选择表格视图",
+        "caption": "连接角色",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "Runtime",
+        "viewname": "ConnectionRolePickupGridView",
+        "viewfilename": "connection-role-pickup-grid-view",
+        "viewtag": "15db0c1d3cde0af58d2c9a4e874d9d01",
+        "memo": "系统自动添加"
+    },
     "competitoroptionview": {
         "title": "竞争对手选项操作视图",
         "caption": "竞争对手",
@@ -2149,6 +2159,16 @@
         "viewtag": "cab8702dc3d6cc283eb40a1e07fa72ba",
         "memo": ""
     },
+    "connectionrolepickupview": {
+        "title": "连接角色数据选择视图",
+        "caption": "连接角色",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "Runtime",
+        "viewname": "ConnectionRolePickupView",
+        "viewfilename": "connection-role-pickup-view",
+        "viewtag": "cb6b4a9ddcaced093574bfde38b54723",
+        "memo": "系统自动添加"
+    },
     "goalchildgoalgridview": {
         "title": "子目标表格视图",
         "caption": "目标",

app_CRM/src/locale/lanres/entities/connection-role/connection-role_en_US.ts

@@ -23,6 +23,10 @@ export default {
     statecode: "状态",
   },
 	views: {
+		pickupgridview: {
+			caption: "连接角色",
+      		title: "连接角色选择表格视图",
+		},
 		gridview: {
 			caption: "连接角色",
       		title: "连接角色",
@@ -31,6 +35,10 @@ export default {
 			caption: "连接角色",
       		title: "连接角色",
 		},
+		pickupview: {
+			caption: "连接角色",
+      		title: "连接角色数据选择视图",
+		},
 	},
 	main_form: {
 		details: {

app_CRM/src/locale/lanres/entities/connection-role/connection-role_zh_CN.ts

@@ -22,6 +22,10 @@ export default {
     statecode: "状态",
   },
 	views: {
+		pickupgridview: {
+			caption: "连接角色",
+      		title: "连接角色选择表格视图",
+		},
 		gridview: {
 			caption: "连接角色",
       		title: "连接角色",
@@ -30,6 +34,10 @@ export default {
 			caption: "连接角色",
       		title: "连接角色",
 		},
+		pickupview: {
+			caption: "连接角色",
+      		title: "连接角色数据选择视图",
+		},
 	},
 	main_form: {
 		details: {

app_CRM/src/locale/lanres/entities/connection/connection_en_US.ts

@@ -62,6 +62,8 @@ export default {
 			srfsourcekey: "", 
 			connectionname: "关联名称", 
 			record1id: "连接自", 
+			record1rolename: "角色（源）", 
+			record2rolename: "角色（目标）", 
 			record2id: "已连接到", 
 			record2idobjecttypecode: "Record2IdObjectTypeCode", 
 			record2objecttypecode: "类型(目标)", 
@@ -78,6 +80,8 @@ export default {
 			updateman: "更新人", 
 			updatedate: "更新时间", 
 			connectionid: "连接", 
+			record1roleid: "角色(源)", 
+			record2roleid: "角色(目标)", 
 		},
 		uiactions: {
 		},

app_CRM/src/locale/lanres/entities/connection/connection_zh_CN.ts

@@ -61,6 +61,8 @@ export default {
 			srfsourcekey: "", 
 			connectionname: "关联名称", 
 			record1id: "连接自", 
+			record1rolename: "角色（源）", 
+			record2rolename: "角色（目标）", 
 			record2id: "已连接到", 
 			record2idobjecttypecode: "Record2IdObjectTypeCode", 
 			record2objecttypecode: "类型(目标)", 
@@ -77,6 +79,8 @@ export default {
 			updateman: "更新人", 
 			updatedate: "更新时间", 
 			connectionid: "连接", 
+			record1roleid: "角色(源)", 
+			record2roleid: "角色(目标)", 
 		},
 		uiactions: {
 		},

app_CRM/src/mock/codelist/codelist.ts

@@ -5517,7 +5517,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "停用",
                 "data":"",
                 "codename":"Item_1",
-                value: "1",
+                value: 1,
                 
                 disabled: false,
             },
@@ -5527,7 +5527,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "可用",
                 "data":"",
                 "codename":"Item_0",
-                value: "0",
+                value: 0,
                 
                 disabled: false,
             },

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -215,6 +215,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "LeadGridView",
             "viewtag": "15d12c1173fcb6e742b6a6d92cbc53ed"
         },
+        "connectionrolepickupgridview": {
+            "title": "连接角色选择表格视图",
+            "caption": "连接角色",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "Runtime",
+            "viewname": "ConnectionRolePickupGridView",
+            "viewtag": "15db0c1d3cde0af58d2c9a4e874d9d01"
+        },
         "competitoroptionview": {
             "title": "竞争对手选项操作视图",
             "caption": "竞争对手",
@@ -1727,6 +1735,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "GoalQuickCreateView",
             "viewtag": "cab8702dc3d6cc283eb40a1e07fa72ba"
         },
+        "connectionrolepickupview": {
+            "title": "连接角色数据选择视图",
+            "caption": "连接角色",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "Runtime",
+            "viewname": "ConnectionRolePickupView",
+            "viewtag": "cb6b4a9ddcaced093574bfde38b54723"
+        },
         "goalchildgoalgridview": {
             "title": "子目标表格视图",
             "caption": "目标",

app_CRM/src/pages/runtime/connection-role-pickup-grid-view/connection-role-pickup-grid-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupGridViewBase } from '@/studio-core';
+import ConnectionRoleService from '@/service/connection-role/connection-role-service';
+import PickupGridViewEngine from '@engine/view/pickup-grid-view-engine';
+
+/**
+ * 连接角色选择表格视图视图基类
+ *
+ * @export
+ * @class ConnectionRolePickupGridViewBase
+ * @extends {PickupGridViewBase}
+ */
+export class ConnectionRolePickupGridViewBase extends PickupGridViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    protected appDeName: string = 'connectionrole';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    protected appDeKey: string = 'connectionroleid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    protected appDeMajor: string = 'connectionrolename';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ConnectionRoleService}
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    protected appEntityService: ConnectionRoleService = new ConnectionRoleService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof ConnectionRolePickupGridViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.connectionrole.views.pickupgridview.caption',
+        srfTitle: 'entities.connectionrole.views.pickupgridview.title',
+        srfSubTitle: 'entities.connectionrole.views.pickupgridview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '15db0c1d3cde0af58d2c9a4e874d9d01';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public engine: PickupGridViewEngine = new PickupGridViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            grid: this.$refs.grid,
+            searchform: this.$refs.searchform,
+            keyPSDEField: 'connectionrole',
+            majorPSDEField: 'connectionrolename',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public searchform_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+    /**
+     * searchform 部件 search 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public searchform_search($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
+    }
+
+    /**
+     * searchform 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    public searchform_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
+    }
+
+
+
+    /**
+     * 是否展开搜索表单
+     *
+     * @protected
+     * @type {boolean}
+     * @memberof ConnectionRolePickupGridViewBase
+     */
+    protected isExpandSearchForm: boolean = true;
+
+
+}
\ No newline at end of file

app_CRM/src/pages/runtime/connection-role-pickup-grid-view/connection-role-pickup-grid-view.html

+<studio-view-style2 viewName="connectionrolepickupgridview" viewTitle="连接角色选择表格视图" class='depickupgridview connection-role-pickup-grid-view'>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :selectedData="selectedData"
+        :showBusyIndicator="true"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/runtime/connection-role-pickup-grid-view/connection-role-pickup-grid-view.vue

+<template src="./connection-role-pickup-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { ConnectionRolePickupGridViewBase } from './connection-role-pickup-grid-view-base';
+import view_grid from '@widgets/connection-role/main-grid/main-grid.vue';
+import view_searchform from '@widgets/connection-role/default-searchform/default-searchform.vue';
+
+/**
+ * 连接角色选择表格视图视图
+ *
+ * @export
+ * @class ConnectionRolePickupGridView
+ * @extends {ConnectionRolePickupGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class ConnectionRolePickupGridView extends ConnectionRolePickupGridViewBase { }
+</script>

app_CRM/src/pages/runtime/connection-role-pickup-view/connection-role-pickup-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupViewBase } from '@/studio-core';
+import ConnectionRoleService from '@/service/connection-role/connection-role-service';
+import PickupViewEngine from '@engine/view/pickup-view-engine';
+
+/**
+ * 连接角色数据选择视图视图基类
+ *
+ * @export
+ * @class ConnectionRolePickupViewBase
+ * @extends {PickupViewBase}
+ */
+export class ConnectionRolePickupViewBase extends PickupViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof ConnectionRolePickupViewBase
+     */
+    protected appDeName: string = 'connectionrole';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof ConnectionRolePickupViewBase
+     */
+    protected appDeKey: string = 'connectionroleid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof ConnectionRolePickupViewBase
+     */
+    protected appDeMajor: string = 'connectionrolename';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ConnectionRoleService}
+     * @memberof ConnectionRolePickupViewBase
+     */
+    protected appEntityService: ConnectionRoleService = new ConnectionRoleService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof ConnectionRolePickupViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof ConnectionRolePickupViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.connectionrole.views.pickupview.caption',
+        srfTitle: 'entities.connectionrole.views.pickupview.title',
+        srfSubTitle: 'entities.connectionrole.views.pickupview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof ConnectionRolePickupViewBase
+     */
+    protected containerModel: any = {
+        view_pickupviewpanel: { name: 'pickupviewpanel', type: 'PICKUPVIEWPANEL' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = 'cb6b4a9ddcaced093574bfde38b54723';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof ConnectionRolePickupViewBase
+     */
+    public engine: PickupViewEngine = new PickupViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof ConnectionRolePickupViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            pickupviewpanel: this.$refs.pickupviewpanel,
+            keyPSDEField: 'connectionrole',
+            majorPSDEField: 'connectionrolename',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * pickupviewpanel 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupViewBase
+     */
+    public pickupviewpanel_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 activated 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupViewBase
+     */
+    public pickupviewpanel_activated($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ConnectionRolePickupViewBase
+     */
+    public pickupviewpanel_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/pages/runtime/connection-role-pickup-view/connection-role-pickup-view.html

+<studio-view-style2 viewName="connectionrolepickupview" viewTitle="连接角色数据选择视图" class='depickupview connection-role-pickup-view'>
+    <div class="content-container pickup-view">
+                <view_pickupviewpanel 
+                    :viewState="viewState"  
+                    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                    :context="JSON.parse(JSON.stringify(context))" 
+                    :isSingleSelect="isSingleSelect"
+                    :selectedData="selectedData"
+                    :isShowButton="isShowButton"
+                    name="pickupviewpanel"  
+                    ref='pickupviewpanel' 
+                    @selectionchange="pickupviewpanel_selectionchange($event)"  
+                    @activated="pickupviewpanel_activated($event)"  
+                    @load="pickupviewpanel_load($event)"  
+                    @closeview="closeView($event)">
+                </view_pickupviewpanel>
+        </div>
+        <template slot="footer">
+            <div v-if="isShowButton" :style="{ textAlign: 'right' }">
+                <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk.apply(_self, arguments)">{{this.containerModel.view_okbtn.text}}</i-button>
+                    &nbsp;&nbsp;
+                <i-button @click="onClickCancel.apply(_self, arguments)">{{this.containerModel.view_cancelbtn.text}}</i-button>
+            </div>
+        </template>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/runtime/connection-role-pickup-view/connection-role-pickup-view.vue

+<template src="./connection-role-pickup-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { ConnectionRolePickupViewBase } from './connection-role-pickup-view-base';
+import view_pickupviewpanel from '@widgets/connection-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
+
+/**
+ * 连接角色数据选择视图视图
+ *
+ * @export
+ * @class ConnectionRolePickupView
+ * @extends {ConnectionRolePickupViewBase}
+ */
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class ConnectionRolePickupView extends ConnectionRolePickupViewBase { }
+</script>

app_CRM/src/pages/ungroup/central/page-register.ts

@@ -20,6 +20,7 @@ export const PageComponents = {
         Vue.component('opportunity-grid-view', () => import('@pages/sales/opportunity-grid-view/opportunity-grid-view.vue'));
         Vue.component('opportunity-product-edit-view', () => import('@pages/sales/opportunity-product-edit-view/opportunity-product-edit-view.vue'));
         Vue.component('email-edit-view', () => import('@pages/base/email-edit-view/email-edit-view.vue'));
+        Vue.component('connection-role-pickup-view', () => import('@pages/runtime/connection-role-pickup-view/connection-role-pickup-view.vue'));
         Vue.component('invoice-grid-view', () => import('@pages/finance/invoice-grid-view/invoice-grid-view.vue'));
         Vue.component('sales-literature-quick-create-view', () => import('@pages/sales/sales-literature-quick-create-view/sales-literature-quick-create-view.vue'));
         Vue.component('quote-info', () => import('@pages/sales/quote-info/quote-info.vue'));
@@ -190,6 +191,7 @@ export const PageComponents = {
         Vue.component('competitor-pickup-view', () => import('@pages/sales/competitor-pickup-view/competitor-pickup-view.vue'));
         Vue.component('product-sales-literature-sal-lit-pro-edit-view', () => import('@pages/sales/product-sales-literature-sal-lit-pro-edit-view/product-sales-literature-sal-lit-pro-edit-view.vue'));
         Vue.component('account-stop-grid-view', () => import('@pages/base/account-stop-grid-view/account-stop-grid-view.vue'));
+        Vue.component('connection-role-pickup-grid-view', () => import('@pages/runtime/connection-role-pickup-grid-view/connection-role-pickup-grid-view.vue'));
         Vue.component('account-inner-pickup-view', () => import('@pages/base/account-inner-pickup-view/account-inner-pickup-view.vue'));
         Vue.component('contact-edit-market', () => import('@pages/base/contact-edit-market/contact-edit-market.vue'));
         Vue.component('competitor-sales-literature-sal-lit-comp-grid-view', () => import('@pages/sales/competitor-sales-literature-sal-lit-comp-grid-view/competitor-sales-literature-sal-lit-comp-grid-view.vue'));

app_CRM/src/pages/ungroup/central/router.ts

@@ -670,6 +670,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/email-edit-view/email-edit-view.vue'),
                 },
+                {
+                    path: 'connectionroles/:connectionrole?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.connectionrole.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'connectionroles', parameterName: 'connectionrole' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/runtime/connection-role-pickup-view/connection-role-pickup-view.vue'),
+                },
                 {
                     path: 'invoices/:invoice?/gridview/:gridview?',
                     meta: {
@@ -6072,6 +6086,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/account-edit-account-info/account-edit-account-info.vue'),
                 },
+                {
+                    path: 'connectionroles/:connectionrole?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.connectionrole.views.pickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'connectionroles', parameterName: 'connectionrole' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/runtime/connection-role-pickup-grid-view/connection-role-pickup-grid-view.vue'),
+                },
             {
                 path: 'activitypointerredirectview/:activitypointerredirectview?',
                 meta: {

app_CRM/src/store/modules/view-action/state.ts

@@ -238,6 +238,15 @@ export const viewstate: any = {
                 '4745ca10fe4421ea043cb9ace1840224',
             ],
         },
+        {
+            viewtag: '15db0c1d3cde0af58d2c9a4e874d9d01',
+            viewmodule: 'Runtime',
+            viewname: 'ConnectionRolePickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '172607e680c007004183ab01c1a674d6',
             viewmodule: 'Sales',
@@ -1598,6 +1607,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'cb6b4a9ddcaced093574bfde38b54723',
             ],
         },
         {
@@ -1957,6 +1967,16 @@ export const viewstate: any = {
                 'a17a40c513ec2011425e9d26b6591214',
             ],
         },
+        {
+            viewtag: 'cb6b4a9ddcaced093574bfde38b54723',
+            viewmodule: 'Runtime',
+            viewname: 'ConnectionRolePickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '15db0c1d3cde0af58d2c9a4e874d9d01',
+            ],
+        },
         {
             viewtag: 'cb7c18e9af4848f515ab84524fb234b2',
             viewmodule: 'Sales',

app_CRM/src/uiservice/connection-role/connection-role-ui-service-base.ts

@@ -79,8 +79,10 @@ export default class ConnectionRoleUIServiceBase extends UIService {
      * @memberof  ConnectionRoleUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'connectionroles'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'connectionroles'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'connectionroles'});
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'connectionroles'});
     }
 
     /**

app_CRM/src/widgets/connection-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, MainControlBase } from '@/studio-core';
+import ConnectionRoleService from '@/service/connection-role/connection-role-service';
+import PickupViewpickupviewpanelService from './pickup-viewpickupviewpanel-pickupviewpanel-service';
+import PickupViewpickupviewpanelModel from './pickup-viewpickupviewpanel-pickupviewpanel-model';
+
+
+/**
+ * pickupviewpanel部件基类
+ *
+ * @export
+ * @class MainControlBase
+ * @extends {PickupViewpickupviewpanelPickupviewpanelBase}
+ */
+export class PickupViewpickupviewpanelPickupviewpanelBase extends MainControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    protected controlType: string = 'PICKUPVIEWPANEL';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {PickupViewpickupviewpanelService}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    public service: PickupViewpickupviewpanelService = new PickupViewpickupviewpanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ConnectionRoleService}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    public appEntityService: ConnectionRoleService = new ConnectionRoleService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    protected appDeName: string = 'connectionrole';
+
+
+    /**
+     * 选中数据字符串
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop() public selectedData?: string;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public getData(): any {
+        return {};
+    }
+
+    /**
+     * 视图名称
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public view: any = {
+        viewname: 'connection-role-pickup-grid-view',
+        data: {},
+    }
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 视图数据
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewdata: string  = JSON.stringify(this.context);
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string  = JSON.stringify(this.viewparams);
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop() public isSingleSelect?: boolean;
+
+    /**
+     * 初始化完成
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public inited: boolean = false;
+
+    /**
+     * 视图数据变化
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public onViewDatasChange($event: any): void {
+        if($event.length>0){
+          $event.forEach((item:any,index:any) => {
+              let srfmajortext = item['connectionrolename'];
+              if(srfmajortext){
+                Object.assign($event[index],{srfmajortext: srfmajortext});
+              }
+          });
+        }
+        this.$emit('selectionchange', $event);
+    }
+
+    /**
+     * 视图数据被激活
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewDatasActivated($event: any): void {
+        this.$emit('activated', $event);
+    }
+
+    /**
+     * 视图加载完成
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public onViewLoad($event: any): void {
+        this.$emit('load', $event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof PickupViewpickupviewpanel
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                if (Object.is('load', action)) {
+                    this.viewdata = JSON.stringify(this.context);
+                    this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
+                    this.inited = true;
+                }
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     *  @memberof PickupViewpickupviewpanel
+     */  
+    public initNavParam(){
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata = JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+}
\ No newline at end of file

app_CRM/src/widgets/connection-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

+/**
+ * PickupViewpickupviewpanel 部件模型
+ *
+ * @export
+ * @class PickupViewpickupviewpanelModel
+ */
+export default class PickupViewpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof PickupViewpickupviewpanelModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'overwritetime',
+      },
+      {
+        name: 'updatedate',
+      },
+      {
+        name: 'managed',
+      },
+      {
+        name: 'supportingsolutionid',
+      },
+      {
+        name: 'componentstate',
+      },
+      {
+        name: 'category',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'importsequencenumber',
+      },
+      {
+        name: 'connectionrolename',
+      },
+      {
+        name: 'statuscode',
+      },
+      {
+        name: 'connectionrole',
+        prop: 'connectionroleid',
+      },
+      {
+        name: 'connectionroleidunique',
+      },
+      {
+        name: 'versionnumber',
+      },
+      {
+        name: 'updateman',
+      },
+      {
+        name: 'solutionid',
+      },
+      {
+        name: 'description',
+      },
+      {
+        name: 'customizable',
+      },
+      {
+        name: 'introducedversion',
+      },
+      {
+        name: 'createman',
+      },
+      {
+        name: 'statecode',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_CRM/src/widgets/connection-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * PickupViewpickupviewpanel 部件服务对象
+ *
+ * @export
+ * @class PickupViewpickupviewpanelService
+ */
+export default class PickupViewpickupviewpanelService extends ControlService {
+}
\ No newline at end of file

app_CRM/src/widgets/connection-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.html

+<div class='pickupviewpanel'>
+    <component 
+        v-if="inited && view.viewname && !Object.is(view.viewname, '')" 
+        :is="view.viewname"
+        class="viewcontainer3"
+        :viewdata="viewdata"
+        :viewparam="viewparam"
+        :viewDefaultUsage="false"
+        :isSingleSelect="isSingleSelect"
+        :selectedData="selectedData"
+        :isShowButton="isShowButton"
+        @viewdataschange="onViewDatasChange.apply(_self, arguments)"
+        @viewdatasactivated="viewDatasActivated.apply(_self, arguments)"
+        @viewload="onViewLoad.apply(_self, arguments)">
+    </component>
+</div>
\ No newline at end of file

app_CRM/src/widgets/connection-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.less

+.pickupviewpanel{
+  width: 100%;
+}
\ No newline at end of file

app_CRM/src/widgets/connection-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue

+<template src="./pickup-viewpickupviewpanel-pickupviewpanel.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { PickupViewpickupviewpanelPickupviewpanelBase } from './pickup-viewpickupviewpanel-pickupviewpanel-base';
+ 
+
+/**
+ * pickupviewpanel部件
+ *
+ * @export
+ * @class PickupViewpickupviewpanelPickupviewpanel
+ * @extends {PickupViewpickupviewpanelPickupviewpanelBase}
+ */
+@Component({
+    components: {
+         
+    }
+})
+@VueLifeCycleProcessing()
+export default class PickupViewpickupviewpanelPickupviewpanel extends PickupViewpickupviewpanelPickupviewpanelBase { }
+</script>

app_CRM/src/widgets/connection/main-form/main-form-base.tsx

@@ -66,6 +66,8 @@ export class MainEditFormBase extends EditFormControlBase {
         srfsourcekey: null,
         connectionname: null,
         record1id: null,
+        record1rolename: null,
+        record2rolename: null,
         record2id: null,
         record2idobjecttypecode: null,
         record2objecttypecode: null,
@@ -82,6 +84,8 @@ export class MainEditFormBase extends EditFormControlBase {
         updateman: null,
         updatedate: null,
         connectionid: null,
+        record1roleid: null,
+        record2roleid: null,
         connection:null,
     };
 
@@ -96,10 +100,6 @@ export class MainEditFormBase extends EditFormControlBase {
             { required: true, type: 'string', message: '关联名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '关联名称 值不能为空', trigger: 'blur' },
         ],
-        statecode: [
-            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'change' },
-            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'blur' },
-        ],
         ownerid: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
@@ -149,6 +149,10 @@ export class MainEditFormBase extends EditFormControlBase {
 
         record1id: new FormItemModel({ caption: '连接自', detailType: 'FORMITEM', name: 'record1id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
+        record1rolename: new FormItemModel({ caption: '角色（源）', detailType: 'FORMITEM', name: 'record1rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        record2rolename: new FormItemModel({ caption: '角色（目标）', detailType: 'FORMITEM', name: 'record2rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
         record2id: new FormItemModel({ caption: '已连接到', detailType: 'FORMITEM', name: 'record2id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
         record2idobjecttypecode: new FormItemModel({ caption: 'Record2IdObjectTypeCode', detailType: 'FORMITEM', name: 'record2idobjecttypecode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
@@ -181,6 +185,10 @@ export class MainEditFormBase extends EditFormControlBase {
 
         connectionid: new FormItemModel({ caption: '连接', detailType: 'FORMITEM', name: 'connectionid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
+        record1roleid: new FormItemModel({ caption: '角色(源)', detailType: 'FORMITEM', name: 'record1roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        record2roleid: new FormItemModel({ caption: '角色(目标)', detailType: 'FORMITEM', name: 'record2roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
         form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
     };
 

app_CRM/src/widgets/connection/main-form/main-form-model.ts

@@ -65,6 +65,16 @@ export default class MainModel {
         prop: 'record1id',
         dataType: 'TEXT',
       },
+      {
+        name: 'record1rolename',
+        prop: 'record1rolename',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'record2rolename',
+        prop: 'record2rolename',
+        dataType: 'PICKUPTEXT',
+      },
       {
         name: 'record2id',
         prop: 'record2id',
@@ -145,6 +155,16 @@ export default class MainModel {
         prop: 'connectionid',
         dataType: 'GUID',
       },
+      {
+        name: 'record1roleid',
+        prop: 'record1roleid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'record2roleid',
+        prop: 'record2roleid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'connection',
         prop: 'connectionid',

app_CRM/src/widgets/connection/main-form/main-form-service.ts

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import ConnectionService from '@/service/connection/connection-service';
 import MainModel from './main-form-model';
+import ConnectionRoleService from '@/service/connection-role/connection-role-service';
 
 
 /**
@@ -41,6 +42,14 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
+    /**
+     * 连接角色服务对象
+     *
+     * @type {ConnectionRoleService}
+     * @memberof MainService
+     */
+    public connectionroleService: ConnectionRoleService = new ConnectionRoleService();
+
     /**
      * 处理数据
      *
@@ -80,6 +89,9 @@ export default class MainService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'ConnectionRoleService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.connectionroleService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'connectionroleid', 'connectionrole');
+        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/connection/main-form/main-form.html

@@ -26,6 +26,60 @@
     <input-box v-model="data.record1id"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.record1id.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.record1rolename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='record1rolename' :itemRules="this.rules.record1rolename" class='' :caption="$t('entities.connection.main_form.details.record1rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.record1rolename.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.record1rolename.disabled"
+  name='record1rolename'
+  deMajorField='connectionrolename'
+  deKeyField='connectionrole'
+  :service="service"
+  :acParams="{ serviceName: 'ConnectionRoleService', interfaceName: 'FetchDefault'}"
+  valueitem='record1roleid' 
+  :value="data.record1rolename" 
+  editortype="" 
+  :pickupView="{ viewname: 'connection-role-pickup-view', title: $t('entities.connectionrole.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'connectionroles', parameterName: 'connectionrole' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.record2rolename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='record2rolename' :itemRules="this.rules.record2rolename" class='' :caption="$t('entities.connection.main_form.details.record2rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.record2rolename.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.record2rolename.disabled"
+  name='record2rolename'
+  deMajorField='connectionrolename'
+  deKeyField='connectionrole'
+  :service="service"
+  :acParams="{ serviceName: 'ConnectionRoleService', interfaceName: 'FetchDefault'}"
+  valueitem='record2roleid' 
+  :value="data.record2rolename" 
+  editortype="" 
+  :pickupView="{ viewname: 'connection-role-pickup-view', title: $t('entities.connectionrole.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'connectionroles', parameterName: 'connectionrole' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.record2id.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='record2id' :itemRules="this.rules.record2id" class='' :caption="$t('entities.connection.main_form.details.record2id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.record2id.error" :isEmptyCaption="false" labelPos="LEFT">

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

@@ -2602,7 +2602,7 @@
 
 
     <!--输出实体[CONNECTION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-connection-24-34">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-connection-27-34">
         <createTable tableName="CONNECTION">
                 <column name="RECORD2OBJECTTYPECODE" remarks="" type="VARCHAR(30)">
                 </column>
@@ -2678,7 +2678,7 @@
 
 
     <!--输出实体[CONNECTIONROLE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-connectionrole-10-35">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-connectionrole-14-35">
         <createTable tableName="CONNECTIONROLE">
                 <column name="OVERWRITETIME" remarks="" type="DATETIME">
                 </column>
@@ -11166,10 +11166,10 @@
        <addForeignKeyConstraint baseColumnNames="ENTITYID" baseTableName="RELATIONSHIPS" constraintName="DER1N_COMPETITORSALESLITERATUR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="COMPETITORID" referencedTableName="COMPETITOR" validate="true"/>
     </changeSet>
         <!--输出实体[CONNECTION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-connection-24-190">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-connection-27-190">
        <addForeignKeyConstraint baseColumnNames="RECORD1ROLEID" baseTableName="CONNECTION" constraintName="DER1N_CONNECTION__CONNECTIONRO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONNECTIONROLEID" referencedTableName="CONNECTIONROLE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-connection-24-192">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-connection-27-192">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="CONNECTION" constraintName="DER1N_CONNECTION__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[CONNECTIONROLE]外键关系 -->