@gingkoo/pandora-metabase 1.0.36 → 1.0.38

package/lib/cjs/components/dialog/custom-editor/index.d.ts

@@ -3,6 +3,7 @@ import { MetaCustom_Item } from '../../../store/types';
 interface PropsType {
     value: MetaCustom_Item;
     data: any;
+    exitData: any;
     onOk: Function;
     onCancel: Function;
 }

package/lib/cjs/components/dialog/custom-editor/index.js

@@ -23,6 +23,7 @@ var VisualBox = _styledComponents["default"].div.attrs({
 var CaseEditor = function CaseEditor(props) {
   var value = props.value,
     data = props.data,
+    exitData = props.exitData,
     onOk = props.onOk,
     onCancel = props.onCancel;
   // const [popup, setPopup] = useState<PopupType>({ visible: false }); // 弹框信息
@@ -82,6 +83,7 @@ var CaseEditor = function CaseEditor(props) {
             isCustom: true,
             value: caseList,
             data: data,
+            exitData: exitData,
             ref: ref,
             onChange: setCaseList
           })]

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

@@ -158,6 +158,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         children: (0, _jsxRuntime.jsx)(_index["default"], (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, other), {}, {
           notExistsColumns: exitData,
           // showFields={false}
+          isExit: true,
           // showSubquery={subShowSubquery}
           toolbar: _toolbar,
           btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),

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

@@ -30,6 +30,7 @@ var CustomColumn = function CustomColumn(props) {
   var store = (0, _useProvider.useStore)();
   var customColumn = meta.customColumn;
   var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+  var notExistsColumns = store.preProps.notExistsColumns;
   function getAvailableColumns() {
     var newMeta = store.metaList[groupIndex].list.slice();
     var columns = [];
@@ -212,6 +213,19 @@ var CustomColumn = function CustomColumn(props) {
     }
     return data;
   }
+  // const getPreColumns = () => {
+  //   let data = [...getColumns(), ...cloneDeep(notExistsColumns || [])];
+  //   // 将source 拍到最前面
+  //   const priorityNames = ['source'];
+  //   const sorted = data.sort((a, b) => {
+  //     const aPriority = priorityNames.includes(a.name);
+  //     const bPriority = priorityNames.includes(b.name);
+  //     if (aPriority && !bPriority) return -1;
+  //     if (!aPriority && bPriority) return 1;
+  //     return 0;
+  //   });
+  //   return sorted;
+  // };
   // 自定义弹窗
   var showSubQuery = function showSubQuery(e, i) {
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -224,6 +238,8 @@ var CustomColumn = function CustomColumn(props) {
           value: store,
           children: (0, _jsxRuntime.jsx)(_customEditor["default"], {
             data: getColumns(),
+            // data={getPreColumns()}
+            exitData: getColumns(),
             value: _value,
             onCancel: function onCancel() {
               o.close();

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

@@ -31,7 +31,7 @@ var _selectList = _interopRequireDefault(require("../dialog/select-list"));
 var _icons = require("../icons");
 var _dialog = require("../dialog");
 var _useProvider = require("../../hooks/use-provider");
-var _excluded = ["subToolbar", "notExistsColumns", "toolbar"];
+var _excluded = ["subToolbar", "notExistsColumns", "isExit", "toolbar"];
 var PrevResult = 'Previous results';
 var operators = ['AND', 'OR', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '='];
 var FlagLocation;
@@ -338,13 +338,19 @@ var JoinData = function JoinData(props) {
         data: data,
         value: newMeta[index][table_type],
         onChange: function onChange(data) {
-          console.log('🚀 ~ selectLeftTable ~ data:', data);
           // if (table_type === FlagLocation.TABLE_1) {
-          if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name || newMeta[index][table_type].alias !== data.alias) {
-            newMeta[index][table_type] = data;
-            initExpressions();
-          }
+          // if (
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).datasourceId !==
+          //     data.datasourceId ||
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).name !==
+          //     data.name ||
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).alias !==
+          //     data.alias
+          // ) {
+          // }
           // }
+          newMeta[index][table_type] = data;
+          initExpressions();
           store.setMeta(newMeta, groupIndex);
           store.setPopup({
             visible: false
@@ -899,6 +905,7 @@ var JoinData = function JoinData(props) {
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
       notExistsColumns = _store$preProps2.notExistsColumns,
+      isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded);
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -1587,7 +1594,7 @@ var JoinData = function JoinData(props) {
                 icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfPlus, {})
               })
             })
-          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && store.showFields && (0, _jsxRuntime.jsx)("div", {
+          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && !store.isExit && store.showFields && (0, _jsxRuntime.jsx)("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: (0, _locale.__)('SqlQueryBuilder.columns')

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

@@ -25,7 +25,7 @@ var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
 var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
 var _header = _interopRequireDefault(require("./components/header"));
 var _useProvider = require("../../hooks/use-provider");
-var _excluded = ["subToolbar", "notExistsColumns", "toolbar"];
+var _excluded = ["subToolbar", "notExistsColumns", "isExit", "toolbar"];
 var TableData = function TableData(props) {
   var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table3, _meta$table4, _meta$table6, _meta$table7, _store$showMainColumn;
   var meta = props.meta,
@@ -129,6 +129,7 @@ var TableData = function TableData(props) {
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
       notExistsColumns = _store$preProps2.notExistsColumns,
+      isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded);
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
@@ -155,7 +156,7 @@ var TableData = function TableData(props) {
               newMetaList.subquery = newList;
               newMetaList.table = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newList[0].table), {}, {
                 alias: newMetaList.table.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta),
-                tableUuid: (0, _helper.uuidv4)('table')
+                tableUuid: newMetaList.table.tableUuid || (0, _helper.uuidv4)('table')
               });
               var items = (0, _utils.getSubColumns)(newList);
               var newColumns = items.flatMap(function (item) {
@@ -293,7 +294,7 @@ var TableData = function TableData(props) {
               icon: (0, _jsxRuntime.jsx)(_pandoraIcons.RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), selected && store.showFields && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && (0, _jsxRuntime.jsx)("div", {
+          }), selected && store.showFields && !store.isExit && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && (0, _jsxRuntime.jsx)("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: (0, _locale.__)('SqlQueryBuilder.columns')

package/lib/cjs/hooks/use-state.js

@@ -129,6 +129,10 @@ var useStore = function useStore() {
     _useState36 = (0, _slicedToArray2["default"])(_useState35, 2),
     currentTable = _useState36[0],
     setCurrentTable = _useState36[1]; // 当前存在的表
+  var _useState37 = (0, _react.useState)(false),
+    _useState38 = (0, _slicedToArray2["default"])(_useState37, 2),
+    isExit = _useState38[0],
+    setIsExit = _useState38[1]; // 是否是notExit
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -602,7 +606,9 @@ var useStore = function useStore() {
     filterCustomType: filterCustomType,
     setfilterCustomType: setfilterCustomType,
     formulaTemplates: formulaTemplates,
-    setFormulaTemplates: setFormulaTemplates
+    setFormulaTemplates: setFormulaTemplates,
+    isExit: isExit,
+    setIsExit: setIsExit
   };
 };
 var _default = exports["default"] = useStore;

package/lib/cjs/index.js

@@ -52,7 +52,9 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     _props$ignoreGroupByT = props.ignoreGroupByType,
     ignoreGroupByType = _props$ignoreGroupByT === void 0 ? false : _props$ignoreGroupByT,
     _props$filterCustomTy = props.filterCustomType,
-    filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy;
+    filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy,
+    _props$isExit = props.isExit,
+    isExit = _props$isExit === void 0 ? false : _props$isExit;
   var store = (0, _useState["default"])();
   (0, _react.useEffect)(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -79,7 +81,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setFormulaTemplates(formulaTemplates || []);
     store.setIgnoreGroupByType(ignoreGroupByType);
     store.setfilterCustomType(filterCustomType);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType]);
+    store.setIsExit(isExit);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit]);
   _react["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/cjs/types.d.ts

@@ -33,6 +33,7 @@ export interface MetabaseProps {
     filterCustomType?: boolean;
     notExistsColumns?: DataType[];
     formulaTemplates?: FormulaTemplatesItem[];
+    isExit?: boolean;
 }
 export interface OptionItem {
     value?: string;

package/lib/es/components/dialog/custom-editor/index.d.ts

@@ -3,6 +3,7 @@ import { MetaCustom_Item } from '../../../store/types';
 interface PropsType {
     value: MetaCustom_Item;
     data: any;
+    exitData: any;
     onOk: Function;
     onCancel: Function;
 }

package/lib/es/components/dialog/custom-editor/index.js

@@ -17,6 +17,7 @@ var VisualBox = Styled.div.attrs({
 var CaseEditor = function CaseEditor(props) {
   var value = props.value,
     data = props.data,
+    exitData = props.exitData,
     onOk = props.onOk,
     onCancel = props.onCancel;
   // const [popup, setPopup] = useState<PopupType>({ visible: false }); // 弹框信息
@@ -76,6 +77,7 @@ var CaseEditor = function CaseEditor(props) {
             isCustom: true,
             value: caseList,
             data: data,
+            exitData: exitData,
             ref: ref,
             onChange: setCaseList
           })]

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

@@ -152,6 +152,7 @@ var FormulaList = forwardRef(function (props, ref) {
         children: _jsx(Metabase, _objectSpread(_objectSpread({}, other), {}, {
           notExistsColumns: exitData,
           // showFields={false}
+          isExit: true,
           // showSubquery={subShowSubquery}
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),

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

@@ -26,6 +26,7 @@ var CustomColumn = function CustomColumn(props) {
   var store = useStore();
   var customColumn = meta.customColumn;
   var index = findIndex(store.metaList[groupIndex].list, meta);
+  var notExistsColumns = store.preProps.notExistsColumns;
   function getAvailableColumns() {
     var newMeta = store.metaList[groupIndex].list.slice();
     var columns = [];
@@ -208,6 +209,19 @@ var CustomColumn = function CustomColumn(props) {
     }
     return data;
   }
+  // const getPreColumns = () => {
+  //   let data = [...getColumns(), ...cloneDeep(notExistsColumns || [])];
+  //   // 将source 拍到最前面
+  //   const priorityNames = ['source'];
+  //   const sorted = data.sort((a, b) => {
+  //     const aPriority = priorityNames.includes(a.name);
+  //     const bPriority = priorityNames.includes(b.name);
+  //     if (aPriority && !bPriority) return -1;
+  //     if (!aPriority && bPriority) return 1;
+  //     return 0;
+  //   });
+  //   return sorted;
+  // };
   // 自定义弹窗
   var showSubQuery = function showSubQuery(e, i) {
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -220,6 +234,8 @@ var CustomColumn = function CustomColumn(props) {
           value: store,
           children: _jsx(CustomEditor, {
             data: getColumns(),
+            // data={getPreColumns()}
+            exitData: getColumns(),
             value: _value,
             onCancel: function onCancel() {
               o.close();

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

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["subToolbar", "notExistsColumns", "toolbar"];
+var _excluded = ["subToolbar", "notExistsColumns", "isExit", "toolbar"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import cx from 'classnames';
@@ -332,13 +332,19 @@ var JoinData = function JoinData(props) {
         data: data,
         value: newMeta[index][table_type],
         onChange: function onChange(data) {
-          console.log('🚀 ~ selectLeftTable ~ data:', data);
           // if (table_type === FlagLocation.TABLE_1) {
-          if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name || newMeta[index][table_type].alias !== data.alias) {
-            newMeta[index][table_type] = data;
-            initExpressions();
-          }
+          // if (
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).datasourceId !==
+          //     data.datasourceId ||
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).name !==
+          //     data.name ||
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).alias !==
+          //     data.alias
+          // ) {
+          // }
           // }
+          newMeta[index][table_type] = data;
+          initExpressions();
           store.setMeta(newMeta, groupIndex);
           store.setPopup({
             visible: false
@@ -893,6 +899,7 @@ var JoinData = function JoinData(props) {
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
       notExistsColumns = _store$preProps2.notExistsColumns,
+      isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = _objectWithoutProperties(_store$preProps2, _excluded);
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -1581,7 +1588,7 @@ var JoinData = function JoinData(props) {
                 icon: _jsx(FfPlus, {})
               })
             })
-          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && store.showFields && _jsx("div", {
+          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && !store.isExit && store.showFields && _jsx("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: __('SqlQueryBuilder.columns')

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["subToolbar", "notExistsColumns", "toolbar"];
+var _excluded = ["subToolbar", "notExistsColumns", "isExit", "toolbar"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import cx from 'classnames';
@@ -122,6 +122,7 @@ var TableData = function TableData(props) {
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
       notExistsColumns = _store$preProps2.notExistsColumns,
+      isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = _objectWithoutProperties(_store$preProps2, _excluded);
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
@@ -148,7 +149,7 @@ var TableData = function TableData(props) {
               newMetaList.subquery = newList;
               newMetaList.table = _objectSpread(_objectSpread({}, newList[0].table), {}, {
                 alias: newMetaList.table.alias || getAlias(newList[0].table.name, newMeta),
-                tableUuid: uuidv4('table')
+                tableUuid: newMetaList.table.tableUuid || uuidv4('table')
               });
               var items = getSubColumns(newList);
               var newColumns = items.flatMap(function (item) {
@@ -286,7 +287,7 @@ var TableData = function TableData(props) {
               icon: _jsx(RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), selected && store.showFields && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && _jsx("div", {
+          }), selected && store.showFields && !store.isExit && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && _jsx("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: __('SqlQueryBuilder.columns')

package/lib/es/hooks/use-state.js

@@ -122,6 +122,10 @@ var useStore = function useStore() {
     _useState36 = _slicedToArray(_useState35, 2),
     currentTable = _useState36[0],
     setCurrentTable = _useState36[1]; // 当前存在的表
+  var _useState37 = useState(false),
+    _useState38 = _slicedToArray(_useState37, 2),
+    isExit = _useState38[0],
+    setIsExit = _useState38[1]; // 是否是notExit
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -595,7 +599,9 @@ var useStore = function useStore() {
     filterCustomType: filterCustomType,
     setfilterCustomType: setfilterCustomType,
     formulaTemplates: formulaTemplates,
-    setFormulaTemplates: setFormulaTemplates
+    setFormulaTemplates: setFormulaTemplates,
+    isExit: isExit,
+    setIsExit: setIsExit
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -42,7 +42,9 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     _props$ignoreGroupByT = props.ignoreGroupByType,
     ignoreGroupByType = _props$ignoreGroupByT === void 0 ? false : _props$ignoreGroupByT,
     _props$filterCustomTy = props.filterCustomType,
-    filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy;
+    filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy,
+    _props$isExit = props.isExit,
+    isExit = _props$isExit === void 0 ? false : _props$isExit;
   var store = useData();
   useEffect(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -69,7 +71,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setFormulaTemplates(formulaTemplates || []);
     store.setIgnoreGroupByType(ignoreGroupByType);
     store.setfilterCustomType(filterCustomType);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType]);
+    store.setIsExit(isExit);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/types.d.ts

@@ -33,6 +33,7 @@ export interface MetabaseProps {
     filterCustomType?: boolean;
     notExistsColumns?: DataType[];
     formulaTemplates?: FormulaTemplatesItem[];
+    isExit?: boolean;
 }
 export interface OptionItem {
     value?: string;

package/package.json

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