@bit-sun/business-component 2.0.35 → 2.0.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.esm.js +21 -12
- package/dist/index.js +21 -12
- package/package.json +2 -5
- package/src/components/Business/SearchSelect/BusinessUtils.ts +17 -8
package/dist/index.esm.js
CHANGED
|
@@ -6708,9 +6708,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
|
|
|
6708
6708
|
// 版本2
|
|
6709
6709
|
requestConfig = _objectSpread2({
|
|
6710
6710
|
url: "".concat(prefixUrl.selectPrefix, "/employee/pageList/v2"),
|
|
6711
|
-
filter: 'qp-
|
|
6711
|
+
filter: 'qp-username,name-orGroup,like',
|
|
6712
6712
|
mappingTextField: 'name',
|
|
6713
|
-
mappingTextShowKeyField: '
|
|
6713
|
+
mappingTextShowKeyField: 'username',
|
|
6714
6714
|
mappingValueField: 'id',
|
|
6715
6715
|
otherParams: {
|
|
6716
6716
|
'qp-enable-eq': 10,
|
|
@@ -6720,12 +6720,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
|
|
|
6720
6720
|
sourceName: 'employeeNumber'
|
|
6721
6721
|
}, requestConfigProp);
|
|
6722
6722
|
tableSearchForm = [{
|
|
6723
|
-
name: 'qp-
|
|
6724
|
-
label: '
|
|
6725
|
-
}, {
|
|
6726
|
-
name: 'qp-employeeNumber-like',
|
|
6727
|
-
label: '员工编码'
|
|
6723
|
+
name: 'qp-username-like',
|
|
6724
|
+
label: '账户名称'
|
|
6728
6725
|
}, {
|
|
6726
|
+
name: 'qp-name-like',
|
|
6727
|
+
label: '显示名称'
|
|
6728
|
+
}, // { name: 'qp-employeeNumber-like', label: '员工编码' },
|
|
6729
|
+
{
|
|
6729
6730
|
name: 'qp-directOrgCode-in',
|
|
6730
6731
|
type: 'select',
|
|
6731
6732
|
label: '所属组织机构',
|
|
@@ -6755,15 +6756,23 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
|
|
|
6755
6756
|
formatSource(x, 0, 2, tableSearchForm);
|
|
6756
6757
|
});
|
|
6757
6758
|
modalTableProps = _objectSpread2({
|
|
6758
|
-
modalTableTitle: '
|
|
6759
|
+
modalTableTitle: '添加员工',
|
|
6759
6760
|
tableSearchForm: tableSearchForm,
|
|
6760
6761
|
tableColumns: [{
|
|
6761
|
-
title: '
|
|
6762
|
-
dataIndex: '
|
|
6762
|
+
title: '账户名称',
|
|
6763
|
+
dataIndex: 'username'
|
|
6763
6764
|
}, {
|
|
6764
|
-
title: '
|
|
6765
|
+
title: '显示名称',
|
|
6765
6766
|
dataIndex: 'name'
|
|
6766
|
-
}, {
|
|
6767
|
+
}, // {
|
|
6768
|
+
// title: '员工编码',
|
|
6769
|
+
// dataIndex: 'employeeNumber',
|
|
6770
|
+
// },
|
|
6771
|
+
// {
|
|
6772
|
+
// title: '员工名称',
|
|
6773
|
+
// dataIndex: 'name',
|
|
6774
|
+
// },
|
|
6775
|
+
{
|
|
6767
6776
|
title: '所属组织机构',
|
|
6768
6777
|
dataIndex: 'directOrgName'
|
|
6769
6778
|
}, {
|
package/dist/index.js
CHANGED
|
@@ -6718,9 +6718,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
|
|
|
6718
6718
|
// 版本2
|
|
6719
6719
|
requestConfig = _objectSpread2({
|
|
6720
6720
|
url: "".concat(prefixUrl.selectPrefix, "/employee/pageList/v2"),
|
|
6721
|
-
filter: 'qp-
|
|
6721
|
+
filter: 'qp-username,name-orGroup,like',
|
|
6722
6722
|
mappingTextField: 'name',
|
|
6723
|
-
mappingTextShowKeyField: '
|
|
6723
|
+
mappingTextShowKeyField: 'username',
|
|
6724
6724
|
mappingValueField: 'id',
|
|
6725
6725
|
otherParams: {
|
|
6726
6726
|
'qp-enable-eq': 10,
|
|
@@ -6730,12 +6730,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
|
|
|
6730
6730
|
sourceName: 'employeeNumber'
|
|
6731
6731
|
}, requestConfigProp);
|
|
6732
6732
|
tableSearchForm = [{
|
|
6733
|
-
name: 'qp-
|
|
6734
|
-
label: '
|
|
6735
|
-
}, {
|
|
6736
|
-
name: 'qp-employeeNumber-like',
|
|
6737
|
-
label: '员工编码'
|
|
6733
|
+
name: 'qp-username-like',
|
|
6734
|
+
label: '账户名称'
|
|
6738
6735
|
}, {
|
|
6736
|
+
name: 'qp-name-like',
|
|
6737
|
+
label: '显示名称'
|
|
6738
|
+
}, // { name: 'qp-employeeNumber-like', label: '员工编码' },
|
|
6739
|
+
{
|
|
6739
6740
|
name: 'qp-directOrgCode-in',
|
|
6740
6741
|
type: 'select',
|
|
6741
6742
|
label: '所属组织机构',
|
|
@@ -6765,15 +6766,23 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
|
|
|
6765
6766
|
formatSource(x, 0, 2, tableSearchForm);
|
|
6766
6767
|
});
|
|
6767
6768
|
modalTableProps = _objectSpread2({
|
|
6768
|
-
modalTableTitle: '
|
|
6769
|
+
modalTableTitle: '添加员工',
|
|
6769
6770
|
tableSearchForm: tableSearchForm,
|
|
6770
6771
|
tableColumns: [{
|
|
6771
|
-
title: '
|
|
6772
|
-
dataIndex: '
|
|
6772
|
+
title: '账户名称',
|
|
6773
|
+
dataIndex: 'username'
|
|
6773
6774
|
}, {
|
|
6774
|
-
title: '
|
|
6775
|
+
title: '显示名称',
|
|
6775
6776
|
dataIndex: 'name'
|
|
6776
|
-
}, {
|
|
6777
|
+
}, // {
|
|
6778
|
+
// title: '员工编码',
|
|
6779
|
+
// dataIndex: 'employeeNumber',
|
|
6780
|
+
// },
|
|
6781
|
+
// {
|
|
6782
|
+
// title: '员工名称',
|
|
6783
|
+
// dataIndex: 'name',
|
|
6784
|
+
// },
|
|
6785
|
+
{
|
|
6777
6786
|
title: '所属组织机构',
|
|
6778
6787
|
dataIndex: 'directOrgName'
|
|
6779
6788
|
}, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bit-sun/business-component",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.37",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": "dumi dev",
|
|
6
6
|
"docs:build": "dumi build",
|
|
@@ -28,8 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"peerDependencies": {
|
|
30
30
|
"bssula": "^2.0.0",
|
|
31
|
-
"umi-plugin-bssula": "1.0.13"
|
|
32
|
-
"umi": "^3.5.20"
|
|
31
|
+
"umi-plugin-bssula": "1.0.13"
|
|
33
32
|
},
|
|
34
33
|
"dependencies": {
|
|
35
34
|
"@ant-design/icons": "^4.7.0",
|
|
@@ -42,8 +41,6 @@
|
|
|
42
41
|
"bssula": "^2.0.0",
|
|
43
42
|
"classnames": "^2.3.1",
|
|
44
43
|
"lodash": "^4.17.21",
|
|
45
|
-
"memoize-one": "^6.0.0",
|
|
46
|
-
"path-to-regexp": "^6.2.1",
|
|
47
44
|
"querystring": "^0.2.1",
|
|
48
45
|
"react": "^16.12.0",
|
|
49
46
|
"react-beautiful-dnd": "10.0.0",
|
|
@@ -1277,9 +1277,9 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
|
|
|
1277
1277
|
// 版本2
|
|
1278
1278
|
requestConfig = {
|
|
1279
1279
|
url: `${prefixUrl.selectPrefix}/employee/pageList/v2`,
|
|
1280
|
-
filter: 'qp-
|
|
1280
|
+
filter: 'qp-username,name-orGroup,like', // 过滤参数
|
|
1281
1281
|
mappingTextField: 'name',
|
|
1282
|
-
mappingTextShowKeyField: '
|
|
1282
|
+
mappingTextShowKeyField: 'username',
|
|
1283
1283
|
mappingValueField: 'id',
|
|
1284
1284
|
otherParams: {
|
|
1285
1285
|
'qp-enable-eq': 10, // 启用状态 10-启用，20-禁用
|
|
@@ -1290,8 +1290,9 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
|
|
|
1290
1290
|
...requestConfigProp,
|
|
1291
1291
|
}
|
|
1292
1292
|
tableSearchForm = [
|
|
1293
|
-
{ name: 'qp-
|
|
1294
|
-
{ name: 'qp-
|
|
1293
|
+
{ name: 'qp-username-like', label: '账户名称' },
|
|
1294
|
+
{ name: 'qp-name-like', label: '显示名称' },
|
|
1295
|
+
// { name: 'qp-employeeNumber-like', label: '员工编码' },
|
|
1295
1296
|
{ name: 'qp-directOrgCode-in', type: 'select', label: '所属组织机构', field: {
|
|
1296
1297
|
type: 'select',
|
|
1297
1298
|
props: {
|
|
@@ -1315,17 +1316,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
|
|
|
1315
1316
|
formatSource(x,0, 2, tableSearchForm);
|
|
1316
1317
|
})
|
|
1317
1318
|
modalTableProps = {
|
|
1318
|
-
modalTableTitle: '
|
|
1319
|
+
modalTableTitle: '添加员工',
|
|
1319
1320
|
tableSearchForm,
|
|
1320
1321
|
tableColumns: [
|
|
1321
1322
|
{
|
|
1322
|
-
title: '
|
|
1323
|
-
dataIndex: '
|
|
1323
|
+
title: '账户名称',
|
|
1324
|
+
dataIndex: 'username',
|
|
1324
1325
|
},
|
|
1325
1326
|
{
|
|
1326
|
-
title: '
|
|
1327
|
+
title: '显示名称',
|
|
1327
1328
|
dataIndex: 'name',
|
|
1328
1329
|
},
|
|
1330
|
+
// {
|
|
1331
|
+
// title: '员工编码',
|
|
1332
|
+
// dataIndex: 'employeeNumber',
|
|
1333
|
+
// },
|
|
1334
|
+
// {
|
|
1335
|
+
// title: '员工名称',
|
|
1336
|
+
// dataIndex: 'name',
|
|
1337
|
+
// },
|
|
1329
1338
|
{
|
|
1330
1339
|
title: '所属组织机构',
|
|
1331
1340
|
dataIndex: 'directOrgName',
|