@gingkoo/pandora-metabase 1.0.37 → 1.0.39

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/index.js

@@ -73,7 +73,9 @@ var CaseEditor = function CaseEditor(props) {
   };
   // 确定
   var _onOk = function _onOk() {
-    typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk(fun));
+    typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
+      quotes: getQuotes(fun.args)
+    })));
   };
   // 选择公式名
   var handleFunName = function handleFunName(name) {
@@ -85,6 +87,21 @@ var CaseEditor = function CaseEditor(props) {
       name: name
     }));
   };
+  var getQuotes = function getQuotes(_args) {
+    var quotes = _args.map(function (v) {
+      var quotes = v.list.map(function (vv, i) {
+        if (vv !== null && vv !== void 0 && vv.quotes) {
+          return vv === null || vv === void 0 ? void 0 : vv.quotes;
+        } else if (vv !== null && vv !== void 0 && vv.fieldName) {
+          return vv === null || vv === void 0 ? void 0 : vv.fieldName;
+        } else {
+          return vv.val;
+        }
+      }).join(' ');
+      return quotes;
+    }).join(' , ');
+    return fun.name + ' ( ' + quotes + ' ) ';
+  };
   var addParams = function addParams(index) {
     var _args = (0, _cloneDeep["default"])(fun.args);
     var tem = (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[fun.name].args)[index + 1] || {
@@ -93,6 +110,7 @@ var CaseEditor = function CaseEditor(props) {
     };
     _args.splice(index + 1, 0, tem);
     setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
+      quotes: getQuotes(_args),
       args: _args
     }));
   };
@@ -100,6 +118,7 @@ var CaseEditor = function CaseEditor(props) {
     var _args = (0, _cloneDeep["default"])(fun.args);
     _args.splice(index, 1);
     setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
+      quotes: getQuotes(_args),
       args: _args
     }));
   };
@@ -138,11 +157,19 @@ var CaseEditor = function CaseEditor(props) {
                 onChange: function onChange(val) {
                   handleFunName(val);
                 },
-                children: (_store$formulaTemplat = store.formulaTemplates) === null || _store$formulaTemplat === void 0 ? void 0 : _store$formulaTemplat.map(function (option, index) {
-                  return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
-                    value: option.name,
-                    children: option.name
+                children: (_store$formulaTemplat = store.formulaTemplates) === null || _store$formulaTemplat === void 0 ? void 0 : _store$formulaTemplat.map(function (options, index) {
+                  return (0, _jsxRuntime.jsx)(_pandora.Select.OptGroup, {
+                    label: options.name,
+                    children: Array.from(options.children || []).map(function (option, ind) {
+                      return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
+                        value: option.name,
+                        children: option.name
+                      }, String(option.name + ind));
+                    })
                   }, index);
+                  // <Select.Option key={index} value={option.name}>
+                  //   {option.name}
+                  // </Select.Option>
                 })
               })
             }), fun.name && (0, _jsxRuntime.jsxs)("div", {
@@ -179,12 +206,15 @@ var CaseEditor = function CaseEditor(props) {
                     onChange: function onChange(data, _quotes) {
                       var _args = (0, _cloneDeep["default"])(fun.args);
                       _args[i].list = data;
-                      _args[i].quotes = _quotes || '';
-                      var quotes = _args.map(function (v) {
-                        return v.quotes;
-                      }).join(' , ');
+                      // (_args[i] as AtomsCollection).quotes = _quotes || '';
+                      // const quotes = (_args as AtomsCollection[])
+                      //   .map((v) => {
+                      //     return v.quotes;
+                      //   })
+                      //   .join(' , ');
                       setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
-                        quotes: fun.name + ' ( ' + quotes + ' ) ',
+                        quotes: getQuotes(_args),
+                        //fun.name + ' ( ' + quotes + ' ) ',
                         args: _args
                       }));
                     }

package/lib/cjs/components/dialog/formula/utils.js

@@ -11,9 +11,11 @@ var _utils = require("../formula-list/utils");
 var getObjTem = exports.getObjTem = function getObjTem(arr) {
   var obj = {};
   arr === null || arr === void 0 || arr.map(function (v) {
-    if (v.name) {
-      obj[v.name] = v;
-    }
+    v.children.map(function (vv) {
+      if (vv.name) {
+        obj[vv.name] = vv;
+      }
+    });
   });
   return obj;
 };

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

@@ -285,7 +285,7 @@ var _isOk = exports.isOk = function isOk(rhsVal) {
       }
       return _isOk(v.args || []);
     } else {
-      return Boolean(v.val); // 兜底，确保 val 存在
+      return Boolean(v.val) || v.val === 0; // 兜底，确保 val 存在
     }
   });
 };

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/store/types.d.ts

@@ -331,6 +331,10 @@ export interface FormulaTemplatesItem {
     description?: string;
     example?: string;
 }
