@gingkoo/pandora-metabase 1.0.46 → 1.0.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/lib/cjs/components/dialog/formula/index.js +3 -3
  2. package/lib/cjs/components/dialog/formula/utils.d.ts +1 -1
  3. package/lib/cjs/components/dialog/formula/utils.js +18 -2
  4. package/lib/cjs/hooks/use-state.js +4 -6
  5. package/lib/es/components/dialog/formula/index.js +3 -3
  6. package/lib/es/components/dialog/formula/utils.d.ts +1 -1
  7. package/lib/es/components/dialog/formula/utils.js +18 -2
  8. package/lib/es/hooks/use-state.js +4 -6
  9. package/package.json +1 -1
package/lib/cjs/components/dialog/formula/index.js CHANGED
@@ -79,11 +79,11 @@ var CaseEditor = function CaseEditor(props) {
79
79
  };
80
80
  // 选择公式名
81
81
  var handleFunName = function handleFunName(name) {
82
- var _formulaList$name;
82
+ var _formulaList$name, _formulaList$name2;
83
83
  formulaList === null || formulaList === void 0 || formulaList[name].args;
84
84
  setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
85
- args: (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[name].args),
86
- arity: formulaList === null || formulaList === void 0 || (_formulaList$name = formulaList[name]) === null || _formulaList$name === void 0 ? void 0 : _formulaList$name.arity,
85
+ args: (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[name].args, formulaList === null || formulaList === void 0 || (_formulaList$name = formulaList[name]) === null || _formulaList$name === void 0 ? void 0 : _formulaList$name.arity),
86
+ arity: formulaList === null || formulaList === void 0 || (_formulaList$name2 = formulaList[name]) === null || _formulaList$name2 === void 0 ? void 0 : _formulaList$name2.arity,
87
87
  name: name
88
88
  }));
89
89
  };
package/lib/cjs/components/dialog/formula/utils.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Arity, AtomsItem, AtomsCollection } from '../../../store/types';
2
2
  export declare const getObjTem: (arr: any[]) => any;
3
- export declare const getTemArgs: (temArgs: any[]) => AtomsCollection[];
3
+ export declare const getTemArgs: (temArgs: any[], arity?: Arity) => AtomsCollection[];
4
4
  export declare function getParamActions(params: AtomsItem[], arity?: Arity): {
5
5
  canAdd: boolean;
6
6
  canDel: boolean;
package/lib/cjs/components/dialog/formula/utils.js CHANGED
@@ -19,14 +19,30 @@ var getObjTem = exports.getObjTem = function getObjTem(arr) {
19
19
  });
20
20
  return obj;
21
21
  };
