@gingkoo/pandora-metabase 1.0.88 → 1.0.90

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 (23) hide show
  1. package/lib/cjs/components/dialog/formula/index.js +20 -14
  2. package/lib/cjs/components/dialog/formula/utils.js +5 -2
  3. package/lib/cjs/components/dialog/formula-list/index.js +3 -0
  4. package/lib/cjs/components/dialog/formula-list/index.less +5 -0
  5. package/lib/cjs/components/dialog/select-column-multiple/index.js +10 -10
  6. package/lib/cjs/components/metabase/index.less +1 -1
  7. package/lib/cjs/components/modules/custom-column.js +4 -4
  8. package/lib/cjs/components/modules/filter.js +4 -4
  9. package/lib/cjs/hooks/use-state.js +15 -2
  10. package/lib/cjs/store/types.d.ts +2 -0
  11. package/lib/cjs/utils.js +3 -0
  12. package/lib/es/components/dialog/formula/index.js +20 -14
  13. package/lib/es/components/dialog/formula/utils.js +5 -2
  14. package/lib/es/components/dialog/formula-list/index.js +3 -0
  15. package/lib/es/components/dialog/formula-list/index.less +5 -0
  16. package/lib/es/components/dialog/select-column-multiple/index.js +10 -10
  17. package/lib/es/components/metabase/index.less +1 -1
  18. package/lib/es/components/modules/custom-column.js +4 -4
  19. package/lib/es/components/modules/filter.js +4 -4
  20. package/lib/es/hooks/use-state.js +15 -2
  21. package/lib/es/store/types.d.ts +2 -0
  22. package/lib/es/utils.js +3 -0
  23. package/package.json +1 -1
package/lib/cjs/components/dialog/formula/index.js CHANGED
@@ -29,13 +29,17 @@ var VisualBox = _styledComponents["default"].div.attrs({
29
29
  className: 'visual-box'
30
30
  })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
31
31
  var CaseEditor = _react["default"].forwardRef(function (props, ref) {
32
- var _store$formulaTemplat, _fun$args;
32
+ var _store$formulaTemplat, _formulaList$fun$name, _formulaList$fun$name2, _fun$args;
33
33
  var store = (0, _useProvider.useStore)();
34
34
  var value = props.value,
35
35
  data = props.data,
36
36
  onOk = props.onOk,
37
37
  onCancel = props.onCancel;
38
- var _useState = (0, _react.useState)(value),
38
+ var _useState = (0, _react.useState)(function () {
39
+ return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, value), {}, {
40
+ id: value.id || value.name
41
+ });
42
+ }),
39
43
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
40
44
  fun = _useState2[0],
41
45
  setFun = _useState2[1];
@@ -80,13 +84,15 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
80
84
  })));
81
85
  };
82
86
  // 选择公式名
83
- var handleFunName = function handleFunName(name) {
84
- var _formulaList$name, _formulaList$name2;
87
+ var handleFunName = function handleFunName(id) {
88
+ var _formulaList$id, _formulaList$id2, _formulaList$id3;
89
+ var isId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
85
90
  // formulaList?.[name].args;
86
91
  setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
87
- args: (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[name].args, formulaList === null || formulaList === void 0 || (_formulaList$name = formulaList[name]) === null || _formulaList$name === void 0 ? void 0 : _formulaList$name.arity),
88
- arity: formulaList === null || formulaList === void 0 || (_formulaList$name2 = formulaList[name]) === null || _formulaList$name2 === void 0 ? void 0 : _formulaList$name2.arity,
89
- name: name
92
+ args: (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[id].args, formulaList === null || formulaList === void 0 || (_formulaList$id = formulaList[id]) === null || _formulaList$id === void 0 ? void 0 : _formulaList$id.arity),
93
+ arity: formulaList === null || formulaList === void 0 || (_formulaList$id2 = formulaList[id]) === null || _formulaList$id2 === void 0 ? void 0 : _formulaList$id2.arity,
94
+ id: id,
95
+ name: formulaList === null || formulaList === void 0 || (_formulaList$id3 = formulaList[id]) === null || _formulaList$id3 === void 0 ? void 0 : _formulaList$id3.name
90
96
  }));
