@gingkoo/pandora-metabase 1.0.97 → 1.0.99

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 (7) hide show
  1. package/lib/cjs/components/dialog/formula/index.js +10 -8
  2. package/lib/cjs/components/dialog/formula-list/index.js +30 -29
  3. package/lib/cjs/hooks/patch.js +22 -3
  4. package/lib/es/components/dialog/formula/index.js +10 -8
  5. package/lib/es/components/dialog/formula-list/index.js +30 -29
  6. package/lib/es/hooks/patch.js +22 -3
  7. package/package.json +1 -1
package/lib/cjs/components/dialog/formula/index.js CHANGED
@@ -44,17 +44,19 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
44
44
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
45
45
  fun = _useState2[0],
46
46
  setFun = _useState2[1];
47
- var _useState3 = (0, _react.useState)((0, _utils2.getObjTem)(store.formulaTemplates)),
48
- _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
49
- formulaList = _useState4[0],
50
- setFunctionList = _useState4[1];
51
- var _useState5 = (0, _react.useState)({
47
+ // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
48
+ // getObjTem(store.formulaTemplates),
49
+ // );
50
+ var formulaList = (0, _react.useMemo)(function () {
51
+ return (0, _utils2.getObjTem)(store.formulaTemplates);
52
+ }, [store.formulaTemplates]);
53
+ var _useState3 = (0, _react.useState)({
52
54
  canAdd: true,
53
55
  canDel: true
54
56
  }),
55
- _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
56
- formulaOpr = _useState6[0],
57
- setFormulaOpr = _useState6[1];
57
+ _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
58
+ formulaOpr = _useState4[0],
59
+ setFormulaOpr = _useState4[1];
58
60
  (0, _react.useEffect)(function () {
59
61
  setFormulaOpr((0, _utils2.getParamActions)(fun.args, fun.arity));
60
62
  }, [fun]);
package/lib/cjs/components/dialog/formula-list/index.js CHANGED
@@ -100,17 +100,18 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
100
100
  _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
101
101
  isCopy = _useState8[0],
102
102
  setIsCopy = _useState8[1];
103
- var _useState9 = (0, _react.useState)((0, _utils.getObjTem)(store.formulaTemplates)),
104
- _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
105
- formulaList = _useState0[0],
106
- setFunctionList = _useState0[1];
103
+ // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
104
+ // );
105
+ var formulaList = (0, _react.useMemo)(function () {
106
+ return (0, _utils.getObjTem)(store.formulaTemplates);
107
+ }, [store.formulaTemplates]);
107
108
  (0, _react.useEffect)(function () {
108
109
  setOldCode(getPreviewStr(caseList));
109
110
  }, []);
110
- var _useState1 = (0, _react.useState)(''),
111
- _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
112
- filterVal = _useState10[0],
113
- setFilterVal = _useState10[1];
111
+ var _useState9 = (0, _react.useState)(''),
112
+ _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
113
+ filterVal = _useState0[0],
114
+ setFilterVal = _useState0[1];
114
115
  var setCaseList = function setCaseList(data) {
115
116
  var quotes = data.map(function (v, i) {
116
117
  if (v !== null && v !== void 0 && v.quotes) {
@@ -125,35 +126,35 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
125
126
  caseList = data;
126
127
  caseListRef.current = data;
127
128
  };
128
- var _useState11 = (0, _react.useState)(-1),
129
- _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
130
- ind = _useState12[0],
131
- setInd = _useState12[1];
129
+ var _useState1 = (0, _react.useState)(-1),
130
+ _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
131
+ ind = _useState10[0],
132
+ setInd = _useState10[1];
132
133
  var filterCustomType = store.filterCustomType;
133
134
  var _ref = (0, _react.useRef)(null);
134
- var _useState13 = (0, _react.useState)({
135
+ var _useState11 = (0, _react.useState)({
135
136
  isError: false
136
137
  }),
138
+ _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
139
+ errorInfo = _useState12[0],
140
+ setErrorInfo = _useState12[1];
141
+ var _useState13 = (0, _react.useState)(false),
137
142
  _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
138
- errorInfo = _useState14[0],
139
- setErrorInfo = _useState14[1];
140
- var _useState15 = (0, _react.useState)(false),
141
- _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
142
- isCheck = _useState16[0],
143
- setIsCheck = _useState16[1];
143
+ isCheck = _useState14[0],
144
+ setIsCheck = _useState14[1];
144
145
  var myInstanceIdRef = (0, _react.useRef)(Math.random().toString(36).slice(2));
145
- var _useState17 = (0, _react.useState)(!!window.__sqb_selection_active__),
146
+ var _useState15 = (0, _react.useState)(!!window.__sqb_selection_active__),
147
+ _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
148
+ globalSelectionActive = _useState16[0],
149
+ setGlobalSelectionActive = _useState16[1];
150
+ var _useState17 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
146
151
  _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
147
- globalSelectionActive = _useState18[0],
148
- setGlobalSelectionActive = _useState18[1];
149
- var _useState19 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
152
+ globalSelectionOwner = _useState18[0],
153
+ setGlobalSelectionOwner = _useState18[1];
154
+ var _useState19 = (0, _react.useState)([]),
150
155
  _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
151
- globalSelectionOwner = _useState20[0],
152
- setGlobalSelectionOwner = _useState20[1];
153
- var _useState21 = (0, _react.useState)([]),
154
- _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
155
- selectedIndices = _useState22[0],
156
- setSelectedIndices = _useState22[1];
156
+ selectedIndices = _useState20[0],
157
+ setSelectedIndices = _useState20[1];
157
158
  (0, _react.useEffect)(function () {
158
159
  var leftBrackets = caseList.filter(function (v) {
159
160
  return v.type === _types.AtomsTypeEnum.OPERATOR && v.val === '(';
package/lib/cjs/hooks/patch.js CHANGED
@@ -8,7 +8,7 @@ exports.patchMetas = exports.joinDataPatch = exports.filterPatch = exports.custo
8
8
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
9
9
  var _enum = require("../store/enum");
10
10
  var setConstantId = function setConstantId(item, constantList) {
11
- constantList.map(function (v) {
11
+ constantList === null || constantList === void 0 || constantList.map(function (v) {
12
12
  if (v.label === item.val) {
13
13
  item.id = v.value;
14
14
  }
@@ -59,8 +59,27 @@ var filterPatch = exports.filterPatch = function filterPatch(newMeta, constantLi
59
59
  return item;
60
60
  });
61
61
  }
62
- if (v.type === 'FORMULA' && !v.id) {
63
- return setFormulaId(v, formulaTemplates);
62
+ if (v.type === 'FORMULA') {
63
+ var _v$args;
64
+ var _v = v;
65
+ if (!_v.id) {
66
+ _v = setFormulaId(v, formulaTemplates);
67
+ }
68
+ (_v$args = _v.args) === null || _v$args === void 0 || _v$args.map(function (arg) {
69
+ var _arg$list;
70
+ arg.list = (_arg$list = arg.list) === null || _arg$list === void 0 ? void 0 : _arg$list.map(function (argItem) {
71
+ if (argItem.type === 'constant' && !argItem.id) {
72
+ return setConstantId(argItem, constantList);
73
+ }
74
+ if (argItem.type === 'FORMULA' && !argItem.id) {
75
+ return setFormulaId(argItem, formulaTemplates);
76
+ }
77
+ return argItem;
78
+ });
79
+ return arg;
80
+ });
81
+ return _v;
82
+ // return setFormulaId(v, formulaTemplates);
64
83
  }
65
84
  if (v.type === 'exists' || v.type === 'notExists') {
66
85
  v.notExists = _patchMetas(v.notExists, constantList, formulaTemplates);
package/lib/es/components/dialog/formula/index.js CHANGED
@@ -36,17 +36,19 @@ var CaseEditor = React.forwardRef(function (props, ref) {
36
36
  _useState2 = _slicedToArray(_useState, 2),
37
37
  fun = _useState2[0],
38
38
  setFun = _useState2[1];
39
- var _useState3 = useState(getObjTem(store.formulaTemplates)),
40
- _useState4 = _slicedToArray(_useState3, 2),
41
- formulaList = _useState4[0],
42
- setFunctionList = _useState4[1];
43
- var _useState5 = useState({
39
+ // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
40
+ // getObjTem(store.formulaTemplates),
41
+ // );
42
+ var formulaList = useMemo(function () {
43
+ return getObjTem(store.formulaTemplates);
44
+ }, [store.formulaTemplates]);
45
+ var _useState3 = useState({
44
46
  canAdd: true,
45
47
  canDel: true
46
48
  }),
47
- _useState6 = _slicedToArray(_useState5, 2),
48
- formulaOpr = _useState6[0],
49
- setFormulaOpr = _useState6[1];
49
+ _useState4 = _slicedToArray(_useState3, 2),
50
+ formulaOpr = _useState4[0],
51
+ setFormulaOpr = _useState4[1];
50
52
  useEffect(function () {
51
53
  setFormulaOpr(getParamActions(fun.args, fun.arity));
52
54
  }, [fun]);
package/lib/es/components/dialog/formula-list/index.js CHANGED
@@ -92,17 +92,18 @@ var FormulaList = forwardRef(function (props, ref) {
92
92
  _useState8 = _slicedToArray(_useState7, 2),
93
93
  isCopy = _useState8[0],
94
94
  setIsCopy = _useState8[1];
95
- var _useState9 = useState(getObjTem(store.formulaTemplates)),
96
- _useState0 = _slicedToArray(_useState9, 2),
97
- formulaList = _useState0[0],
98
- setFunctionList = _useState0[1];
95
+ // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
96
+ // );
97
+ var formulaList = useMemo(function () {
98
+ return getObjTem(store.formulaTemplates);
99
+ }, [store.formulaTemplates]);
99
100
  useEffect(function () {
100
101
  setOldCode(getPreviewStr(caseList));
101
102
  }, []);
102
- var _useState1 = useState(''),
103
- _useState10 = _slicedToArray(_useState1, 2),
104
- filterVal = _useState10[0],
105
- setFilterVal = _useState10[1];
103
+ var _useState9 = useState(''),
104
+ _useState0 = _slicedToArray(_useState9, 2),
105
+ filterVal = _useState0[0],
106
+ setFilterVal = _useState0[1];
106
107
  var setCaseList = function setCaseList(data) {
107
108
  var quotes = data.map(function (v, i) {
108
109
  if (v !== null && v !== void 0 && v.quotes) {
@@ -117,35 +118,35 @@ var FormulaList = forwardRef(function (props, ref) {
117
118
  caseList = data;
118
119
  caseListRef.current = data;
119
120
  };
120
- var _useState11 = useState(-1),
121
- _useState12 = _slicedToArray(_useState11, 2),
122
- ind = _useState12[0],
123
- setInd = _useState12[1];
121
+ var _useState1 = useState(-1),
122
+ _useState10 = _slicedToArray(_useState1, 2),
123
+ ind = _useState10[0],
124
+ setInd = _useState10[1];
124
125
  var filterCustomType = store.filterCustomType;
125
126
  var _ref = useRef(null);
126
- var _useState13 = useState({
127
+ var _useState11 = useState({
127
128
  isError: false
128
129
  }),
130
+ _useState12 = _slicedToArray(_useState11, 2),
131
+ errorInfo = _useState12[0],
132
+ setErrorInfo = _useState12[1];
133
+ var _useState13 = useState(false),
129
134
  _useState14 = _slicedToArray(_useState13, 2),
130
- errorInfo = _useState14[0],
131
- setErrorInfo = _useState14[1];
132
- var _useState15 = useState(false),
133
- _useState16 = _slicedToArray(_useState15, 2),
134
- isCheck = _useState16[0],
135
- setIsCheck = _useState16[1];
135
+ isCheck = _useState14[0],
136
+ setIsCheck = _useState14[1];
136
137
  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
137
- var _useState17 = useState(!!window.__sqb_selection_active__),
138
+ var _useState15 = useState(!!window.__sqb_selection_active__),
139
+ _useState16 = _slicedToArray(_useState15, 2),
140
+ globalSelectionActive = _useState16[0],
141
+ setGlobalSelectionActive = _useState16[1];
142
+ var _useState17 = useState(window.__sqb_selection_owner__ || null),
138
143
  _useState18 = _slicedToArray(_useState17, 2),
139
- globalSelectionActive = _useState18[0],
140
- setGlobalSelectionActive = _useState18[1];
141
- var _useState19 = useState(window.__sqb_selection_owner__ || null),
144
+ globalSelectionOwner = _useState18[0],
145
+ setGlobalSelectionOwner = _useState18[1];
146
+ var _useState19 = useState([]),
142
147
  _useState20 = _slicedToArray(_useState19, 2),
143
- globalSelectionOwner = _useState20[0],
144
- setGlobalSelectionOwner = _useState20[1];
145
- var _useState21 = useState([]),
146
- _useState22 = _slicedToArray(_useState21, 2),
147
- selectedIndices = _useState22[0],
148
- setSelectedIndices = _useState22[1];
148
+ selectedIndices = _useState20[0],
149
+ setSelectedIndices = _useState20[1];
149
150
  useEffect(function () {
150
151
  var leftBrackets = caseList.filter(function (v) {
151
152
  return v.type === AtomsTypeEnum.OPERATOR && v.val === '(';
package/lib/es/hooks/patch.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import { TypeEnum } from '../store/enum';
3
3
  var setConstantId = function setConstantId(item, constantList) {
4
- constantList.map(function (v) {
4
+ constantList === null || constantList === void 0 || constantList.map(function (v) {
5
5
  if (v.label === item.val) {
6
6
  item.id = v.value;
7
7
  }
@@ -52,8 +52,27 @@ export var filterPatch = function filterPatch(newMeta, constantList, formulaTemp
52
52
  return item;
53
53
  });
54
54
  }
55
- if (v.type === 'FORMULA' && !v.id) {
56
- return setFormulaId(v, formulaTemplates);
55
+ if (v.type === 'FORMULA') {
56
+ var _v$args;
57
+ var _v = v;
58
+ if (!_v.id) {
59
+ _v = setFormulaId(v, formulaTemplates);
60
+ }
61
+ (_v$args = _v.args) === null || _v$args === void 0 || _v$args.map(function (arg) {
62
+ var _arg$list;
63
+ arg.list = (_arg$list = arg.list) === null || _arg$list === void 0 ? void 0 : _arg$list.map(function (argItem) {
64
+ if (argItem.type === 'constant' && !argItem.id) {
65
+ return setConstantId(argItem, constantList);
66
+ }
67
+ if (argItem.type === 'FORMULA' && !argItem.id) {
68
+ return setFormulaId(argItem, formulaTemplates);
69
+ }
70
+ return argItem;
71
+ });
72
+ return arg;
73
+ });
74
+ return _v;
75
+ // return setFormulaId(v, formulaTemplates);
57
76
  }
58
77
  if (v.type === 'exists' || v.type === 'notExists') {
59
78
  v.notExists = _patchMetas(v.notExists, constantList, formulaTemplates);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.97",
3
+ "version": "1.0.99",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",