22
- var getTemArgs = exports.getTemArgs = function getTemArgs(temArgs) {
23
- return (temArgs === null || temArgs === void 0 ? void 0 : temArgs.map(function (v) {
22
+ var getTemArgs = exports.getTemArgs = function getTemArgs(temArgs, arity) {
23
+ var _temArgs = (temArgs === null || temArgs === void 0 ? void 0 : temArgs.map(function (v) {
24
24
  return {
25
25
  type: _types.AtomsTypeEnum.COLLECTION,
26
26
  quotes: '',
27
27
  list: [(0, _utils.getTemplateItem)(v.type)]
28
28
  };
29
29
  })) || [];
30
+ var minLen = (arity === null || arity === void 0 ? void 0 : arity.min) || (arity === null || arity === void 0 ? void 0 : arity.exact);
31
+ var temLen = _temArgs.length;
32
+ var len = minLen - temLen;
33
+ // 按最小长度添加
34
+ if (len > 0) {
35
+ Array.from({
36
+ length: len
37
+ }).forEach(function () {
38
+ _temArgs.push({
39
+ type: _types.AtomsTypeEnum.COLLECTION,
40
+ quotes: '',
41
+ list: []
42
+ });
43
+ });
44
+ }
45
+ return _temArgs;
30
46
  };
31
47
  function getParamActions(params, arity) {
32
48
  var len = (params === null || params === void 0 ? void 0 : params.length) || 0;
package/lib/cjs/hooks/use-state.js CHANGED
@@ -329,12 +329,10 @@ var useStore = function useStore() {
329
329
  fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, v.columns, function () {
330
330
  var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
331
331
  if (v.isSubquery) {
332
- var newColumns = [];
333
- var items = (0, _utils.getSubColumns)(v.subquery);
334
- newColumns = items.flatMap(function (item) {
335
- return item.columns;
336
- });
337
- newMeta[i].columns = newColumns || [];
332
+ // let newColumns: any = [];
333
+ // const items = getSubColumns(v.subquery);
334
+ // newColumns = items.flatMap((item) => item.columns);
335
+ // (newMeta[i] as MetaJoin).columns = columns || [];
338
336
  } else {
339
337
  newMeta[i].columns = columns || [];
340
338
  }
package/lib/es/components/dialog/formula/index.js CHANGED
@@ -73,11 +73,11 @@ var CaseEditor = function CaseEditor(props) {
73
73
  };
74
74
  // 选择公式名
75
75
  var handleFunName = function handleFunName(name) {
76
- var _formulaList$name;
76
+ var _formulaList$name, _formulaList$name2;
77
77
  formulaList === null || formulaList === void 0 || formulaList[name].args;
78
78
  setFun(_objectSpread(_objectSpread({}, fun), {}, {
79
- args: getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[name].args),
80
- arity: formulaList === null || formulaList === void 0 || (_formulaList$name = formulaList[name]) === null || _formulaList$name === void 0 ? void 0 : _formulaList$name.arity,
79
+ args: getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[name].args, formulaList === null || formulaList === void 0 || (_formulaList$name = formulaList[name]) === null || _formulaList$name === void 0 ? void 0 : _formulaList$name.arity),
80
+ arity: formulaList === null || formulaList === void 0 || (_formulaList$name2 = formulaList[name]) === null || _formulaList$name2 === void 0 ? void 0 : _formulaList$name2.arity,
81
81
  name: name
82
82
  }));
83
83
  };
package/lib/es/components/dialog/formula/utils.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Arity, AtomsItem, AtomsCollection } from '../../../store/types';
2
2
  export declare const getObjTem: (arr: any[]) => any;
3
- export declare const getTemArgs: (temArgs: any[]) => AtomsCollection[];
3
+ export declare const getTemArgs: (temArgs: any[], arity?: Arity) => AtomsCollection[];
4
4
  export declare function getParamActions(params: AtomsItem[], arity?: Arity): {
5
5
  canAdd: boolean;
6
6
  canDel: boolean;
package/lib/es/components/dialog/formula/utils.js CHANGED
@@ -11,14 +11,30 @@ export var getObjTem = function getObjTem(arr) {
11
11
  });
12
12
  return obj;
13
13
  };
14
- export var getTemArgs = function getTemArgs(temArgs) {
15
- return (temArgs === null || temArgs === void 0 ? void 0 : temArgs.map(function (v) {
14
+ export var getTemArgs = function getTemArgs(temArgs, arity) {
15
+ var _temArgs = (temArgs === null || temArgs === void 0 ? void 0 : temArgs.map(function (v) {
16
16
  return {
17
17
  type: AtomsTypeEnum.COLLECTION,
18
18
  quotes: '',
19
19
  list: [getTemplateItem(v.type)]
20
20
  };
21
21
  })) || [];
22
+ var minLen = (arity === null || arity === void 0 ? void 0 : arity.min) || (arity === null || arity === void 0 ? void 0 : arity.exact);
23
+ var temLen = _temArgs.length;
24
+ var len = minLen - temLen;
25
+ // 按最小长度添加
26
+ if (len > 0) {
27
+ Array.from({
28
+ length: len
29
+ }).forEach(function () {
30
+ _temArgs.push({
31
+ type: AtomsTypeEnum.COLLECTION,
32
+ quotes: '',
33
+ list: []
34
+ });
35
+ });
36
+ }
37
+ return _temArgs;
22
38
  };
23
39
  export function getParamActions(params, arity) {
24
40
  var len = (params === null || params === void 0 ? void 0 : params.length) || 0;
package/lib/es/hooks/use-state.js CHANGED
@@ -322,12 +322,10 @@ var useStore = function useStore() {
322
322
  fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, v.columns, function () {
323
323
  var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
324
324
  if (v.isSubquery) {
325
- var newColumns = [];
326
- var items = getSubColumns(v.subquery);
327
- newColumns = items.flatMap(function (item) {
328
- return item.columns;
329
- });
330
- newMeta[i].columns = newColumns || [];
325
+ // let newColumns: any = [];
326
+ // const items = getSubColumns(v.subquery);
327
+ // newColumns = items.flatMap((item) => item.columns);
328
+ // (newMeta[i] as MetaJoin).columns = columns || [];
331
329
  } else {
332
330
  newMeta[i].columns = columns || [];
333
331
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.46",
3
+ "version": "1.0.48",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",