91
97
  };
92
98
  var getQuotes = function getQuotes(_args) {
@@ -147,7 +153,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
147
153
  triggerProps: {
148
154
  clickToClose: true
149
155
  },
150
- value: fun.name,
156
+ value: fun.id || fun.name,
151
157
  triggerElement: function triggerElement(value) {
152
158
  return (0, _jsxRuntime.jsx)("div", {
153
159
  className: (0, _classnames["default"])("Sqb-TableName Sqb-TableName-OPERATOR", {
@@ -164,9 +170,9 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
164
170
  label: options.name,
165
171
  children: Array.from(options.children || []).map(function (option, ind) {
166
172
  return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
167
- value: option.name,
173
+ value: option.id,
168
174
  children: option.name
169
- }, String(option.name + ind));
175
+ }, option.id || String(option.name + ind));
170
176
  })
171
177
  }, index);
172
178
  // <Select.Option key={index} value={option.name}>
@@ -181,14 +187,14 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
181
187
  color: '#949aab'
182
188
  },
183
189
  children: [(0, _jsxRuntime.jsxs)("p", {
184
- children: ["\u63CF\u8FF0\uFF1A", formulaList[fun.name].description]
190
+ children: ["\u63CF\u8FF0\uFF1A", (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.description]
185
191
  }), (0, _jsxRuntime.jsxs)("p", {
186
- children: ["\u6848\u4F8B\uFF1A", formulaList[fun.name].example]
192
+ children: ["\u6848\u4F8B\uFF1A", (_formulaList$fun$name2 = formulaList[fun.name]) === null || _formulaList$fun$name2 === void 0 ? void 0 : _formulaList$fun$name2.example]
187
193
  })]
188
194
  })]
