xignzi006 发布系统代码

b7427ea0 · ibizdev · 8575b63d · b7427ea0 · b7427ea0 · b7427ea0
--- a/app_CRM/src/interface/entity/connection.ts
+++ b/app_CRM/src/interface/entity/connection.ts
@@ -263,7 +263,7 @@ export interface Connection {
    record2roleid?: any;

    /**
-     * 角色（源）
+     * 角色
     *
     * @returns {*}
     * @memberof Connection

--- a/app_CRM/src/locale/lanres/entities/connection/connection_en_US.ts
+++ b/app_CRM/src/locale/lanres/entities/connection/connection_en_US.ts
@@ -33,7 +33,7 @@ export default {
    record1roleid: "角色(源)",
    transactioncurrencyid: "货币",
    record2roleid: "角色(目标)",
-    record1rolename: "角色（源）",
+    record1rolename: "角色",
    record2rolename: "角色（目标）",
  },
 	views: {
@@ -62,7 +62,7 @@ export default {
 			srfsourcekey: "", 
 			connectionname: "关联名称", 
 			record1id: "连接自", 
-			record1rolename: "角色（源）", 
+			record1rolename: "角色", 
 			record2rolename: "角色（目标）", 
 			record2id: "已连接到", 
 			record2idobjecttypecode: "已连接到", 
@@ -88,11 +88,10 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			connectionname: "关联名称",
+			record1rolename: "角色",
+			record2idobjecttypecode: "已连接到",
 			statecode: "状态",
 			statuscode: "状态描述",
-			record1rolename: "角色（源）",
-			record2rolename: "角色（目标）",
 		},
 		uiactions: {
 		},

--- a/app_CRM/src/locale/lanres/entities/connection/connection_zh_CN.ts
+++ b/app_CRM/src/locale/lanres/entities/connection/connection_zh_CN.ts
@@ -32,7 +32,7 @@ export default {
    record1roleid: "角色(源)",
    transactioncurrencyid: "货币",
    record2roleid: "角色(目标)",
-    record1rolename: "角色（源）",
+    record1rolename: "角色",
    record2rolename: "角色（目标）",
  },
 	views: {
@@ -61,7 +61,7 @@ export default {
 			srfsourcekey: "", 
 			connectionname: "关联名称", 
 			record1id: "连接自", 
-			record1rolename: "角色（源）", 
+			record1rolename: "角色", 
 			record2rolename: "角色（目标）", 
 			record2id: "已连接到", 
 			record2idobjecttypecode: "已连接到", 
@@ -87,11 +87,10 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			connectionname: "关联名称",
+			record1rolename: "角色",
+			record2idobjecttypecode: "已连接到",
 			statecode: "状态",
 			statuscode: "状态描述",
-			record1rolename: "角色（源）",
-			record2rolename: "角色（目标）",
 		},
 		uiactions: {
 		},

--- a/app_CRM/src/widgets/connection/main-form/main-form-base.tsx
+++ b/app_CRM/src/widgets/connection/main-form/main-form-base.tsx
@@ -159,7 +159,7 @@ export class MainEditFormBase extends EditFormControlBase {

        record1id: new FormItemModel({ caption: '连接自', detailType: 'FORMITEM', name: 'record1id', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),

-        record1rolename: new FormItemModel({ caption: '角色（源）', detailType: 'FORMITEM', name: 'record1rolename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        record1rolename: new FormItemModel({ caption: '角色', detailType: 'FORMITEM', name: 'record1rolename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),

        record2rolename: new FormItemModel({ caption: '角色（目标）', detailType: 'FORMITEM', name: 'record2rolename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),


--- a/app_CRM/src/widgets/connection/main-grid/main-grid-base.tsx
+++ b/app_CRM/src/widgets/connection/main-grid/main-grid-base.tsx
@@ -84,9 +84,17 @@ export class MainGridBase extends GridControllerBase {
     */
    public allColumns: any[] = [
        {
-            name: 'connectionname',
-            label: '关联名称',
-            langtag: 'entities.connection.main_grid.columns.connectionname',
+            name: 'record1rolename',
+            label: '角色',
+            langtag: 'entities.connection.main_grid.columns.record1rolename',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'record2idobjecttypecode',
+            label: '已连接到',
+            langtag: 'entities.connection.main_grid.columns.record2idobjecttypecode',
            show: true,
            util: 'PX',
            isEnableRowEdit: false,
@@ -107,22 +115,6 @@ export class MainGridBase extends GridControllerBase {
            util: 'PX',
            isEnableRowEdit: false,
        },
-        {
-            name: 'record1rolename',
-            label: '角色（源）',
-            langtag: 'entities.connection.main_grid.columns.record1rolename',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
-        {
-            name: 'record2rolename',
-            label: '角色（目标）',
-            langtag: 'entities.connection.main_grid.columns.record2rolename',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
    ]

    /**
@@ -157,11 +149,10 @@ export class MainGridBase extends GridControllerBase {
     * @memberof MainBase
     */
    public hasRowEdit: any = {
-        'connectionname':false,
+        'record1rolename':false,
+        'record2idobjecttypecode':false,
        'statecode':false,
        'statuscode':false,
-        'record1rolename':false,
-        'record2rolename':false,
    };

    /**

--- a/app_CRM/src/widgets/connection/main-grid/main-grid-model.ts
+++ b/app_CRM/src/widgets/connection/main-grid/main-grid-model.ts
@@ -26,11 +26,6 @@ export default class MainModel {
      ]
    }else{
 		  return [
-        {
-          name: 'record2rolename',
-          prop: 'record2rolename',
-          dataType: 'PICKUPTEXT',
-        },
        {
          name: 'statecode',
          prop: 'statecode',
@@ -52,8 +47,8 @@ export default class MainModel {
          dataType: 'PICKUP',
        },
        {
-          name: 'connectionname',
-          prop: 'connectionname',
+          name: 'record2idobjecttypecode',
+          prop: 'record2idobjecttypecode',
          dataType: 'TEXT',
        },
        {

--- a/app_CRM/src/widgets/connection/main-grid/main-grid.html
+++ b/app_CRM/src/widgets/connection/main-grid/main-grid.html
@@ -23,15 +23,27 @@
            <template v-if="!isSingleSelect">
                <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
            </template>
-            <template v-if="getColumnState('connectionname')">
-                <el-table-column show-overflow-tooltip :prop="'connectionname'" :label="$t('entities.connection.main_grid.columns.connectionname')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('record1rolename')">
+                <el-table-column show-overflow-tooltip :prop="'record1rolename'" :label="$t('entities.connection.main_grid.columns.record1rolename')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.connection.main_grid.columns.record1rolename')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.record1rolename}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('record2idobjecttypecode')">
+                <el-table-column show-overflow-tooltip :prop="'record2idobjecttypecode'" :label="$t('entities.connection.main_grid.columns.record2idobjecttypecode')" :width="100"  :align="'left'" :sortable="'custom'">
                    <template v-slot:header="{column}">
                      <span class="column-header ">
-                        {{$t('entities.connection.main_grid.columns.connectionname')}}
+                        {{$t('entities.connection.main_grid.columns.record2idobjecttypecode')}}
                      </span>
                    </template>
                    <template v-slot="{row,column,$index}">
-                        <span>{{row.connectionname}}</span>
+                        <span>{{row.record2idobjecttypecode}}</span>
                    </template>
                </el-table-column>
            </template>
@@ -63,30 +75,6 @@
                    </template>
                </el-table-column>
            </template>
-            <template v-if="getColumnState('record1rolename')">
-                <el-table-column show-overflow-tooltip :prop="'record1rolename'" :label="$t('entities.connection.main_grid.columns.record1rolename')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.connection.main_grid.columns.record1rolename')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.record1rolename}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('record2rolename')">
-                <el-table-column show-overflow-tooltip :prop="'record2rolename'" :label="$t('entities.connection.main_grid.columns.record2rolename')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.connection.main_grid.columns.record2rolename')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.record2rolename}}</span>
-                    </template>
-                </el-table-column>
-            </template>
            <template v-if="adaptiveState">
                <el-table-column></el-table-column>
            </template>

--- a/businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/domain/Connection.java
+++ b/businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/domain/Connection.java
@@ -280,7 +280,7 @@ public class Connection extends EntityMP implements Serializable {
    @JsonProperty("record2roleid")
    private String record2roleid;
    /**
-     * 角色（源）
+     * 角色
     */
    @TableField(value = "record1rolename")
    @JSONField(name = "record1rolename")
@@ -567,7 +567,7 @@ public class Connection extends EntityMP implements Serializable {
    }

    /**
-     * 设置 [角色（源）]
+     * 设置 [角色]
     */
    public void setRecord1rolename(String record1rolename){
        this.record1rolename = record1rolename ;

--- a/businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/filter/ConnectionSearchContext.java
+++ b/businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/filter/ConnectionSearchContext.java
@@ -83,14 +83,14 @@ public class ConnectionSearchContext extends QueryWrapperContext<Connection> {
            this.getSearchCond().eq("record2roleid", n_record2roleid_eq);
        }
    }
-	private String n_record1rolename_eq;//[角色（源）]
+	private String n_record1rolename_eq;//[角色]
 	public void setN_record1rolename_eq(String n_record1rolename_eq) {
        this.n_record1rolename_eq = n_record1rolename_eq;
        if(!ObjectUtils.isEmpty(this.n_record1rolename_eq)){
            this.getSearchCond().eq("record1rolename", n_record1rolename_eq);
        }
    }
-	private String n_record1rolename_like;//[角色（源）]
+	private String n_record1rolename_like;//[角色]
 	public void setN_record1rolename_like(String n_record1rolename_like) {
        this.n_record1rolename_like = n_record1rolename_like;
        if(!ObjectUtils.isEmpty(this.n_record1rolename_like)){