@gingkoo/pandora-metabase 1.0.16 → 1.0.18

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.
Files changed (5) hide show
  1. package/lib/cjs/components/modules/join-data.js +1 -1
  2. package/lib/cjs/hooks/patch.js +9 -7
  3. package/lib/es/components/modules/join-data.js +1 -1
  4. package/lib/es/hooks/patch.js +9 -7
  5. package/package.json +1 -1
package/lib/cjs/components/modules/join-data.js CHANGED
@@ -1024,7 +1024,7 @@ var JoinData = function JoinData(props) {
1024
1024
  }).join(' || ') : (0, _locale.__)('SqlQueryBuilder.pickTable')
1025
1025
  }, type + i);
1026
1026
  } else {
1027
- return items.map(function (item, index) {
1027
+ return items === null || items === void 0 ? void 0 : items.map(function (item, index) {
1028
1028
  if (item.type === _types.AtomsTypeEnum.INPUT_NUMBER) {
1029
1029
  return (0, _jsxRuntime.jsx)(_pandora.InputNumber, {
1030
1030
  disabled: meta.readonly,
package/lib/cjs/hooks/patch.js CHANGED
@@ -17,9 +17,9 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
17
17
  var fields2 = newMeta.table2.fields || [];
18
18
  // 处理老字段
19
19
  var field1 = {
20
- fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
20
+ fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column || newMeta.table1.name,
21
21
  fieldUuid: newMeta.table1.fieldUuid || (0, _helper.uuidv4)('field'),
22
- fieldId: newMeta.table1.id,
22
+ fieldId: newMeta.table1.fieldId,
23
23
  fieldNameZh: newMeta.table1.name_zh,
24
24
  fieldName: newMeta.table1.fieldName || newMeta.table1.name
25
25
  // quotes: newMeta.table1.quotes || newMeta.table1.column,
@@ -28,9 +28,11 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
28
28
  // tableAlias: newMeta.table1.alias,
29
29
  };
30
30
  var field2 = {
31
- fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
31
+ fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column || newMeta.table2.name,
32
32
  fieldUuid: newMeta.table2.fieldUuid || (0, _helper.uuidv4)('field'),
33
- fieldId: newMeta.table2.id
33
+ fieldId: newMeta.table2.fieldId,
34
+ fieldNameZh: newMeta.table2.name_zh,
35
+ fieldName: newMeta.table2.fieldName || newMeta.table2.name
34
36
  };
35
37
  // 处理多选
36
38
  if (field1.fieldAlias && ((_fields = fields1) === null || _fields === void 0 ? void 0 : _fields.length) < 1) {
@@ -98,9 +100,9 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
98
100
  var _left_fields, _right_fields;
99
101
  var left_fields = v.left_fields || [];
100
102
  var right_fields = v.right_fields || [];
101
- if (v.type !== 'default') {
102
- return v;
103
- }
103
+ // if (v.type !== 'default') {
104
+ // return v;
105
+ // }
104
106
  // 先处理老数据的字段
105
107
  var left_field = {
106
108
  left_fieldAlias: v.left_fieldAlias || v.left_column,
package/lib/es/components/modules/join-data.js CHANGED
@@ -1018,7 +1018,7 @@ var JoinData = function JoinData(props) {
1018
1018
  }).join(' || ') : __('SqlQueryBuilder.pickTable')
1019
1019
  }, type + i);
1020
1020
  } else {
1021
- return items.map(function (item, index) {
1021
+ return items === null || items === void 0 ? void 0 : items.map(function (item, index) {
1022
1022
  if (item.type === AtomsTypeEnum.INPUT_NUMBER) {
1023
1023
  return _jsx(InputNumber, {
1024
1024
  disabled: meta.readonly,
package/lib/es/hooks/patch.js CHANGED
@@ -10,9 +10,9 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
10
10
  var fields2 = newMeta.table2.fields || [];
11
11
  // 处理老字段
12
12
  var field1 = {
13
- fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
13
+ fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column || newMeta.table1.name,
14
14
  fieldUuid: newMeta.table1.fieldUuid || uuidv4('field'),
15
- fieldId: newMeta.table1.id,
15
+ fieldId: newMeta.table1.fieldId,
16
16
  fieldNameZh: newMeta.table1.name_zh,
17
17
  fieldName: newMeta.table1.fieldName || newMeta.table1.name
18
18
  // quotes: newMeta.table1.quotes || newMeta.table1.column,
@@ -21,9 +21,11 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
21
21
  // tableAlias: newMeta.table1.alias,
22
22
  };
23
23
  var field2 = {
24
- fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
24
+ fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column || newMeta.table2.name,
25
25
  fieldUuid: newMeta.table2.fieldUuid || uuidv4('field'),
26
- fieldId: newMeta.table2.id
26
+ fieldId: newMeta.table2.fieldId,
27
+ fieldNameZh: newMeta.table2.name_zh,
28
+ fieldName: newMeta.table2.fieldName || newMeta.table2.name
27
29
  };
28
30
  // 处理多选
29
31
  if (field1.fieldAlias && ((_fields = fields1) === null || _fields === void 0 ? void 0 : _fields.length) < 1) {
@@ -91,9 +93,9 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
91
93
  var _left_fields, _right_fields;
92
94
  var left_fields = v.left_fields || [];
93
95
  var right_fields = v.right_fields || [];
94
- if (v.type !== 'default') {
95
- return v;
96
- }
96
+ // if (v.type !== 'default') {
97
+ // return v;
98
+ // }
97
99
  // 先处理老数据的字段
98
100
  var left_field = {
99
101
  left_fieldAlias: v.left_fieldAlias || v.left_column,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.16",
3
+ "version": "1.0.18",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",