189
195
  }), fun === null || fun === void 0 || (_fun$args = fun.args) === null || _fun$args === void 0 ? void 0 : _fun$args.map(function (v, i) {
190
196
  if (v.type === _types.AtomsTypeEnum.COLLECTION) {
191
- var _formulaList$fun$name;
197
+ var _formulaList$fun$name3;
192
198
  return (0, _jsxRuntime.jsxs)("div", {
193
199
  className: 'Sqb-item-formula-args',
194
200
  children: [(0, _jsxRuntime.jsxs)("div", {
@@ -201,7 +207,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
201
207
  },
202
208
  children: ["\u53C2\u6570", i + 1, ":"]
203
209
  }), (0, _jsxRuntime.jsx)(_formulaList["default"], {
204
- check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 || (_formulaList$fun$name = _formulaList$fun$name.args) === null || _formulaList$fun$name === void 0 || (_formulaList$fun$name = _formulaList$fun$name[i]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.check) || '',
210
+ check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name3 = formulaList[fun.name]) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3.args) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3[i]) === null || _formulaList$fun$name3 === void 0 ? void 0 : _formulaList$fun$name3.check) || '',
205
211
  value: v.list,
206
212
  data: data,
207
213
  ref: _ref,
package/lib/cjs/components/dialog/formula/utils.js CHANGED
@@ -12,8 +12,11 @@ var getObjTem = exports.getObjTem = function getObjTem(arr) {
12
12
  var obj = {};
13
13
  arr === null || arr === void 0 || arr.map(function (v) {
14
14
  v.children.map(function (vv) {
15
- if (vv.name) {
16
- obj[vv.name] = vv;
15
+ // if (vv.name) {
16
+ // obj[vv.name] = vv;
17
+ // }
18
+ if (vv.id) {
19
+ obj[vv.id] = vv;
17
20
  }
18
21
  });
19
22
  });
package/lib/cjs/components/dialog/formula-list/index.js CHANGED
@@ -955,6 +955,9 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
955
955
  style: {
956
956
  pointerEvents: isCheck || store.isMetabaseCopy ? 'none' : 'auto'
957
957
  },
958
+ className: (0, _classnames["default"])({
959
+ openCheck: isCheck
960
+ }),
958
961
  children: itemDom(v, i)
959
962
  }), selectOperator({
960
963
  triggerElement: function triggerElement(value) {
package/lib/cjs/components/dialog/formula-list/index.less CHANGED
@@ -35,6 +35,11 @@
35
35
  // transform: none;
36
36
  // }
37
37
  // }
38
+ .openCheck {
39
+ .Sqb-TableName {
40
+ padding-left: 20px;
41
+ }
42
+ }
38
43
  &.item-selected {
39
44
  .item-check {
40
45
  display: block;
package/lib/cjs/components/dialog/select-column-multiple/index.js CHANGED
@@ -333,25 +333,25 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
333
333
  className: (0, _classnames["default"])("Sqb-List-section"),
334
334
  children: (0, _jsxRuntime.jsx)("div", {
335
335
  className: (0, _classnames["default"])("Sqb-List-item mx-2", {
336
- active: isActive((v.id || v.name) + v.fieldAlias)
336
+ active: isActive((v.id || v.name) + (v.fieldAlias || ''))
337
337
  }),
338
338
  onClick: function onClick() {
339
339
  if (isSummarize) {
340
340
  // console.log(v, 'v');
341
341
  }
342
342
  changeValue(tableUuid, {
343
- tableName: tableItem.name,
344
- tableId: tableItem.id,
345
- tableNameZh: tableItem.name_zh,
346
- tableAlias: tableItem.alias,
347
- tableUuid: tableItem.tableUuid,
343
+ tableName: tableItem.name || '',
344
+ tableId: tableItem.id || '',
345
+ tableNameZh: tableItem.name_zh || '',
346
+ tableAlias: tableItem.alias || '',
347
+ tableUuid: tableItem.tableUuid || '',
348
348
  datasourceName: tableItem.datasourceName || '',
349
349
  datasourceId: tableItem.datasourceId || '',
350
- fieldName: v.name,
351
- fieldId: v.id || v.name,
350
+ fieldName: v.name || '',
351
+ fieldId: v.id || v.name || '',
352
352
  fieldNameZh: v.name_zh || '',
353
- fieldAlias: v.fieldAlias,
354
- fieldUuid: v.fieldUuid,
353
+ fieldAlias: v.fieldAlias || '',
354
+ fieldUuid: v.fieldUuid || '',
355
355
  type: _types.AtomsTypeEnum.FIELD
356
356
  // quotes: v.fieldAlias || v.name,
357
357
  });
package/lib/cjs/components/metabase/index.less CHANGED
@@ -16,7 +16,7 @@
16
16
  &-fun-btns {
17
17
  position: absolute;
18
18
  left: 0;
19
- top: 7px;
19
+ top: 2px;
20
20
  display: flex;
21
21
  justify-content: end;
22
22
  width: 66.6667%;
package/lib/cjs/components/modules/custom-column.js CHANGED
@@ -180,8 +180,8 @@ var CustomColumn = function CustomColumn(props) {
180
180
  tableId: v.table2.id,
181
181
  tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
182
182
  columns: v.columns,
183
- datasourceId: mainTable.table.datasourceId,
184
- datasourceName: mainTable.table.datasourceName
183
+ datasourceId: v.table2.datasourceId,
184
+ datasourceName: v.table2.datasourceName
185
185
  });
186
186
  }));
187
187
  }
@@ -204,8 +204,8 @@ var CustomColumn = function CustomColumn(props) {
204
204
  tableId: v.table2.id,
205
205
  tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
206
206
  columns: v.columns,
207
- datasourceId: mainTable.table.datasourceId,
208
- datasourceName: mainTable.table.datasourceName
207
+ datasourceId: v.table2.datasourceId,
208
+ datasourceName: v.table2.datasourceName
209
209
  });
210
210
  } else {
211
211
  return {
package/lib/cjs/components/modules/filter.js CHANGED
@@ -99,8 +99,8 @@ var Filter = function Filter(props) {
99
99
  id: v.table2.id,
100
100
  tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
101
101
  columns: v.columns,
102
- datasourceId: mainTable.table.datasourceId,
103
- datasourceName: mainTable.table.datasourceName
102
+ datasourceId: v.table2.datasourceId,
103
+ datasourceName: v.table2.datasourceName
104
104
  };
105
105
  }));
106
106
  }
@@ -128,8 +128,8 @@ var Filter = function Filter(props) {
128
128
  id: v.table2.id,
129
129
  tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
130
130
  columns: v.columns,
131
- datasourceId: mainTable.table.datasourceId,
132
- datasourceName: mainTable.table.datasourceName
131
+ datasourceId: v.table2.datasourceId,
132
+ datasourceName: v.table2.datasourceName
133
133
  };
134
134
  } else {
135
135
  return {
package/lib/cjs/hooks/use-state.js CHANGED
@@ -8,8 +8,8 @@ exports["default"] = exports.SummarizeAlias = void 0;
8
8
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
9
9
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
10
10
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
- var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
12
11
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
12
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
13
13
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
14
14
  var _react = require("react");
15
15
  var _helper = require("../utils/helper");
@@ -82,7 +82,7 @@ var useStore = function useStore() {
82
82
  var _useState15 = (0, _react.useState)([]),
83
83
  _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
84
84
  formulaTemplates = _useState16[0],
85
- setFormulaTemplates = _useState16[1]; //公式配置数组
85
+ _setFormulaTemplates = _useState16[1]; //公式配置数组
86
86
  var _useState17 = (0, _react.useState)(false),
87
87
  _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
88
88
  ignoreGroupByType = _useState18[0],
@@ -191,6 +191,19 @@ var useStore = function useStore() {
191
191
  _useState66 = (0, _slicedToArray2["default"])(_useState65, 2),
192
192
  metabaseCopyModule = _useState66[0],
193
193
  setMetabaseCopyModule = _useState66[1]; // 复制的内容
194
+ var setFormulaTemplates = function setFormulaTemplates(data) {
195
+ var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
196
+ var children = v.children.map(function (vv) {
197
+ return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, vv), {}, {
198
+ id: vv.id || vv.name
199
+ });
200
+ });
201
+ return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
202
+ children: children
203
+ });
204
+ });
205
+ _setFormulaTemplates(newData);
206
+ };
194
207
  // 外层ref
