Skip to content

I
iBiz企业中心
提交 37a19871 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

chitanda 发布系统代码，修复面包屑导航，在浏览器级后退前进行为下异常

上级 c40f2a73
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 501 行增加 和 437 行删除
app_CRM/public/assets/json/data-dictionary.json
浏览文件 @ 37a19871
...@@ -2914,6 +2914,43 @@ ...@@ -2914,6 +2914,43 @@
} }
] ]
}, },
{
"srfkey": "PickDataType",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "ACCOUNT",
"label": "客户",
"text": "客户",
"data":"",
"codename":"Account",
"value": "ACCOUNT",
"disabled": false
}
, {
"id": "CONTACT",
"label": "联系人",
"text": "联系人",
"data":"",
"codename":"Contact",
"value": "CONTACT",
"disabled": false
}
, {
"id": "LEAD",
"label": "潜在客户",
"text": "潜在客户",
"data":"",
"codename":"Lead",
"value": "LEAD",
"disabled": false
}
]
},
{ {
"srfkey": "Account__AccountCategoryCode", "srfkey": "Account__AccountCategoryCode",
"emptytext": "未定义", "emptytext": "未定义",
......
app_CRM/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ 37a19871
...@@ -364,6 +364,12 @@ export default { ...@@ -364,6 +364,12 @@ export default {
"2": "送货地址", "2": "送货地址",
"empty": "" "empty": ""
}, },
PickDataType: {
"ACCOUNT": "客户",
"CONTACT": "联系人",
"LEAD": "潜在客户",
"empty": ""
},
Account__AccountCategoryCode: { Account__AccountCategoryCode: {
"2": "标准", "2": "标准",
"1": "首选客户", "1": "首选客户",
......
app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ 37a19871
...@@ -364,6 +364,12 @@ export default { ...@@ -364,6 +364,12 @@ export default {
"2": "送货地址", "2": "送货地址",
"empty": "", "empty": "",
}, },
PickDataType: {
"ACCOUNT": "客户",
"CONTACT": "联系人",
"LEAD": "潜在客户",
"empty": "",
},
Account__AccountCategoryCode: { Account__AccountCategoryCode: {
"2": "标准", "2": "标准",
"1": "首选客户", "1": "首选客户",
......
app_CRM/src/locale/lanres/entities/multi-pick-data/multi-pick-data_en_US.ts
浏览文件 @ 37a19871
...@@ -28,8 +28,6 @@ export default { ...@@ -28,8 +28,6 @@ export default {
pickdatatype: "数据类型", pickdatatype: "数据类型",
userdata: "用户数据", userdata: "用户数据",
userdata2: "用户数据2", userdata2: "用户数据2",
userdata3: "用户数据3",
userdata4: "用户数据4",
pickdatainfo: "信息描述", pickdatainfo: "信息描述",
}, },
uiactions: { uiactions: {
......
app_CRM/src/locale/lanres/entities/multi-pick-data/multi-pick-data_zh_CN.ts
浏览文件 @ 37a19871
...@@ -27,8 +27,6 @@ export default { ...@@ -27,8 +27,6 @@ export default {
pickdatatype: "数据类型", pickdatatype: "数据类型",
userdata: "用户数据", userdata: "用户数据",
userdata2: "用户数据2", userdata2: "用户数据2",
userdata3: "用户数据3",
userdata4: "用户数据4",
pickdatainfo: "信息描述", pickdatainfo: "信息描述",
}, },
uiactions: { uiactions: {
......
app_CRM/src/mock/codelist/codelist.ts
浏览文件 @ 37a19871
...@@ -2922,6 +2922,43 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -2922,6 +2922,43 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
}, },
] ]
}, },
{
srfkey: "PickDataType",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "ACCOUNT",
label: "客户",
text: "客户",
"data":"",
"codename":"Account",
value: "ACCOUNT",
disabled: false,
},
{
id: "CONTACT",
label: "联系人",
text: "联系人",
"data":"",
"codename":"Contact",
value: "CONTACT",
disabled: false,
},
{
id: "LEAD",
label: "潜在客户",
text: "潜在客户",
"data":"",
"codename":"Lead",
value: "LEAD",
disabled: false,
},
]
},
{ {
srfkey: "Account__AccountCategoryCode", srfkey: "Account__AccountCategoryCode",
emptytext: "未定义", emptytext: "未定义",
......
app_CRM/src/studio-core/components/app-breadcrumb/app-breadcrumb.tsx
浏览文件 @ 37a19871
...@@ -135,7 +135,7 @@ export class AppBreadcrumb extends Vue { ...@@ -135,7 +135,7 @@ export class AppBreadcrumb extends Vue {
} }
items.push(<span class={{ 'app-breadcrumb-item': true, 'last': i === (arr.length - 1) }}> items.push(<span class={{ 'app-breadcrumb-item': true, 'last': i === (arr.length - 1) }}>
{(!indexMeta && i === 0) ? null : <span class="separator">/</span>} {(!indexMeta && i === 0) ? null : <span class="separator">/</span>}
<span class="content" on-click={() => this.click(item.to)}>{this.$t(item.meta?.caption)}{dropdown ? null : (item.meta?.info && item.meta?.info !== '') ? ` - ${item.meta?.info}` : ''}</span> <span class="content" on-click={() => this.click(item.to)}>{this.$t(item.meta?.caption)}{dropdown ? null : (item.meta?.info && item.meta?.info !== '') ? ' - ' + item.meta?.info : ''}</span>
{dropdown ? <span class="select"> - {dropdown}</span> : null} {dropdown ? <span class="select"> - {dropdown}</span> : null}
</span>); </span>);
}); });
......
app_CRM/src/studio-core/service/app-nav-history/AppNavHistoryBase.ts
浏览文件 @ 37a19871
...@@ -102,18 +102,40 @@ export class AppNavHistoryBase { ...@@ -102,18 +102,40 @@ export class AppNavHistoryBase {
*/ */
constructor() { constructor() {
if (this.uiStateService.layoutState.styleMode === 'STYLE2') { if (this.uiStateService.layoutState.styleMode === 'STYLE2') {
addEventListener('hashchange', ({ oldURL }) => { addEventListener('hashchange', ({ oldURL, newURL }) => {
const hash = oldURL.substring(oldURL.indexOf('#') + 1); if (this.historyList.length > 0) {
const queryIndex = hash.indexOf('?'); const param = this.calcRouteParam(oldURL);
const path = queryIndex === -1 ? hash : hash.substring(0, queryIndex); const param2 = this.calcRouteParam(newURL);
const queryStr = queryIndex === -1 ? '' : hash.substring(queryIndex + 1); const lastHistory = this.historyList[this.historyList.length - 1];
if (this.isRouteSame({ path, query: !isEmpty(queryStr) ? qs.parse(queryStr) : {} }, this.historyList[this.historyList.length - 1].to)) { if (this.isRouteSame(param, lastHistory.to)) {
this.pop(); this.pop();
} else if (this.isRouteSame(param2, lastHistory.to) && this.historyList.length > 1) {
const item = this.historyList[this.historyList.length - 2];
if (this.isRouteSame(param, item.to)) {
this.historyList.splice(this.historyList.length - 2, 1);
}
}
} }
}); });
} }
} }
/**
* 根据url计算路由参数
*
* @protected
* @param {string} url
* @returns {*}
* @memberof AppNavHistoryBase
*/
protected calcRouteParam(url: string): any {
const hash = url.substring(url.indexOf('#') + 1);
const queryIndex = hash.indexOf('?');
const path = queryIndex === -1 ? hash : hash.substring(0, queryIndex);
const queryStr = queryIndex === -1 ? '' : hash.substring(queryIndex + 1);
return { path, query: !isEmpty(queryStr) ? qs.parse(queryStr) : {} };
}
/** /**
* 根据视图标识查找记录 * 根据视图标识查找记录
* *
......
app_CRM/src/widgets/multi-pick-data/main-grid/main-grid-base.tsx
浏览文件 @ 37a19871
...@@ -93,20 +93,6 @@ export class MainGridBase extends GridControllerBase { ...@@ -93,20 +93,6 @@ export class MainGridBase extends GridControllerBase {
show: true, show: true,
util: 'PX' util: 'PX'
}, },
{
name: 'userdata3',
label: '用户数据3',
langtag: 'entities.multipickdata.main_grid.columns.userdata3',
show: true,
util: 'PX'
},
{
name: 'userdata4',
label: '用户数据4',
langtag: 'entities.multipickdata.main_grid.columns.userdata4',
show: true,
util: 'PX'
},
{ {
name: 'pickdatainfo', name: 'pickdatainfo',
label: '信息描述', label: '信息描述',
...@@ -152,8 +138,6 @@ export class MainGridBase extends GridControllerBase { ...@@ -152,8 +138,6 @@ export class MainGridBase extends GridControllerBase {
'pickdatatype':false, 'pickdatatype':false,
'userdata':false, 'userdata':false,
'userdata2':false, 'userdata2':false,
'userdata3':false,
'userdata4':false,
'pickdatainfo':false, 'pickdatainfo':false,
}; };
...@@ -180,6 +164,14 @@ export class MainGridBase extends GridControllerBase { ...@@ -180,6 +164,14 @@ export class MainGridBase extends GridControllerBase {
*/ */
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> { public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [ return super.formatExcelData(filterVal, jsonData, [
{
name: 'pickdatatype',
srfkey: 'PickDataType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]); ]);
} }
......
app_CRM/src/widgets/multi-pick-data/main-grid/main-grid-model.ts
浏览文件 @ 37a19871
...@@ -41,16 +41,6 @@ export default class MainModel { ...@@ -41,16 +41,6 @@ export default class MainModel {
prop: 'userdata2', prop: 'userdata2',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'userdata3',
prop: 'userdata3',
dataType: 'TEXT',
},
{
name: 'userdata4',
prop: 'userdata4',
dataType: 'TEXT',
},
{ {
name: 'pickdataname', name: 'pickdataname',
prop: 'pickdataname', prop: 'pickdataname',
...@@ -74,7 +64,7 @@ export default class MainModel { ...@@ -74,7 +64,7 @@ export default class MainModel {
{ {
name: 'pickdatatype', name: 'pickdatatype',
prop: 'pickdatatype', prop: 'pickdatatype',
dataType: 'TEXT', dataType: 'SSCODELIST',
}, },
{ {
name: 'multipickdata', name: 'multipickdata',
......
app_CRM/src/widgets/multi-pick-data/main-grid/main-grid.html
浏览文件 @ 37a19871
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column> <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template> </template>
<template v-if="getColumnState('pickdataname')"> <template v-if="getColumnState('pickdataname')">
<el-table-column show-overflow-tooltip :prop="'pickdataname'" :label="$t('entities.multipickdata.main_grid.columns.pickdataname')" :width="100" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'pickdataname'" :label="$t('entities.multipickdata.main_grid.columns.pickdataname')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.multipickdata.main_grid.columns.pickdataname')}} {{$t('entities.multipickdata.main_grid.columns.pickdataname')}}
...@@ -43,12 +43,14 @@ ...@@ -43,12 +43,14 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.pickdatatype}}</span> <template >
<codelist :value="row.pickdatatype" tag='PickDataType' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('userdata')"> <template v-if="getColumnState('userdata')">
<el-table-column show-overflow-tooltip :prop="'userdata'" :label="$t('entities.multipickdata.main_grid.columns.userdata')" :width="100" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'userdata'" :label="$t('entities.multipickdata.main_grid.columns.userdata')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.multipickdata.main_grid.columns.userdata')}} {{$t('entities.multipickdata.main_grid.columns.userdata')}}
...@@ -60,7 +62,7 @@ ...@@ -60,7 +62,7 @@
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('userdata2')"> <template v-if="getColumnState('userdata2')">
<el-table-column show-overflow-tooltip :prop="'userdata2'" :label="$t('entities.multipickdata.main_grid.columns.userdata2')" :width="100" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'userdata2'" :label="$t('entities.multipickdata.main_grid.columns.userdata2')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.multipickdata.main_grid.columns.userdata2')}} {{$t('entities.multipickdata.main_grid.columns.userdata2')}}
...@@ -71,30 +73,6 @@ ...@@ -71,30 +73,6 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('userdata3')">
<el-table-column show-overflow-tooltip :prop="'userdata3'" :label="$t('entities.multipickdata.main_grid.columns.userdata3')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.multipickdata.main_grid.columns.userdata3')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.userdata3}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('userdata4')">
<el-table-column show-overflow-tooltip :prop="'userdata4'" :label="$t('entities.multipickdata.main_grid.columns.userdata4')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.multipickdata.main_grid.columns.userdata4')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.userdata4}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('pickdatainfo')"> <template v-if="getColumnState('pickdatainfo')">
<el-table-column show-overflow-tooltip :prop="'pickdatainfo'" :label="$t('entities.multipickdata.main_grid.columns.pickdatainfo')" :min-width="100" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'pickdatainfo'" :label="$t('entities.multipickdata.main_grid.columns.pickdatainfo')" :min-width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
......
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 37a19871
...@@ -6462,7 +6462,7 @@ ...@@ -6462,7 +6462,7 @@
<!--输出实体[MULTIPICKDATA]数据结构 --> <!--输出实体[MULTIPICKDATA]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-multipickdata-36-77"> <changeSet author="a_LAB01_e85d8801c" id="tab-multipickdata-39-77">
<createTable tableName="MULTIPICKDATA"> <createTable tableName="MULTIPICKDATA">
<column name="PICKDATAID" remarks="" type="VARCHAR(60)"> <column name="PICKDATAID" remarks="" type="VARCHAR(60)">
<constraints primaryKey="true" primaryKeyName="PK_MULTIPICKDATA_PICKDATAID"/> <constraints primaryKey="true" primaryKeyName="PK_MULTIPICKDATA_PICKDATAID"/>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或