@gingkoo/pandora-metabase 1.0.99 → 1.0.101

package/lib/cjs/components/dialog/formula-list/index.js

@@ -641,20 +641,23 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         }, index)
       }, index);
     } else if (v.type === _types.AtomsTypeEnum.SUB_QUERY) {
-      return (0, _jsxRuntime.jsxs)("div", {
-        className: "Sqb-TableName purple-name",
-        onClick: function onClick(e) {
-          return showSubQuery(index);
-        },
-        children: [v.label || (0, _locale.__)('SqlQueryBuilder.subquery'), (0, _jsxRuntime.jsx)("span", {
-          style: {
-            fontSize: 0
-          },
+      return (0, _jsxRuntime.jsx)(_itemName["default"], {
+        isError: (0, _utils2.isExistsError)(v.subQuery, store.existsError),
+        children: (0, _jsxRuntime.jsxs)("div", {
+          className: "Sqb-TableName purple-name",
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return showSubQuery(index);
           },
-          children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-        })]
+          children: [v.label || (0, _locale.__)('SqlQueryBuilder.subquery'), (0, _jsxRuntime.jsx)("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+          })]
+        }, index)
       }, index);
     } else if (type === _types.AtomsTypeEnum.FIELD) {
       // 字段

package/lib/cjs/components/dialog/select-column/index.d.ts

@@ -9,7 +9,7 @@ import { MetaData_ColumnsType } from '../../../store/types';
 interface PropsType {
     data: MetaData_ColumnsType[];
     groupIndex: number;
-    onChange: (record: MetaData_ColumnsType[]) => void;
+    onChange: (record: MetaData_ColumnsType[], newMetaList?: any[]) => void;
 }
 declare const SelectColumn: ({ data, groupIndex, onChange }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectColumn;

package/lib/cjs/components/dialog/select-column/index.js

@@ -83,7 +83,7 @@ var SelectColumn = function SelectColumn(_ref) {
       });
     }
   }, [isAllSelect]);
-  function onSelect(columns) {
+  function onSelect(columns, newMetaList) {
     var originalData = (0, _cloneDeep["default"])(originList); // 原始数据
     var mergedColumns = originalData.map(function (item) {
       var match = columns.find(function (col) {
@@ -93,7 +93,7 @@ var SelectColumn = function SelectColumn(_ref) {
     });
     setColumns(columns);
     setOriginList(mergedColumns);
-    typeof onChange === 'function' && onChange(mergedColumns);
+    typeof onChange === 'function' && onChange(mergedColumns, newMetaList);
   }
   var onChangeFieldAlias = function onChangeFieldAlias(val, i) {
     var fieldAlias = val || '';
@@ -128,7 +128,7 @@ var SelectColumn = function SelectColumn(_ref) {
                   obj: newColumns[i],
                   type: _types.ChangeType.fieldAlias
                 });
-                onSelect(newColumns);
+                onSelect(newColumns, newMetaList);
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);

package/lib/cjs/components/modules/custom-column.js

@@ -333,7 +333,7 @@ var CustomColumn = function CustomColumn(props) {
             className: "Sqb-NotebookCell gray-bg",
             children: [meta.customColumn.map(function (v, i) {
               return (0, _jsxRuntime.jsx)(_itemName["default"], {
-                isError: (0, _utils.isError)(v.formulaList, getColumns()),
+                isError: (0, _utils.isError)(v.formulaList, getColumns()) || (0, _utils.isExistsError)(v.formulaList, store.existsError),
                 children: (0, _jsxRuntime.jsxs)("div", {
                   className: (0, _classnames["default"])("Sqb-TableName gray-name"),
                   onClick: function onClick(e) {

package/lib/cjs/components/modules/join-data.js

@@ -381,13 +381,15 @@ var JoinData = function JoinData(props) {
       content: (0, _jsxRuntime.jsx)(_dialog.SelectColumn, {
         data: columns,
         groupIndex: groupIndex,
-        onChange: function onChange(data) {
-          var newMetaList = store.metaList[groupIndex].list.slice();
-          newMetaList[index].columns = data;
-          store.setMeta(newMetaList, groupIndex, {
-            obj: data,
-            type: _types.ChangeType.field
-          });
+        onChange: function onChange(data, newMetaList) {
+          var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
+          _newMetaList[index].columns = data;
+          if (!newMetaList) {
+            store.setMeta(_newMetaList, groupIndex, {
+              obj: data,
+              type: _types.ChangeType.field
+            });
+          }
         }
       })
     });

package/lib/cjs/components/modules/table-data.js

@@ -23,6 +23,7 @@ var _utils = require("../../utils");
 var _pandoraIcons = require("@gingkoo/pandora-icons");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _itemName = _interopRequireDefault(require("./components/item-name"));
 var _dialog = require("../dialog");
 var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
 var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
@@ -128,14 +129,17 @@ var TableData = function TableData(props) {
       content: (0, _jsxRuntime.jsx)(_dialog.SelectColumn, {
         groupIndex: groupIndex,
         data: columns,
-        onChange: function onChange(data) {
-          var newMetaList = store.metaList[groupIndex].list.slice();
+        onChange: function onChange(data, newMetaList) {
+          // 当前值已改变。必须以传入的数组为准，改变别名
+          var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
           // @ts-ignore
-          newMetaList[0].columns = data;
-          store.setMeta(newMetaList, groupIndex, {
-            obj: data,
-            type: _types.ChangeType.columns
-          });
+          _newMetaList[0].columns = data;
+          if (!newMetaList) {
+            store.setMeta(_newMetaList, groupIndex, {
+              obj: data,
+              type: _types.ChangeType.columns
+            });
+          }
         }
       })
     });
@@ -308,46 +312,49 @@ var TableData = function TableData(props) {
           className: "Sqb-item--content",
           children: (0, _jsxRuntime.jsxs)("div", {
             className: "Sqb-NotebookCell",
-            children: [meta.isSubquery ? (0, _jsxRuntime.jsxs)("div", {
-              className: (0, _classnames["default"])("Sqb-TableName", {
-                notSelected: !subQuerySelected
-              }),
-              onClick: function onClick() {
-                showSubQuery(meta.subquery);
-              },
-              children: [subQuerySelected && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-                children: function () {
-                  var showButton = store.tableEnableAlias || tableIsError() && isDel;
-                  var icon = isDel ? (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
-                  return showButton ? (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-                    title: (0, _locale.__)(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
-                    children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                      danger: tableIsError(),
-                      className: (0, _classnames["default"])(':Sqb-TableName-as', {
-                        isError: tableIsError()
-                      }),
-                      shape: 'circle',
-                      style: isDel ? {
-                        fontSize: 18,
-                        backgroundColor: '#fff',
-                        width: 'auto',
-                        height: 'auto'
-                      } : {},
-                      iconOnly: true,
-                      primary: !isDel,
-                      icon: icon,
-                      size: 'small',
-                      onClick: function onClick(e) {
-                        if (store.tableEnableAlias) {
-                          var _meta$table4;
-                          e.stopPropagation();
-                          onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+            children: [meta.isSubquery ? (0, _jsxRuntime.jsx)(_itemName["default"], {
+              isError: (0, _utils.isExistsError)(meta.subquery || [], store.existsError),
+              children: (0, _jsxRuntime.jsxs)("div", {
+                className: (0, _classnames["default"])("Sqb-TableName", {
+                  notSelected: !subQuerySelected
+                }),
+                onClick: function onClick() {
+                  showSubQuery(meta.subquery);
+                },
+                children: [subQuerySelected && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+                  children: function () {
+                    var showButton = store.tableEnableAlias || tableIsError() && isDel;
+                    var icon = isDel ? (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
+                    return showButton ? (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+                      title: (0, _locale.__)(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
+                      children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+                        danger: tableIsError(),
+                        className: (0, _classnames["default"])(':Sqb-TableName-as', {
+                          isError: tableIsError()
+                        }),
+                        shape: 'circle',
+                        style: isDel ? {
+                          fontSize: 18,
+                          backgroundColor: '#fff',
+                          width: 'auto',
+                          height: 'auto'
+                        } : {},
+                        iconOnly: true,
+                        primary: !isDel,
+                        icon: icon,
+                        size: 'small',
+                        onClick: function onClick(e) {
+                          if (store.tableEnableAlias) {
+                            var _meta$table4;
+                            e.stopPropagation();
+                            onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                          }
                         }
-                      }
-                    })
-                  }) : null;
-                }()
-              }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
+                      })
+                    }) : null;
+                  }()
+                }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
+              })
             }) : (0, _jsxRuntime.jsxs)("div", {
               className: (0, _classnames["default"])("Sqb-TableName", {
                 notSelected: !selected

package/lib/cjs/store/types.d.ts

@@ -222,6 +222,7 @@ export interface MetaJoin {
 }
 export interface MetaCustom_Item {
     name: string;
+    id?: string;
     type?: string;
     formulaList?: AtomsItem[];
 }

package/lib/cjs/utils.js

@@ -240,10 +240,11 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
           return {
             database_type: _enum.SQL_COLUMN_TYPE.STRING,
             name_zh: v.name,
+            id: v.id || v.name,
             name: v.name,
             select: true,
-            fieldAlias: ''
-            // fieldUuid: uuidv4('field'),
+            fieldAlias: '',
+            fieldUuid: (0, _helper2.uuidv4)('field')
           };
         });
         return {
@@ -447,7 +448,6 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
     }
     if (v.type === _enum.TypeEnum.filter) {
       if (v.filter && v.filter.length > 0) {
-        console.log(v.filter);
         v.filter = _changeAlias(v.filter, {
           uuid: uuid,
           alias: alias
@@ -770,14 +770,17 @@ var _isError = exports.isError = function isError(item, data) {
       } else {
         var _tables$_datasourceId2;
         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) {
+          if (field.id === undefined) {
+            return field.name !== fieldName;
+          }
           return field.name !== fieldName || field.id !== fieldId;
         });
       }
     } else {
-      var _tables$_datasourceId3;
-      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) {
-        return v.name === fieldName && v.id === fieldId;
-      })) === null || _tables$_datasourceId3 === void 0 ? void 0 : _tables$_datasourceId3.length) > 0;
+      var _tables$_datasourceId3, _tables$_datasourceId4;
+      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) {
+        return v.name === fieldName && (v.id === undefined || v.id === fieldId);
+      })) !== null && _tables$_datasourceId3 !== void 0 ? _tables$_datasourceId3 : false;
       return !hasField; // 注意：返回 true 表示“有错误”
     }
   }

package/lib/es/components/dialog/formula-list/index.js

@@ -633,20 +633,23 @@ var FormulaList = forwardRef(function (props, ref) {
         }, index)
       }, index);
     } else if (v.type === AtomsTypeEnum.SUB_QUERY) {
-      return _jsxs("div", {
-        className: "Sqb-TableName purple-name",
-        onClick: function onClick(e) {
-          return showSubQuery(index);
-        },
-        children: [v.label || __('SqlQueryBuilder.subquery'), _jsx("span", {
-          style: {
-            fontSize: 0
-          },
+      return _jsx(ItemName, {
+        isError: isExistsError(v.subQuery, store.existsError),
+        children: _jsxs("div", {
+          className: "Sqb-TableName purple-name",
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return showSubQuery(index);
           },
-          children: _jsx(CloseIcon, {})
-        })]
+          children: [v.label || __('SqlQueryBuilder.subquery'), _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        }, index)
       }, index);
     } else if (type === AtomsTypeEnum.FIELD) {
       // 字段

package/lib/es/components/dialog/select-column/index.d.ts

@@ -9,7 +9,7 @@ import { MetaData_ColumnsType } from '../../../store/types';
 interface PropsType {
     data: MetaData_ColumnsType[];
     groupIndex: number;
-    onChange: (record: MetaData_ColumnsType[]) => void;
+    onChange: (record: MetaData_ColumnsType[], newMetaList?: any[]) => void;
 }
 declare const SelectColumn: ({ data, groupIndex, onChange }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectColumn;

package/lib/es/components/dialog/select-column/index.js

@@ -76,7 +76,7 @@ var SelectColumn = function SelectColumn(_ref) {
       });
     }
   }, [isAllSelect]);
-  function onSelect(columns) {
+  function onSelect(columns, newMetaList) {
     var originalData = cloneDeep(originList); // 原始数据
     var mergedColumns = originalData.map(function (item) {
       var match = columns.find(function (col) {
@@ -86,7 +86,7 @@ var SelectColumn = function SelectColumn(_ref) {
     });
     setColumns(columns);
     setOriginList(mergedColumns);
-    typeof onChange === 'function' && onChange(mergedColumns);
+    typeof onChange === 'function' && onChange(mergedColumns, newMetaList);
   }
   var onChangeFieldAlias = function onChangeFieldAlias(val, i) {
     var fieldAlias = val || '';
@@ -121,7 +121,7 @@ var SelectColumn = function SelectColumn(_ref) {
                   obj: newColumns[i],
                   type: ChangeType.fieldAlias
                 });
-                onSelect(newColumns);
+                onSelect(newColumns, newMetaList);
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);

package/lib/es/components/modules/custom-column.js

@@ -7,7 +7,7 @@ import { Modal2 } from '@gingkoo/pandora';
 import { Provider } from '../../hooks/use-provider';
 import cx from 'classnames';
 import { __ } from '../../locale';
-import { findIndex, isError } from '../../utils';
+import { findIndex, isError, isExistsError } from '../../utils';
 import { sleep, flatArray } from '../../utils/helper';
 import { ChangeType } from '../../store/types';
 import { getHelper } from '../../utils';
@@ -329,7 +329,7 @@ var CustomColumn = function CustomColumn(props) {
             className: "Sqb-NotebookCell gray-bg",
             children: [meta.customColumn.map(function (v, i) {
               return _jsx(ItemName, {
-                isError: isError(v.formulaList, getColumns()),
+                isError: isError(v.formulaList, getColumns()) || isExistsError(v.formulaList, store.existsError),
                 children: _jsxs("div", {
                   className: cx("Sqb-TableName gray-name"),
                   onClick: function onClick(e) {

package/lib/es/components/modules/join-data.js

@@ -376,13 +376,15 @@ var JoinData = function JoinData(props) {
       content: _jsx(SelectColumn, {
         data: columns,
         groupIndex: groupIndex,
-        onChange: function onChange(data) {
-          var newMetaList = store.metaList[groupIndex].list.slice();
-          newMetaList[index].columns = data;
-          store.setMeta(newMetaList, groupIndex, {
-            obj: data,
-            type: ChangeType.field
-          });
+        onChange: function onChange(data, newMetaList) {
+          var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
+          _newMetaList[index].columns = data;
+          if (!newMetaList) {
+            store.setMeta(_newMetaList, groupIndex, {
+              obj: data,
+              type: ChangeType.field
+            });
+          }
         }
       })
     });

package/lib/es/components/modules/table-data.js

@@ -13,10 +13,11 @@ import { ChangeType } from '../../store/types';
 import { Tooltip, Button, Modal, Modal2, Input, Toast } from '@gingkoo/pandora';
 import Metabase from '../../index';
 import { uuidv4, getAlias } from '../../utils/helper';
-import { changeTableAlias, getSubColumns, isValidSQLAlias } from '../../utils';
+import { changeTableAlias, getSubColumns, isValidSQLAlias, isExistsError } from '../../utils';
 import { RelatedWork } from '@gingkoo/pandora-icons';
 import cloneDeep from 'lodash/cloneDeep';
 import isEqual from 'lodash/isEqual';
+import ItemName from './components/item-name';
 import { SelectTable, SelectColumn } from '../dialog';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
@@ -122,14 +123,17 @@ var TableData = function TableData(props) {
       content: _jsx(SelectColumn, {
         groupIndex: groupIndex,
         data: columns,
-        onChange: function onChange(data) {
-          var newMetaList = store.metaList[groupIndex].list.slice();
+        onChange: function onChange(data, newMetaList) {
+          // 当前值已改变。必须以传入的数组为准，改变别名
+          var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
           // @ts-ignore
-          newMetaList[0].columns = data;
-          store.setMeta(newMetaList, groupIndex, {
-            obj: data,
-            type: ChangeType.columns
-          });
+          _newMetaList[0].columns = data;
+          if (!newMetaList) {
+            store.setMeta(_newMetaList, groupIndex, {
+              obj: data,
+              type: ChangeType.columns
+            });
+          }
         }
       })
     });
@@ -302,46 +306,49 @@ var TableData = function TableData(props) {
           className: "Sqb-item--content",
           children: _jsxs("div", {
             className: "Sqb-NotebookCell",
-            children: [meta.isSubquery ? _jsxs("div", {
-              className: cx("Sqb-TableName", {
-                notSelected: !subQuerySelected
-              }),
-              onClick: function onClick() {
-                showSubQuery(meta.subquery);
-              },
-              children: [subQuerySelected && _jsx(_Fragment, {
-                children: function () {
-                  var showButton = store.tableEnableAlias || tableIsError() && isDel;
-                  var icon = isDel ? _jsx(ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
-                  return showButton ? _jsx(Tooltip, {
-                    title: __(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
-                    children: _jsx(Button, {
-                      danger: tableIsError(),
-                      className: cx(':Sqb-TableName-as', {
-                        isError: tableIsError()
-                      }),
-                      shape: 'circle',
-                      style: isDel ? {
-                        fontSize: 18,
-                        backgroundColor: '#fff',
-                        width: 'auto',
-                        height: 'auto'
-                      } : {},
-                      iconOnly: true,
-                      primary: !isDel,
-                      icon: icon,
-                      size: 'small',
-                      onClick: function onClick(e) {
-                        if (store.tableEnableAlias) {
-                          var _meta$table4;
-                          e.stopPropagation();
-                          onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+            children: [meta.isSubquery ? _jsx(ItemName, {
+              isError: isExistsError(meta.subquery || [], store.existsError),
+              children: _jsxs("div", {
+                className: cx("Sqb-TableName", {
+                  notSelected: !subQuerySelected
+                }),
+                onClick: function onClick() {
+                  showSubQuery(meta.subquery);
+                },
+                children: [subQuerySelected && _jsx(_Fragment, {
+                  children: function () {
+                    var showButton = store.tableEnableAlias || tableIsError() && isDel;
+                    var icon = isDel ? _jsx(ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
+                    return showButton ? _jsx(Tooltip, {
+                      title: __(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
+                      children: _jsx(Button, {
+                        danger: tableIsError(),
+                        className: cx(':Sqb-TableName-as', {
+                          isError: tableIsError()
+                        }),
+                        shape: 'circle',
+                        style: isDel ? {
+                          fontSize: 18,
+                          backgroundColor: '#fff',
+                          width: 'auto',
+                          height: 'auto'
+                        } : {},
+                        iconOnly: true,
+                        primary: !isDel,
+                        icon: icon,
+                        size: 'small',
+                        onClick: function onClick(e) {
+                          if (store.tableEnableAlias) {
+                            var _meta$table4;
+                            e.stopPropagation();
+                            onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                          }
                         }
-                      }
-                    })
-                  }) : null;
-                }()
-              }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+                      })
+                    }) : null;
+                  }()
+                }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+              })
             }) : _jsxs("div", {
               className: cx("Sqb-TableName", {
                 notSelected: !selected

package/lib/es/store/types.d.ts

@@ -222,6 +222,7 @@ export interface MetaJoin {
 }
 export interface MetaCustom_Item {
     name: string;
+    id?: string;
     type?: string;
     formulaList?: AtomsItem[];
 }

package/lib/es/utils.js

@@ -227,10 +227,11 @@ export var getSubColumns = function getSubColumns(metaList) {
           return {
             database_type: SQL_COLUMN_TYPE.STRING,
             name_zh: v.name,
+            id: v.id || v.name,
             name: v.name,
             select: true,
-            fieldAlias: ''
-            // fieldUuid: uuidv4('field'),
+            fieldAlias: '',
+            fieldUuid: uuidv4('field')
           };
         });
         return {
@@ -434,7 +435,6 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
     }
     if (v.type === TypeEnum.filter) {
       if (v.filter && v.filter.length > 0) {
-        console.log(v.filter);
         v.filter = _changeAlias(v.filter, {
           uuid: uuid,
           alias: alias
@@ -757,14 +757,17 @@ var _isError = function isError(item, data) {
       } else {
         var _tables$_datasourceId2;
         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) {
+          if (field.id === undefined) {
+            return field.name !== fieldName;
+          }
           return field.name !== fieldName || field.id !== fieldId;
         });
       }
     } else {
-      var _tables$_datasourceId3;
-      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) {
-        return v.name === fieldName && v.id === fieldId;
-      })) === null || _tables$_datasourceId3 === void 0 ? void 0 : _tables$_datasourceId3.length) > 0;
+      var _tables$_datasourceId3, _tables$_datasourceId4;
+      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) {
+        return v.name === fieldName && (v.id === undefined || v.id === fieldId);
+      })) !== null && _tables$_datasourceId3 !== void 0 ? _tables$_datasourceId3 : false;
       return !hasField; // 注意：返回 true 表示“有错误”
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.99",
+  "version": "1.0.101",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",