@gingkoo/pandora-metabase 0.0.1-alpha.11 → 0.0.1-alpha.13

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

@@ -18,6 +18,7 @@ export interface ColumnType {
     name: string;
     database_type: SQL_COLUMN_TYPE | '';
     sql?: string;
+    id?: string;
 }
 export interface ColumnGroupType {
     condition: string;

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v0.0.1-alpha.11
+ * @gingkoo/pandora-metabase v0.0.1-alpha.13
  */
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -2296,7 +2296,8 @@ class SqlVisionStore {
         alias: '',
         datasourceId: '',
         datasourceName: '',
-        column: ''
+        column: '',
+        column_id: ''
       };
       if (index === 1) {
         table1 = {
@@ -2305,7 +2306,8 @@ class SqlVisionStore {
           alias: mainTable.table.alias,
           datasourceId: mainTable.table.datasourceId,
           datasourceName: mainTable.table.datasourceName,
-          column: ''
+          column: '',
+          column_id: ''
         };
       }
       item = {
@@ -2318,7 +2320,8 @@ class SqlVisionStore {
           alias: '',
           datasourceId: '',
           datasourceName: '',
-          column: ''
+          column: '',
+          column_id: ''
         },
         columns: []
       };
@@ -3215,7 +3218,7 @@ const SelectJoinColumn = ({
       if (v.alias === tableAlias) {
         return {
           ...v,
-          columns: _data[i]?.columns.filter(v => ~v.name.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())),
+          columns: _data[i]?.columns.filter(v => ~(v.name + (v.name_zh || '')).toLocaleLowerCase().indexOf(val.toLocaleLowerCase())),
           searchText: val
         };
       }
@@ -4111,7 +4114,7 @@ const SelectTable = ({
   function onInput(e) {
     let val = e.target.value;
     let newList = _$3.cloneDeep(originList.slice());
-    setList(newList.filter(v => ~v.name.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())));
+    setList(newList.filter(v => ~(v.name + (v.name_zh || '')).toLocaleLowerCase().indexOf(val.toLocaleLowerCase())));
   }
   function goPrevPage() {
     setVal({
@@ -4983,10 +4986,12 @@ const JoinData = props => {
             name,
             sql,
             datasourceId,
-            datasourceName
+            datasourceName,
+            id = ''
           } = record;
           let newMeta = store.metaList.slice();
           newMeta[index][type].column = name;
+          newMeta[index][type].column_id = id;
           if (type === FlagLocation.TABLE_1) {
             if (newMeta[index][type].alias !== alias) {
               newMeta[index][type].alias = alias;