195
208
  var popupContainer = (0, _react.useRef)();
196
209
  // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
package/lib/cjs/store/types.d.ts CHANGED
@@ -71,6 +71,7 @@ export interface AtomsFormula {
71
71
  arity?: Arity;
72
72
  quotes: string;
73
73
  name: string;
74
+ id?: string;
74
75
  type: AtomsTypeEnum.FORMULA;
75
76
  }
76
77
  export interface AtomsExpression {
@@ -365,6 +366,7 @@ export interface PopupData {
365
366
  }
366
367
  export interface FormulaTemplatesItem {
367
368
  name: string;
369
+ id: string;
368
370
  args: {
369
371
  type: AtomsTypeEnum;
370
372
  check?: string | null;
package/lib/cjs/utils.js CHANGED
@@ -779,6 +779,7 @@ var _isError = exports.isError = function isError(item, data) {
779
779
  };
780
780
  // 设置新字段信息
781
781
  function setNewField(field, data) {
782
+ console.log('🚀 ~ setNewField ~ field:', field);
782
783
  var _iterator2 = (0, _createForOfIteratorHelper2["default"])(data),
783
784
  _step2;
784
785
  try {
@@ -800,6 +801,7 @@ function setNewField(field, data) {
800
801
  var matchedColumn = table.columns.find(function (col) {
801
802
  return col.name === field.fieldName;
802
803
  });
804
+ console.log('🚀 ~ setNewField ~ matchedColumn:', matchedColumn);
803
805
  if (matchedColumn) {
804
806
  field.fieldId = matchedColumn.id || '';
805
807
  field.fieldNameZh = matchedColumn.name_zh || '';
@@ -814,6 +816,7 @@ function setNewField(field, data) {
814
816
  } finally {
815
817
  _iterator2.f();
816
818
  }
819
+ console.log('🚀 ~ setNewField ~ field:', field);
817
820
  return field;
818
821
  }
819
822
  // 复制字段别名后修改对应的表id或字段id的别名
package/lib/es/components/dialog/formula/index.js CHANGED
@@ -21,13 +21,17 @@ var VisualBox = Styled.div.attrs({
21
21
  className: 'visual-box'
22
22
  })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
23
23
  var CaseEditor = React.forwardRef(function (props, ref) {
24
- var _store$formulaTemplat, _fun$args;
24
+ var _store$formulaTemplat, _formulaList$fun$name, _formulaList$fun$name2, _fun$args;
25
25
  var store = useStore();
26
26
  var value = props.value,
27
27
  data = props.data,
28
28
  onOk = props.onOk,
29
29
  onCancel = props.onCancel;
30
- var _useState = useState(value),
30
+ var _useState = useState(function () {
31
+ return _objectSpread(_objectSpread({}, value), {}, {
32
+ id: value.id || value.name
33
+ });
34
+ }),
31
35
  _useState2 = _slicedToArray(_useState, 2),
32
36
  fun = _useState2[0],
33
37
  setFun = _useState2[1];
@@ -72,13 +76,15 @@ var CaseEditor = React.forwardRef(function (props, ref) {
72
76
  })));
73
77
  };
74
78
  // 选择公式名
75
- var handleFunName = function handleFunName(name) {
76
- var _formulaList$name, _formulaList$name2;
79
+ var handleFunName = function handleFunName(id) {
80
+ var _formulaList$id, _formulaList$id2, _formulaList$id3;
81
+ var isId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
77
82
  // formulaList?.[name].args;
78
83
  setFun(_objectSpread(_objectSpread({}, fun), {}, {
79
- args: getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[name].args, formulaList === null || formulaList === void 0 || (_formulaList$name = formulaList[name]) === null || _formulaList$name === void 0 ? void 0 : _formulaList$name.arity),
80
- arity: formulaList === null || formulaList === void 0 || (_formulaList$name2 = formulaList[name]) === null || _formulaList$name2 === void 0 ? void 0 : _formulaList$name2.arity,
81
- name: name
84
+ args: getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[id].args, formulaList === null || formulaList === void 0 || (_formulaList$id = formulaList[id]) === null || _formulaList$id === void 0 ? void 0 : _formulaList$id.arity),
85
+ arity: formulaList === null || formulaList === void 0 || (_formulaList$id2 = formulaList[id]) === null || _formulaList$id2 === void 0 ? void 0 : _formulaList$id2.arity,
86
+ id: id,
87
+ name: formulaList === null || formulaList === void 0 || (_formulaList$id3 = formulaList[id]) === null || _formulaList$id3 === void 0 ? void 0 : _formulaList$id3.name
82
88
  }));
83
89
  };
84
90
  var getQuotes = function getQuotes(_args) {
@@ -139,7 +145,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
139
145
  triggerProps: {
140
146
  clickToClose: true
141
147
  },
142
- value: fun.name,
148
+ value: fun.id || fun.name,
143
149
  triggerElement: function triggerElement(value) {
144
150
  return _jsx("div", {
145
151
  className: cx("Sqb-TableName Sqb-TableName-OPERATOR", {
@@ -156,9 +162,9 @@ var CaseEditor = React.forwardRef(function (props, ref) {
156
162
  label: options.name,
157
163
  children: Array.from(options.children || []).map(function (option, ind) {
158
164
  return _jsx(Select.Option, {
159
- value: option.name,
165
+ value: option.id,
160
166
  children: option.name
161
- }, String(option.name + ind));
167
+ }, option.id || String(option.name + ind));
162
168
  })
163
169
  }, index);
164
170
  // <Select.Option key={index} value={option.name}>
@@ -173,14 +179,14 @@ var CaseEditor = React.forwardRef(function (props, ref) {
173
179
  color: '#949aab'
174
180
  },
175
181
  children: [_jsxs("p", {
176
- children: ["\u63CF\u8FF0\uFF1A", formulaList[fun.name].description]
182
+ children: ["\u63CF\u8FF0\uFF1A", (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.description]
177
183
  }), _jsxs("p", {
178
- children: ["\u6848\u4F8B\uFF1A", formulaList[fun.name].example]
184
+ children: ["\u6848\u4F8B\uFF1A", (_formulaList$fun$name2 = formulaList[fun.name]) === null || _formulaList$fun$name2 === void 0 ? void 0 : _formulaList$fun$name2.example]
179
185
  })]
180
186
  })]
181
187
  }), fun === null || fun === void 0 || (_fun$args = fun.args) === null || _fun$args === void 0 ? void 0 : _fun$args.map(function (v, i) {
182
188
  if (v.type === AtomsTypeEnum.COLLECTION) {
183
- var _formulaList$fun$name;
189
+ var _formulaList$fun$name3;
184
190
  return _jsxs("div", {
185
191
  className: 'Sqb-item-formula-args',
186
192
  children: [_jsxs("div", {
@@ -193,7 +199,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
193
199
  },
194
200
  children: ["\u53C2\u6570", i + 1, ":"]
195
201
  }), _jsx(FormulaList, {
196
- check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 || (_formulaList$fun$name = _formulaList$fun$name.args) === null || _formulaList$fun$name === void 0 || (_formulaList$fun$name = _formulaList$fun$name[i]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.check) || '',
202
+ check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name3 = formulaList[fun.name]) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3.args) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3[i]) === null || _formulaList$fun$name3 === void 0 ? void 0 : _formulaList$fun$name3.check) || '',
197
203
  value: v.list,
198
204
  data: data,
199
205
  ref: _ref,
package/lib/es/components/dialog/formula/utils.js CHANGED
@@ -4,8 +4,11 @@ export var getObjTem = function getObjTem(arr) {
4
4
  var obj = {};
5
5
  arr === null || arr === void 0 || arr.map(function (v) {
6
6
  v.children.map(function (vv) {
7
- if (vv.name) {
8
- obj[vv.name] = vv;
7
+ // if (vv.name) {
8
+ // obj[vv.name] = vv;
9
+ // }
10
+ if (vv.id) {
11
+ obj[vv.id] = vv;
9
12
  }
10
13
  });
11
14
  });
package/lib/es/components/dialog/formula-list/index.js CHANGED
@@ -947,6 +947,9 @@ var FormulaList = forwardRef(function (props, ref) {
947
947
  style: {
948
948
  pointerEvents: isCheck || store.isMetabaseCopy ? 'none' : 'auto'
949
949
  },
950
+ className: cx({
951
+ openCheck: isCheck
952
+ }),
950
953
  children: itemDom(v, i)
951
954
  }), selectOperator({
952
955
  triggerElement: function triggerElement(value) {
package/lib/es/components/dialog/formula-list/index.less CHANGED
@@ -35,6 +35,11 @@
35
35
  // transform: none;
36
36
  // }
37
37
  // }
38
+ .openCheck {
39
+ .Sqb-TableName {
40
+ padding-left: 20px;
41
+ }
42
+ }
38
43
  &.item-selected {
39
44
  .item-check {
40
45
  display: block;
package/lib/es/components/dialog/select-column-multiple/index.js CHANGED
@@ -328,25 +328,25 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
328
328
  className: cx("Sqb-List-section"),
329
329
  children: _jsx("div", {
330
330
  className: cx("Sqb-List-item mx-2", {
331
- active: isActive((v.id || v.name) + v.fieldAlias)
331
+ active: isActive((v.id || v.name) + (v.fieldAlias || ''))
332
332
  }),
333
333
  onClick: function onClick() {
334
334
  if (isSummarize) {
335
335
  // console.log(v, 'v');
336
336
  }
337
337
  changeValue(tableUuid, {
338
- tableName: tableItem.name,
339
- tableId: tableItem.id,
340
- tableNameZh: tableItem.name_zh,
341
- tableAlias: tableItem.alias,
342
- tableUuid: tableItem.tableUuid,
338
+ tableName: tableItem.name || '',
339
+ tableId: tableItem.id || '',
340
+ tableNameZh: tableItem.name_zh || '',
341
+ tableAlias: tableItem.alias || '',
342
+ tableUuid: tableItem.tableUuid || '',
343
343
  datasourceName: tableItem.datasourceName || '',
344
344
  datasourceId: tableItem.datasourceId || '',
345
- fieldName: v.name,
346
- fieldId: v.id || v.name,
345
+ fieldName: v.name || '',
346
+ fieldId: v.id || v.name || '',
347
347
  fieldNameZh: v.name_zh || '',
348
- fieldAlias: v.fieldAlias,
349
- fieldUuid: v.fieldUuid,
348
+ fieldAlias: v.fieldAlias || '',
349
+ fieldUuid: v.fieldUuid || '',
350
350
  type: AtomsTypeEnum.FIELD
351
351
  // quotes: v.fieldAlias || v.name,
352
352
  });
package/lib/es/components/metabase/index.less CHANGED
@@ -16,7 +16,7 @@
16
16
  &-fun-btns {
17
17
  position: absolute;
18
18
  left: 0;
19
- top: 7px;
19
+ top: 2px;
20
20
  display: flex;
21
21
  justify-content: end;
22
22
  width: 66.6667%;
package/lib/es/components/modules/custom-column.js CHANGED
@@ -176,8 +176,8 @@ var CustomColumn = function CustomColumn(props) {
176
176
  tableId: v.table2.id,
177
177
  tableUuid: v.table2.tableUuid || uuidv4('table'),
178
178
  columns: v.columns,
179
- datasourceId: mainTable.table.datasourceId,
180
- datasourceName: mainTable.table.datasourceName
179
+ datasourceId: v.table2.datasourceId,
180
+ datasourceName: v.table2.datasourceName
181
181
  });
182
182
  }));
183
183
  }
@@ -200,8 +200,8 @@ var CustomColumn = function CustomColumn(props) {
200
200
  tableId: v.table2.id,
201
201
  tableUuid: v.table2.tableUuid || uuidv4('table'),
202
202
  columns: v.columns,
203
- datasourceId: mainTable.table.datasourceId,
204
- datasourceName: mainTable.table.datasourceName
203
+ datasourceId: v.table2.datasourceId,
204
+ datasourceName: v.table2.datasourceName
205
205
  });
206
206
  } else {
207
207
  return {
package/lib/es/components/modules/filter.js CHANGED
@@ -91,8 +91,8 @@ var Filter = function Filter(props) {
91
91
  id: v.table2.id,
92
92
  tableUuid: v.table2.tableUuid || uuidv4('table'),
93
93
  columns: v.columns,
94
- datasourceId: mainTable.table.datasourceId,
95
- datasourceName: mainTable.table.datasourceName
94
+ datasourceId: v.table2.datasourceId,
95
+ datasourceName: v.table2.datasourceName
96
96
  };
97
97
  }));
98
98
  }
@@ -120,8 +120,8 @@ var Filter = function Filter(props) {
120
120
  id: v.table2.id,
121
121
  tableUuid: v.table2.tableUuid || uuidv4('table'),
122
122
  columns: v.columns,
123
- datasourceId: mainTable.table.datasourceId,
124
- datasourceName: mainTable.table.datasourceName
123
+ datasourceId: v.table2.datasourceId,
124
+ datasourceName: v.table2.datasourceName
125
125
  };
126
126
  } else {
127
127
  return {
package/lib/es/hooks/use-state.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
2
2
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
3
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
3
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
4
+ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
5
5
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
6
6
  var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
7
7
  import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -76,7 +76,7 @@ var useStore = function useStore() {
76
76
  var _useState15 = useState([]),
77
77
  _useState16 = _slicedToArray(_useState15, 2),
78
78
  formulaTemplates = _useState16[0],
79
- setFormulaTemplates = _useState16[1]; //公式配置数组
79
+ _setFormulaTemplates = _useState16[1]; //公式配置数组
80
80
  var _useState17 = useState(false),
81
81
  _useState18 = _slicedToArray(_useState17, 2),
82
82
  ignoreGroupByType = _useState18[0],
@@ -185,6 +185,19 @@ var useStore = function useStore() {
185
185
  _useState66 = _slicedToArray(_useState65, 2),
186
186
  metabaseCopyModule = _useState66[0],
187
187
  setMetabaseCopyModule = _useState66[1]; // 复制的内容
188
+ var setFormulaTemplates = function setFormulaTemplates(data) {
189
+ var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
190
+ var children = v.children.map(function (vv) {
191
+ return _objectSpread(_objectSpread({}, vv), {}, {
192
+ id: vv.id || vv.name
193
+ });
194
+ });
195
+ return _objectSpread(_objectSpread({}, v), {}, {
196
+ children: children
197
+ });
198
+ });
199
+ _setFormulaTemplates(newData);
200
+ };
188
201
  // 外层ref
189
202
  var popupContainer = useRef();
190
203
  // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
package/lib/es/store/types.d.ts CHANGED
@@ -71,6 +71,7 @@ export interface AtomsFormula {
71
71
  arity?: Arity;
72
72
  quotes: string;
73
73
  name: string;
74
+ id?: string;
74
75
  type: AtomsTypeEnum.FORMULA;
75
76
  }
76
77
  export interface AtomsExpression {
@@ -365,6 +366,7 @@ export interface PopupData {
365
366
  }
366
367
  export interface FormulaTemplatesItem {
367
368
  name: string;
369
+ id: string;
368
370
  args: {
369
371
  type: AtomsTypeEnum;
370
372
  check?: string | null;
package/lib/es/utils.js CHANGED
@@ -769,6 +769,7 @@ var _isError = function isError(item, data) {
769
769
  // 设置新字段信息
770
770
  export { _isError as isError };
771
771
  function setNewField(field, data) {
772
+ console.log('🚀 ~ setNewField ~ field:', field);
772
773
  var _iterator2 = _createForOfIteratorHelper(data),
773
774
  _step2;
774
775
  try {
@@ -790,6 +791,7 @@ function setNewField(field, data) {
790
791
  var matchedColumn = table.columns.find(function (col) {
791
792
  return col.name === field.fieldName;
792
793
  });
794
+ console.log('🚀 ~ setNewField ~ matchedColumn:', matchedColumn);
793
795
  if (matchedColumn) {
794
796
  field.fieldId = matchedColumn.id || '';
795
797
  field.fieldNameZh = matchedColumn.name_zh || '';
@@ -804,6 +806,7 @@ function setNewField(field, data) {
804
806
  } finally {
805
807
  _iterator2.f();
806
808
  }
809
+ console.log('🚀 ~ setNewField ~ field:', field);
807
810
  return field;
808
811
  }
809
812
  // 复制字段别名后修改对应的表id或字段id的别名
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.88",
3
+ "version": "1.0.90",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",