+export interface FormulaTemplates {
+    name: string;
+    children: FormulaTemplatesItem[];
+}
 export {};
 /**
 let a = {

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/index.js

@@ -67,7 +67,9 @@ var CaseEditor = function CaseEditor(props) {
   };
   // 确定
   var _onOk = function _onOk() {
-    typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk(fun));
+    typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk(_objectSpread(_objectSpread({}, fun), {}, {
+      quotes: getQuotes(fun.args)
+    })));
   };
   // 选择公式名
   var handleFunName = function handleFunName(name) {
@@ -79,6 +81,21 @@ var CaseEditor = function CaseEditor(props) {
       name: name
     }));
   };
+  var getQuotes = function getQuotes(_args) {
+    var quotes = _args.map(function (v) {
+      var quotes = v.list.map(function (vv, i) {
+        if (vv !== null && vv !== void 0 && vv.quotes) {
+          return vv === null || vv === void 0 ? void 0 : vv.quotes;
+        } else if (vv !== null && vv !== void 0 && vv.fieldName) {
+          return vv === null || vv === void 0 ? void 0 : vv.fieldName;
+        } else {
+          return vv.val;
+        }
+      }).join(' ');
+      return quotes;
+    }).join(' , ');
+    return fun.name + ' ( ' + quotes + ' ) ';
+  };
   var addParams = function addParams(index) {
     var _args = cloneDeep(fun.args);
     var tem = getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[fun.name].args)[index + 1] || {
@@ -87,6 +104,7 @@ var CaseEditor = function CaseEditor(props) {
     };
     _args.splice(index + 1, 0, tem);
     setFun(_objectSpread(_objectSpread({}, fun), {}, {
+      quotes: getQuotes(_args),
       args: _args
     }));
   };
@@ -94,6 +112,7 @@ var CaseEditor = function CaseEditor(props) {
     var _args = cloneDeep(fun.args);
     _args.splice(index, 1);
     setFun(_objectSpread(_objectSpread({}, fun), {}, {
+      quotes: getQuotes(_args),
       args: _args
     }));
   };
@@ -132,11 +151,19 @@ var CaseEditor = function CaseEditor(props) {
                 onChange: function onChange(val) {
                   handleFunName(val);
                 },
-                children: (_store$formulaTemplat = store.formulaTemplates) === null || _store$formulaTemplat === void 0 ? void 0 : _store$formulaTemplat.map(function (option, index) {
-                  return _jsx(Select.Option, {
-                    value: option.name,
-                    children: option.name
+                children: (_store$formulaTemplat = store.formulaTemplates) === null || _store$formulaTemplat === void 0 ? void 0 : _store$formulaTemplat.map(function (options, index) {
+                  return _jsx(Select.OptGroup, {
+                    label: options.name,
+                    children: Array.from(options.children || []).map(function (option, ind) {
+                      return _jsx(Select.Option, {
+                        value: option.name,
+                        children: option.name
+                      }, String(option.name + ind));
+                    })
                   }, index);
+                  // <Select.Option key={index} value={option.name}>
+                  //   {option.name}
+                  // </Select.Option>
                 })
               })
             }), fun.name && _jsxs("div", {
@@ -173,12 +200,15 @@ var CaseEditor = function CaseEditor(props) {
                     onChange: function onChange(data, _quotes) {
                       var _args = cloneDeep(fun.args);
                       _args[i].list = data;
-                      _args[i].quotes = _quotes || '';
-                      var quotes = _args.map(function (v) {
-                        return v.quotes;
-                      }).join(' , ');
+                      // (_args[i] as AtomsCollection).quotes = _quotes || '';
+                      // const quotes = (_args as AtomsCollection[])
+                      //   .map((v) => {
+                      //     return v.quotes;
+                      //   })
+                      //   .join(' , ');
                       setFun(_objectSpread(_objectSpread({}, fun), {}, {
-                        quotes: fun.name + ' ( ' + quotes + ' ) ',
+                        quotes: getQuotes(_args),
+                        //fun.name + ' ( ' + quotes + ' ) ',
                         args: _args
                       }));
                     }

package/lib/es/components/dialog/formula/utils.js

@@ -3,9 +3,11 @@ import { getTemplateItem } from '../formula-list/utils';
 export var getObjTem = function getObjTem(arr) {
   var obj = {};
   arr === null || arr === void 0 || arr.map(function (v) {
-    if (v.name) {
-      obj[v.name] = v;
-    }
+    v.children.map(function (vv) {
+      if (vv.name) {
+        obj[vv.name] = vv;
+      }
+    });
   });
   return obj;
 };

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

@@ -278,7 +278,7 @@ var _isOk = function isOk(rhsVal) {
       }
       return _isOk(v.args || []);
     } else {
-      return Boolean(v.val); // 兜底，确保 val 存在
+      return Boolean(v.val) || v.val === 0; // 兜底，确保 val 存在
     }
   });
 };

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/store/types.d.ts

@@ -331,6 +331,10 @@ export interface FormulaTemplatesItem {
     description?: string;
     example?: string;
 }
+export interface FormulaTemplates {
+    name: string;
+    children: FormulaTemplatesItem[];
+}
 export {};
 /**
 let a = {

package/package.json

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