@gingkoo/pandora-metabase 1.0.94 → 1.0.96

package/lib/es/index.js

@@ -79,17 +79,17 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     getColumns && store.setFetchColumnsFn(getColumns);
     onChange && store.setFetchChangeFn(onChange);
     getModuleDiffCode && store.setFetchDiffFn(getModuleDiffCode);
-    getExistsError && store.setExistsErrorFn(getExistsError);
   }, []);
   useEffect(function () {
     store.setProps(props);
   }, [props]);
   useEffect(function () {
-    var _value = reassembleByUnion(patchData(value));
-    var source_value = patchData(value);
+    var _value = reassembleByUnion(patchData(value, constantList, formulaTemplates));
+    var source_value = patchData(value, constantList, formulaTemplates);
     store.setPreData(cloneDeep(_value), isSubquery, isExit);
     store.setSourceData(source_value);
-  }, [value]);
+    getExistsError && store.setExistsErrorFn(getExistsError, value);
+  }, [value, constantList, formulaTemplates]);
   useEffect(function () {
     store.setSourceList(isExit && exitSourceList && Array.from(exitSourceList).length > 0 ? exitSourceList || sourceList : sourceList);
   }, [sourceList, exitSourceList, isExit]);

package/lib/es/types.d.ts

@@ -59,7 +59,7 @@ export interface MetabaseProps {
         oldCode: string;
         newCode: string;
     }>;
-    getExistsError?: () => Promise<any[]>;
+    getExistsError?: (params: MetaListType[]) => Promise<any[]>;
     operatorList?: any[];
 }
 export interface OptionItem {

package/lib/es/utils.d.ts

@@ -26,7 +26,8 @@ export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
 export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias">) => MetaListType[];
 export declare function splitByUnion(data: any): any[];
-export declare const patchData: (metas: MetaListType[]) => MetaListType[];
+export declare const getObjTem: (arr: any[]) => any;
+export declare const patchData: (metas: MetaListType[], constantList?: any, formulaTemplates?: any) => MetaListType[];
 export declare function reassembleByUnion(target?: any[]): any[];
 export declare const buildSqlQuery: (data: MetaListType[] | undefined, type: string) => string;
 export declare const isError: (item: AtomsItem | AtomsItem[], data: DataType[]) => boolean;

package/lib/es/utils.js

@@ -500,12 +500,28 @@ export function splitByUnion(data) {
   }
   return result;
 }
+export var getObjTem = function getObjTem(arr) {
+  var obj = {};
+  arr === null || arr === void 0 || arr.map(function (v) {
+    v.children.map(function (vv) {
+      if (vv.name) {
+        obj[vv.name] = vv;
+      }
+    });
+  });
+  return obj;
+};
 export var patchData = function patchData(metas) {
-  return metas;
+  var constantList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var formulaTemplates = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  // return metas;
   var mainTable = metas[0] || {};
   var version = (mainTable === null || mainTable === void 0 ? void 0 : mainTable.patchVersion) || '';
-  if (version != '1.0.0') {
-    return patchMetas(metas);
+  // if (version != '1.0.0') {
+  //   return patchMetas(metas);
+  // }
+  if (version != '1.1.0') {
+    return patchMetas(metas, constantList, getObjTem(formulaTemplates));
   }
   return metas;
 };

package/package.json

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