@gingkoo/pandora-metabase 1.0.99 → 1.0.100
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/lib/cjs/components/dialog/select-column/index.d.ts +1 -1
- package/lib/cjs/components/dialog/select-column/index.js +3 -3
- package/lib/cjs/components/modules/join-data.js +9 -7
- package/lib/cjs/components/modules/table-data.js +10 -7
- package/lib/cjs/store/types.d.ts +1 -0
- package/lib/cjs/utils.js +10 -7
- package/lib/es/components/dialog/select-column/index.d.ts +1 -1
- package/lib/es/components/dialog/select-column/index.js +3 -3
- package/lib/es/components/modules/join-data.js +9 -7
- package/lib/es/components/modules/table-data.js +10 -7
- package/lib/es/store/types.d.ts +1 -0
- package/lib/es/utils.js +10 -7
- package/package.json +1 -1
|
@@ -9,7 +9,7 @@ import { MetaData_ColumnsType } from '../../../store/types';
|
|
|
9
9
|
interface PropsType {
|
|
10
10
|
data: MetaData_ColumnsType[];
|
|
11
11
|
groupIndex: number;
|
|
12
|
-
onChange: (record: MetaData_ColumnsType[]) => void;
|
|
12
|
+
onChange: (record: MetaData_ColumnsType[], newMetaList?: any[]) => void;
|
|
13
13
|
}
|
|
14
14
|
declare const SelectColumn: ({ data, groupIndex, onChange }: PropsType) => import("react/jsx-runtime").JSX.Element;
|
|
15
15
|
export default SelectColumn;
|
|
@@ -83,7 +83,7 @@ var SelectColumn = function SelectColumn(_ref) {
|
|
|
83
83
|
});
|
|
84
84
|
}
|
|
85
85
|
}, [isAllSelect]);
|
|
86
|
-
function onSelect(columns) {
|
|
86
|
+
function onSelect(columns, newMetaList) {
|
|
87
87
|
var originalData = (0, _cloneDeep["default"])(originList); // 原始数据
|
|
88
88
|
var mergedColumns = originalData.map(function (item) {
|
|
89
89
|
var match = columns.find(function (col) {
|
|
@@ -93,7 +93,7 @@ var SelectColumn = function SelectColumn(_ref) {
|
|
|
93
93
|
});
|
|
94
94
|
setColumns(columns);
|
|
95
95
|
setOriginList(mergedColumns);
|
|
96
|
-
typeof onChange === 'function' && onChange(mergedColumns);
|
|
96
|
+
typeof onChange === 'function' && onChange(mergedColumns, newMetaList);
|
|
97
97
|
}
|
|
98
98
|
var onChangeFieldAlias = function onChangeFieldAlias(val, i) {
|
|
99
99
|
var fieldAlias = val || '';
|
|
@@ -128,7 +128,7 @@ var SelectColumn = function SelectColumn(_ref) {
|
|
|
128
128
|
obj: newColumns[i],
|
|
129
129
|
type: _types.ChangeType.fieldAlias
|
|
130
130
|
});
|
|
131
|
-
onSelect(newColumns);
|
|
131
|
+
onSelect(newColumns, newMetaList);
|
|
132
132
|
setTimeout(function () {
|
|
133
133
|
store.setClosable(true);
|
|
134
134
|
}, 0);
|
|
@@ -381,13 +381,15 @@ var JoinData = function JoinData(props) {
|
|
|
381
381
|
content: (0, _jsxRuntime.jsx)(_dialog.SelectColumn, {
|
|
382
382
|
data: columns,
|
|
383
383
|
groupIndex: groupIndex,
|
|
384
|
-
onChange: function onChange(data) {
|
|
385
|
-
var
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
384
|
+
onChange: function onChange(data, newMetaList) {
|
|
385
|
+
var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
|
|
386
|
+
_newMetaList[index].columns = data;
|
|
387
|
+
if (!newMetaList) {
|
|
388
|
+
store.setMeta(_newMetaList, groupIndex, {
|
|
389
|
+
obj: data,
|
|
390
|
+
type: _types.ChangeType.field
|
|
391
|
+
});
|
|
392
|
+
}
|
|
391
393
|
}
|
|
392
394
|
})
|
|
393
395
|
});
|
|
@@ -128,14 +128,17 @@ var TableData = function TableData(props) {
|
|
|
128
128
|
content: (0, _jsxRuntime.jsx)(_dialog.SelectColumn, {
|
|
129
129
|
groupIndex: groupIndex,
|
|
130
130
|
data: columns,
|
|
131
|
-
onChange: function onChange(data) {
|
|
132
|
-
|
|
131
|
+
onChange: function onChange(data, newMetaList) {
|
|
132
|
+
// 当前值已改变。必须以传入的数组为准，改变别名
|
|
133
|
+
var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
|
|
133
134
|
// @ts-ignore
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
135
|
+
_newMetaList[0].columns = data;
|
|
136
|
+
if (!newMetaList) {
|
|
137
|
+
store.setMeta(_newMetaList, groupIndex, {
|
|
138
|
+
obj: data,
|
|
139
|
+
type: _types.ChangeType.columns
|
|
140
|
+
});
|
|
141
|
+
}
|
|
139
142
|
}
|
|
140
143
|
})
|
|
141
144
|
});
|
package/lib/cjs/store/types.d.ts
CHANGED
package/lib/cjs/utils.js
CHANGED
|
@@ -240,10 +240,11 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
|
|
|
240
240
|
return {
|
|
241
241
|
database_type: _enum.SQL_COLUMN_TYPE.STRING,
|
|
242
242
|
name_zh: v.name,
|
|
243
|
+
id: v.id || v.name,
|
|
243
244
|
name: v.name,
|
|
244
245
|
select: true,
|
|
245
|
-
fieldAlias: ''
|
|
246
|
-
|
|
246
|
+
fieldAlias: '',
|
|
247
|
+
fieldUuid: (0, _helper2.uuidv4)('field')
|
|
247
248
|
};
|
|
248
249
|
});
|
|
249
250
|
return {
|
|
@@ -447,7 +448,6 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
|
|
|
447
448
|
}
|
|
448
449
|
if (v.type === _enum.TypeEnum.filter) {
|
|
449
450
|
if (v.filter && v.filter.length > 0) {
|
|
450
|
-
console.log(v.filter);
|
|
451
451
|
v.filter = _changeAlias(v.filter, {
|
|
452
452
|
uuid: uuid,
|
|
453
453
|
alias: alias
|
|
@@ -770,14 +770,17 @@ var _isError = exports.isError = function isError(item, data) {
|
|
|
770
770
|
} else {
|
|
771
771
|
var _tables$_datasourceId2;
|
|
772
772
|
return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
|
|
773
|
+
if (field.id === undefined) {
|
|
774
|
+
return field.name !== fieldName;
|
|
775
|
+
}
|
|
773
776
|
return field.name !== fieldName || field.id !== fieldId;
|
|
774
777
|
});
|
|
775
778
|
}
|
|
776
779
|
} else {
|
|
777
|
-
var _tables$_datasourceId3;
|
|
778
|
-
var hasField = (tables === null || tables === void 0 || (_tables$
|
|
779
|
-
return v.name === fieldName && v.id === fieldId;
|
|
780
|
-
}))
|
|
780
|
+
var _tables$_datasourceId3, _tables$_datasourceId4;
|
|
781
|
+
var hasField = (_tables$_datasourceId3 = tables === null || tables === void 0 || (_tables$_datasourceId4 = tables[_datasourceId]) === null || _tables$_datasourceId4 === void 0 || (_tables$_datasourceId4 = _tables$_datasourceId4[tableId + tableAlias]) === null || _tables$_datasourceId4 === void 0 ? void 0 : _tables$_datasourceId4.some(function (v) {
|
|
782
|
+
return v.name === fieldName && (v.id === undefined || v.id === fieldId);
|
|
783
|
+
})) !== null && _tables$_datasourceId3 !== void 0 ? _tables$_datasourceId3 : false;
|
|
781
784
|
return !hasField; // 注意：返回 true 表示“有错误”
|
|
782
785
|
}
|
|
783
786
|
}
|
|
@@ -9,7 +9,7 @@ import { MetaData_ColumnsType } from '../../../store/types';
|
|
|
9
9
|
interface PropsType {
|
|
10
10
|
data: MetaData_ColumnsType[];
|
|
11
11
|
groupIndex: number;
|
|
12
|
-
onChange: (record: MetaData_ColumnsType[]) => void;
|
|
12
|
+
onChange: (record: MetaData_ColumnsType[], newMetaList?: any[]) => void;
|
|
13
13
|
}
|
|
14
14
|
declare const SelectColumn: ({ data, groupIndex, onChange }: PropsType) => import("react/jsx-runtime").JSX.Element;
|
|
15
15
|
export default SelectColumn;
|
|
@@ -76,7 +76,7 @@ var SelectColumn = function SelectColumn(_ref) {
|
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
78
|
}, [isAllSelect]);
|
|
79
|
-
function onSelect(columns) {
|
|
79
|
+
function onSelect(columns, newMetaList) {
|
|
80
80
|
var originalData = cloneDeep(originList); // 原始数据
|
|
81
81
|
var mergedColumns = originalData.map(function (item) {
|
|
82
82
|
var match = columns.find(function (col) {
|
|
@@ -86,7 +86,7 @@ var SelectColumn = function SelectColumn(_ref) {
|
|
|
86
86
|
});
|
|
87
87
|
setColumns(columns);
|
|
88
88
|
setOriginList(mergedColumns);
|
|
89
|
-
typeof onChange === 'function' && onChange(mergedColumns);
|
|
89
|
+
typeof onChange === 'function' && onChange(mergedColumns, newMetaList);
|
|
90
90
|
}
|
|
91
91
|
var onChangeFieldAlias = function onChangeFieldAlias(val, i) {
|
|
92
92
|
var fieldAlias = val || '';
|
|
@@ -121,7 +121,7 @@ var SelectColumn = function SelectColumn(_ref) {
|
|
|
121
121
|
obj: newColumns[i],
|
|
122
122
|
type: ChangeType.fieldAlias
|
|
123
123
|
});
|
|
124
|
-
onSelect(newColumns);
|
|
124
|
+
onSelect(newColumns, newMetaList);
|
|
125
125
|
setTimeout(function () {
|
|
126
126
|
store.setClosable(true);
|
|
127
127
|
}, 0);
|
|
@@ -376,13 +376,15 @@ var JoinData = function JoinData(props) {
|
|
|
376
376
|
content: _jsx(SelectColumn, {
|
|
377
377
|
data: columns,
|
|
378
378
|
groupIndex: groupIndex,
|
|
379
|
-
onChange: function onChange(data) {
|
|
380
|
-
var
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
379
|
+
onChange: function onChange(data, newMetaList) {
|
|
380
|
+
var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
|
|
381
|
+
_newMetaList[index].columns = data;
|
|
382
|
+
if (!newMetaList) {
|
|
383
|
+
store.setMeta(_newMetaList, groupIndex, {
|
|
384
|
+
obj: data,
|
|
385
|
+
type: ChangeType.field
|
|
386
|
+
});
|
|
387
|
+
}
|
|
386
388
|
}
|
|
387
389
|
})
|
|
388
390
|
});
|
|
@@ -122,14 +122,17 @@ var TableData = function TableData(props) {
|
|
|
122
122
|
content: _jsx(SelectColumn, {
|
|
123
123
|
groupIndex: groupIndex,
|
|
124
124
|
data: columns,
|
|
125
|
-
onChange: function onChange(data) {
|
|
126
|
-
|
|
125
|
+
onChange: function onChange(data, newMetaList) {
|
|
126
|
+
// 当前值已改变。必须以传入的数组为准，改变别名
|
|
127
|
+
var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
|
|
127
128
|
// @ts-ignore
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
129
|
+
_newMetaList[0].columns = data;
|
|
130
|
+
if (!newMetaList) {
|
|
131
|
+
store.setMeta(_newMetaList, groupIndex, {
|
|
132
|
+
obj: data,
|
|
133
|
+
type: ChangeType.columns
|
|
134
|
+
});
|
|
135
|
+
}
|
|
133
136
|
}
|
|
134
137
|
})
|
|
135
138
|
});
|
package/lib/es/store/types.d.ts
CHANGED
package/lib/es/utils.js
CHANGED
|
@@ -227,10 +227,11 @@ export var getSubColumns = function getSubColumns(metaList) {
|
|
|
227
227
|
return {
|
|
228
228
|
database_type: SQL_COLUMN_TYPE.STRING,
|
|
229
229
|
name_zh: v.name,
|
|
230
|
+
id: v.id || v.name,
|
|
230
231
|
name: v.name,
|
|
231
232
|
select: true,
|
|
232
|
-
fieldAlias: ''
|
|
233
|
-
|
|
233
|
+
fieldAlias: '',
|
|
234
|
+
fieldUuid: uuidv4('field')
|
|
234
235
|
};
|
|
235
236
|
});
|
|
236
237
|
return {
|
|
@@ -434,7 +435,6 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
|
|
|
434
435
|
}
|
|
435
436
|
if (v.type === TypeEnum.filter) {
|
|
436
437
|
if (v.filter && v.filter.length > 0) {
|
|
437
|
-
console.log(v.filter);
|
|
438
438
|
v.filter = _changeAlias(v.filter, {
|
|
439
439
|
uuid: uuid,
|
|
440
440
|
alias: alias
|
|
@@ -757,14 +757,17 @@ var _isError = function isError(item, data) {
|
|
|
757
757
|
} else {
|
|
758
758
|
var _tables$_datasourceId2;
|
|
759
759
|
return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
|
|
760
|
+
if (field.id === undefined) {
|
|
761
|
+
return field.name !== fieldName;
|
|
762
|
+
}
|
|
760
763
|
return field.name !== fieldName || field.id !== fieldId;
|
|
761
764
|
});
|
|
762
765
|
}
|
|
763
766
|
} else {
|
|
764
|
-
var _tables$_datasourceId3;
|
|
765
|
-
var hasField = (tables === null || tables === void 0 || (_tables$
|
|
766
|
-
return v.name === fieldName && v.id === fieldId;
|
|
767
|
-
}))
|
|
767
|
+
var _tables$_datasourceId3, _tables$_datasourceId4;
|
|
768
|
+
var hasField = (_tables$_datasourceId3 = tables === null || tables === void 0 || (_tables$_datasourceId4 = tables[_datasourceId]) === null || _tables$_datasourceId4 === void 0 || (_tables$_datasourceId4 = _tables$_datasourceId4[tableId + tableAlias]) === null || _tables$_datasourceId4 === void 0 ? void 0 : _tables$_datasourceId4.some(function (v) {
|
|
769
|
+
return v.name === fieldName && (v.id === undefined || v.id === fieldId);
|
|
770
|
+
})) !== null && _tables$_datasourceId3 !== void 0 ? _tables$_datasourceId3 : false;
|
|
768
771
|
return !hasField; // 注意：返回 true 表示“有错误”
|
|
769
772
|
}
|
|
770
773
|
}
|