@gingkoo/pandora-metabase 1.0.98 → 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.
@@ -44,17 +44,19 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
44
44
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
45
45
  fun = _useState2[0],
46
46
  setFun = _useState2[1];
47
- var _useState3 = (0, _react.useState)((0, _utils2.getObjTem)(store.formulaTemplates)),
48
- _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
49
- formulaList = _useState4[0],
50
- setFunctionList = _useState4[1];
51
- var _useState5 = (0, _react.useState)({
47
+ // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
48
+ // getObjTem(store.formulaTemplates),
49
+ // );
50
+ var formulaList = (0, _react.useMemo)(function () {
51
+ return (0, _utils2.getObjTem)(store.formulaTemplates);
52
+ }, [store.formulaTemplates]);
53
+ var _useState3 = (0, _react.useState)({
52
54
  canAdd: true,
53
55
  canDel: true
54
56
  }),
55
- _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
56
- formulaOpr = _useState6[0],
57
- setFormulaOpr = _useState6[1];
57
+ _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
58
+ formulaOpr = _useState4[0],
59
+ setFormulaOpr = _useState4[1];
58
60
  (0, _react.useEffect)(function () {
59
61
  setFormulaOpr((0, _utils2.getParamActions)(fun.args, fun.arity));
60
62
  }, [fun]);
@@ -100,17 +100,18 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
100
100
  _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
101
101
  isCopy = _useState8[0],
102
102
  setIsCopy = _useState8[1];
103
- var _useState9 = (0, _react.useState)((0, _utils.getObjTem)(store.formulaTemplates)),
104
- _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
105
- formulaList = _useState0[0],
106
- setFunctionList = _useState0[1];
103
+ // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
104
+ // );
105
+ var formulaList = (0, _react.useMemo)(function () {
106
+ return (0, _utils.getObjTem)(store.formulaTemplates);
107
+ }, [store.formulaTemplates]);
107
108
  (0, _react.useEffect)(function () {
108
109
  setOldCode(getPreviewStr(caseList));
109
110
  }, []);
110
- var _useState1 = (0, _react.useState)(''),
111
- _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
112
- filterVal = _useState10[0],
113
- setFilterVal = _useState10[1];
111
+ var _useState9 = (0, _react.useState)(''),
112
+ _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
113
+ filterVal = _useState0[0],
114
+ setFilterVal = _useState0[1];
114
115
  var setCaseList = function setCaseList(data) {
115
116
  var quotes = data.map(function (v, i) {
116
117
  if (v !== null && v !== void 0 && v.quotes) {
@@ -125,35 +126,35 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
125
126
  caseList = data;
126
127
  caseListRef.current = data;
127
128
  };
128
- var _useState11 = (0, _react.useState)(-1),
129
- _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
130
- ind = _useState12[0],
131
- setInd = _useState12[1];
129
+ var _useState1 = (0, _react.useState)(-1),
130
+ _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
131
+ ind = _useState10[0],
132
+ setInd = _useState10[1];
132
133
  var filterCustomType = store.filterCustomType;
133
134
  var _ref = (0, _react.useRef)(null);
134
- var _useState13 = (0, _react.useState)({
135
+ var _useState11 = (0, _react.useState)({
135
136
  isError: false
136
137
  }),
138
+ _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
139
+ errorInfo = _useState12[0],
140
+ setErrorInfo = _useState12[1];
141
+ var _useState13 = (0, _react.useState)(false),
137
142
  _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
138
- errorInfo = _useState14[0],
139
- setErrorInfo = _useState14[1];
140
- var _useState15 = (0, _react.useState)(false),
141
- _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
142
- isCheck = _useState16[0],
143
- setIsCheck = _useState16[1];
143
+ isCheck = _useState14[0],
144
+ setIsCheck = _useState14[1];
144
145
  var myInstanceIdRef = (0, _react.useRef)(Math.random().toString(36).slice(2));
145
- var _useState17 = (0, _react.useState)(!!window.__sqb_selection_active__),
146
+ var _useState15 = (0, _react.useState)(!!window.__sqb_selection_active__),
147
+ _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
148
+ globalSelectionActive = _useState16[0],
149
+ setGlobalSelectionActive = _useState16[1];
150
+ var _useState17 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
146
151
  _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
147
- globalSelectionActive = _useState18[0],
148
- setGlobalSelectionActive = _useState18[1];
149
- var _useState19 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
152
+ globalSelectionOwner = _useState18[0],
153
+ setGlobalSelectionOwner = _useState18[1];
154
+ var _useState19 = (0, _react.useState)([]),
150
155
  _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
151
- globalSelectionOwner = _useState20[0],
152
- setGlobalSelectionOwner = _useState20[1];
153
- var _useState21 = (0, _react.useState)([]),
154
- _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
155
- selectedIndices = _useState22[0],
156
- setSelectedIndices = _useState22[1];
156
+ selectedIndices = _useState20[0],
157
+ setSelectedIndices = _useState20[1];
157
158
  (0, _react.useEffect)(function () {
158
159
  var leftBrackets = caseList.filter(function (v) {
159
160
  return v.type === _types.AtomsTypeEnum.OPERATOR && v.val === '(';
@@ -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 newMetaList = store.metaList[groupIndex].list.slice();
386
- newMetaList[index].columns = data;
387
- store.setMeta(newMetaList, groupIndex, {
388
- obj: data,
389
- type: _types.ChangeType.field
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
- var newMetaList = store.metaList[groupIndex].list.slice();
131
+ onChange: function onChange(data, newMetaList) {
132
+ // 当前值已改变。必须以传入的数组为准,改变别名
133
+ var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
133
134
  // @ts-ignore
134
- newMetaList[0].columns = data;
135
- store.setMeta(newMetaList, groupIndex, {
136
- obj: data,
137
- type: _types.ChangeType.columns
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
  });
@@ -222,6 +222,7 @@ export interface MetaJoin {
222
222
  }
223
223
  export interface MetaCustom_Item {
224
224
  name: string;
225
+ id?: string;
225
226
  type?: string;
226
227
  formulaList?: AtomsItem[];
227
228
  }
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
- // fieldUuid: uuidv4('field'),
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$_datasourceId3 = tables[_datasourceId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3[tableId + tableAlias]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3.filter(function (v) {
779
- return v.name === fieldName && v.id === fieldId;
780
- })) === null || _tables$_datasourceId3 === void 0 ? void 0 : _tables$_datasourceId3.length) > 0;
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
  }
@@ -36,17 +36,19 @@ var CaseEditor = React.forwardRef(function (props, ref) {
36
36
  _useState2 = _slicedToArray(_useState, 2),
37
37
  fun = _useState2[0],
38
38
  setFun = _useState2[1];
39
- var _useState3 = useState(getObjTem(store.formulaTemplates)),
40
- _useState4 = _slicedToArray(_useState3, 2),
41
- formulaList = _useState4[0],
42
- setFunctionList = _useState4[1];
43
- var _useState5 = useState({
39
+ // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
40
+ // getObjTem(store.formulaTemplates),
41
+ // );
42
+ var formulaList = useMemo(function () {
43
+ return getObjTem(store.formulaTemplates);
44
+ }, [store.formulaTemplates]);
45
+ var _useState3 = useState({
44
46
  canAdd: true,
45
47
  canDel: true
46
48
  }),
47
- _useState6 = _slicedToArray(_useState5, 2),
48
- formulaOpr = _useState6[0],
49
- setFormulaOpr = _useState6[1];
49
+ _useState4 = _slicedToArray(_useState3, 2),
50
+ formulaOpr = _useState4[0],
51
+ setFormulaOpr = _useState4[1];
50
52
  useEffect(function () {
51
53
  setFormulaOpr(getParamActions(fun.args, fun.arity));
52
54
  }, [fun]);
@@ -92,17 +92,18 @@ var FormulaList = forwardRef(function (props, ref) {
92
92
  _useState8 = _slicedToArray(_useState7, 2),
93
93
  isCopy = _useState8[0],
94
94
  setIsCopy = _useState8[1];
95
- var _useState9 = useState(getObjTem(store.formulaTemplates)),
96
- _useState0 = _slicedToArray(_useState9, 2),
97
- formulaList = _useState0[0],
98
- setFunctionList = _useState0[1];
95
+ // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
96
+ // );
97
+ var formulaList = useMemo(function () {
98
+ return getObjTem(store.formulaTemplates);
99
+ }, [store.formulaTemplates]);
99
100
  useEffect(function () {
100
101
  setOldCode(getPreviewStr(caseList));
101
102
  }, []);
102
- var _useState1 = useState(''),
103
- _useState10 = _slicedToArray(_useState1, 2),
104
- filterVal = _useState10[0],
105
- setFilterVal = _useState10[1];
103
+ var _useState9 = useState(''),
104
+ _useState0 = _slicedToArray(_useState9, 2),
105
+ filterVal = _useState0[0],
106
+ setFilterVal = _useState0[1];
106
107
  var setCaseList = function setCaseList(data) {
107
108
  var quotes = data.map(function (v, i) {
108
109
  if (v !== null && v !== void 0 && v.quotes) {
@@ -117,35 +118,35 @@ var FormulaList = forwardRef(function (props, ref) {
117
118
  caseList = data;
118
119
  caseListRef.current = data;
119
120
  };
120
- var _useState11 = useState(-1),
121
- _useState12 = _slicedToArray(_useState11, 2),
122
- ind = _useState12[0],
123
- setInd = _useState12[1];
121
+ var _useState1 = useState(-1),
122
+ _useState10 = _slicedToArray(_useState1, 2),
123
+ ind = _useState10[0],
124
+ setInd = _useState10[1];
124
125
  var filterCustomType = store.filterCustomType;
125
126
  var _ref = useRef(null);
126
- var _useState13 = useState({
127
+ var _useState11 = useState({
127
128
  isError: false
128
129
  }),
130
+ _useState12 = _slicedToArray(_useState11, 2),
131
+ errorInfo = _useState12[0],
132
+ setErrorInfo = _useState12[1];
133
+ var _useState13 = useState(false),
129
134
  _useState14 = _slicedToArray(_useState13, 2),
130
- errorInfo = _useState14[0],
131
- setErrorInfo = _useState14[1];
132
- var _useState15 = useState(false),
133
- _useState16 = _slicedToArray(_useState15, 2),
134
- isCheck = _useState16[0],
135
- setIsCheck = _useState16[1];
135
+ isCheck = _useState14[0],
136
+ setIsCheck = _useState14[1];
136
137
  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
137
- var _useState17 = useState(!!window.__sqb_selection_active__),
138
+ var _useState15 = useState(!!window.__sqb_selection_active__),
139
+ _useState16 = _slicedToArray(_useState15, 2),
140
+ globalSelectionActive = _useState16[0],
141
+ setGlobalSelectionActive = _useState16[1];
142
+ var _useState17 = useState(window.__sqb_selection_owner__ || null),
138
143
  _useState18 = _slicedToArray(_useState17, 2),
139
- globalSelectionActive = _useState18[0],
140
- setGlobalSelectionActive = _useState18[1];
141
- var _useState19 = useState(window.__sqb_selection_owner__ || null),
144
+ globalSelectionOwner = _useState18[0],
145
+ setGlobalSelectionOwner = _useState18[1];
146
+ var _useState19 = useState([]),
142
147
  _useState20 = _slicedToArray(_useState19, 2),
143
- globalSelectionOwner = _useState20[0],
144
- setGlobalSelectionOwner = _useState20[1];
145
- var _useState21 = useState([]),
146
- _useState22 = _slicedToArray(_useState21, 2),
147
- selectedIndices = _useState22[0],
148
- setSelectedIndices = _useState22[1];
148
+ selectedIndices = _useState20[0],
149
+ setSelectedIndices = _useState20[1];
149
150
  useEffect(function () {
150
151
  var leftBrackets = caseList.filter(function (v) {
151
152
  return v.type === AtomsTypeEnum.OPERATOR && v.val === '(';
@@ -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 newMetaList = store.metaList[groupIndex].list.slice();
381
- newMetaList[index].columns = data;
382
- store.setMeta(newMetaList, groupIndex, {
383
- obj: data,
384
- type: ChangeType.field
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
- var newMetaList = store.metaList[groupIndex].list.slice();
125
+ onChange: function onChange(data, newMetaList) {
126
+ // 当前值已改变。必须以传入的数组为准,改变别名
127
+ var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
127
128
  // @ts-ignore
128
- newMetaList[0].columns = data;
129
- store.setMeta(newMetaList, groupIndex, {
130
- obj: data,
131
- type: ChangeType.columns
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
  });
@@ -222,6 +222,7 @@ export interface MetaJoin {
222
222
  }
223
223
  export interface MetaCustom_Item {
224
224
  name: string;
225
+ id?: string;
225
226
  type?: string;
226
227
  formulaList?: AtomsItem[];
227
228
  }
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
- // fieldUuid: uuidv4('field'),
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$_datasourceId3 = tables[_datasourceId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3[tableId + tableAlias]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3.filter(function (v) {
766
- return v.name === fieldName && v.id === fieldId;
767
- })) === null || _tables$_datasourceId3 === void 0 ? void 0 : _tables$_datasourceId3.length) > 0;
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
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.98",
3
+ "version": "1.0.100",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",