@gingkoo/pandora-metabase 1.0.114 → 1.0.116

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 (5) hide show
  1. package/lib/cjs/components/dialog/formula/index.js +32 -8
  2. package/lib/cjs/components/dialog/formula-list/index.js +43 -44
  3. package/lib/es/components/dialog/formula/index.js +32 -8
  4. package/lib/es/components/dialog/formula-list/index.js +43 -44
  5. package/package.json +1 -1
package/lib/cjs/components/dialog/formula/index.js CHANGED
@@ -12,6 +12,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
12
12
  var _jsxRuntime = require("react/jsx-runtime");
13
13
  var _react = _interopRequireWildcard(require("react"));
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
+ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
15
16
  require("./index.less");
16
17
  var _formulaList = _interopRequireDefault(require("../formula-list"));
17
18
  var _icons = require("../../icons");
@@ -30,7 +31,7 @@ var VisualBox = _styledComponents["default"].div.attrs({
30
31
  className: 'visual-box'
31
32
  })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
32
33
  var CaseEditor = _react["default"].forwardRef(function (props, ref) {
33
- var _store$formulaTemplat, _formulaList$fun$name, _formulaList$fun$name2, _fun$args;
34
+ var _store$formulaTemplat, _fun$args;
34
35
  var store = (0, _useProvider.useStore)();
35
36
  var value = props.value,
36
37
  data = props.data,
@@ -50,6 +51,11 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
50
51
  var formulaList = (0, _react.useMemo)(function () {
51
52
  return (0, _utils2.getObjTem)(store.formulaTemplates);
52
53
  }, [store.formulaTemplates]);
54
+ var currentFormulaKey = fun.id || fun.name;
55
+ var currentFormulaTemplate = (0, _react.useMemo)(function () {
56
+ return formulaList[currentFormulaKey];
57
+ }, [formulaList, currentFormulaKey]);
58
+ var effectiveArity = (currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.arity) || fun.arity;
53
59
  var _useState3 = (0, _react.useState)({
54
60
  canAdd: true,
55
61
  canDel: true
@@ -58,8 +64,23 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
58
64
  formulaOpr = _useState4[0],
59
65
  setFormulaOpr = _useState4[1];
60
66
  (0, _react.useEffect)(function () {
61
- setFormulaOpr((0, _utils2.getParamActions)(fun.args, fun.arity));
62
- }, [fun]);
67
+ setFormulaOpr((0, _utils2.getParamActions)(fun.args, effectiveArity));
68
+ }, [fun.args, effectiveArity]);
69
+ (0, _react.useEffect)(function () {
70
+ if (!currentFormulaTemplate) return;
71
+ setFun(function (prev) {
72
+ var nextId = prev.id || currentFormulaKey;
73
+ var nextName = currentFormulaTemplate.name || prev.name;
74
+ if (prev.id === nextId && prev.name === nextName && (0, _isEqual["default"])(prev.arity, effectiveArity)) {
75
+ return prev;
76
+ }
77
+ return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, prev), {}, {
78
+ id: nextId,
79
+ name: nextName,
80
+ arity: effectiveArity
81
+ });
82
+ });
83
+ }, [currentFormulaKey, currentFormulaTemplate, effectiveArity]);
63
84
  var _ref = (0, _react.useRef)(null);
64
85
  // EXPRESSION = 'expression', // 表达式
65
86
  // // FUNCTION = 'function', // 函数
@@ -83,6 +104,9 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
83
104
  // 确定
84
105
  var _onOk = function _onOk() {
85
106
  typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
107
+ arity: effectiveArity,
108
+ id: currentFormulaKey,
109
+ name: (currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.name) || fun.name,
86
110
  quotes: (0, _utils2.getQuotes)(fun, fun.args, formulaList)
87
111
  })));
88
112
  };
@@ -100,7 +124,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
100
124
  };
101
125
  var addParams = function addParams(index) {
102
126
  var _args = (0, _cloneDeep["default"])(fun.args);
103
- var tem = (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[fun.name].args)[index + 1] || {
127
+ var tem = (0, _utils2.getTemArgs)(currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.args)[index + 1] || {
104
128
  type: _types.AtomsTypeEnum.COLLECTION,
105
129
  list: []
106
130
  };
@@ -179,14 +203,14 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
179
203
  color: '#949aab'
180
204
  },
181
205
  children: [(0, _jsxRuntime.jsxs)("p", {
182
- children: ["\u63CF\u8FF0\uFF1A", (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.description]
206
+ children: ["\u63CF\u8FF0\uFF1A", currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.description]
183
207
  }), (0, _jsxRuntime.jsxs)("p", {
184
- children: ["\u6848\u4F8B\uFF1A", (_formulaList$fun$name2 = formulaList[fun.name]) === null || _formulaList$fun$name2 === void 0 ? void 0 : _formulaList$fun$name2.example]
208
+ children: ["\u6848\u4F8B\uFF1A", currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.example]
185
209
  })]
186
210
  })]
187
211
  }), fun === null || fun === void 0 || (_fun$args = fun.args) === null || _fun$args === void 0 ? void 0 : _fun$args.map(function (v, i) {
188
212
  if (v.type === _types.AtomsTypeEnum.COLLECTION) {
189
- var _store$preProps, _formulaList$fun$name3;
213
+ var _store$preProps, _currentFormulaTempla;
190
214
  return (0, _jsxRuntime.jsxs)("div", {
191
215
  className: 'Sqb-item-formula-args',
192
216
  children: [(0, _jsxRuntime.jsxs)("div", {
@@ -200,7 +224,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
200
224
  children: ["\u53C2\u6570", i + 1, ":"]
201
225
  }), (0, _jsxRuntime.jsx)(_formulaList["default"], {
202
226
  otherTypes: (_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.otherTypes,
203
- check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name3 = formulaList[fun.name]) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3.args) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3[i]) === null || _formulaList$fun$name3 === void 0 ? void 0 : _formulaList$fun$name3.check) || '',
227
+ check: (currentFormulaTemplate === null || currentFormulaTemplate === void 0 || (_currentFormulaTempla = currentFormulaTemplate.args) === null || _currentFormulaTempla === void 0 || (_currentFormulaTempla = _currentFormulaTempla[i]) === null || _currentFormulaTempla === void 0 ? void 0 : _currentFormulaTempla.check) || '',
204
228
  value: v.list,
205
229
  data: data,
206
230
  ref: _ref,
package/lib/cjs/components/dialog/formula-list/index.js CHANGED
@@ -40,7 +40,7 @@ var _excluded = ["notExistsToolbar", "toolbar"],
40
40
  _excluded2 = ["subToolbar", "notExistsColumns", "showFields", "isExit", "toolbar"]; // import './index.less';
41
41
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
42
42
  var FormulaList = (0, _react.forwardRef)(function (props, ref) {
43
- var _storage$_metabaseCop;
43
+ var _storage$_metabaseCop, _caseList2;
44
44
  // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
45
45
  var _useState = (0, _react.useState)((_storage["default"] === null || _storage["default"] === void 0 || (_storage$_metabaseCop = _storage["default"]._metabaseCopyItems) === null || _storage$_metabaseCop === void 0 ? void 0 : _storage$_metabaseCop.length) || 0),
46
46
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -97,10 +97,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
97
97
  });
98
98
  return map;
99
99
  }, [otherTypes]);
100
- var _useState3 = (0, _react.useState)((0, _cloneDeep["default"])(value)),
101
- _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
102
- caseList = _useState4[0],
103
- setCaseListState = _useState4[1];
100
+ var caseList = value || [];
101
+ // const [caseList, setCaseListState] = useState<AtomsItem[]>(cloneDeep(value));
104
102
  var caseListRef = (0, _react.useRef)(caseList);
105
103
  var isSettingCaseList = (0, _react.useRef)(false);
106
104
  var operatorList = (0, _react.useMemo)(function () {
@@ -110,23 +108,23 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
110
108
  return _utils3.operatorList;
111
109
  }
112
110
  }, [store.operatorList]);
113
- var _useState5 = (0, _react.useState)(''),
111
+ var _useState3 = (0, _react.useState)(''),
112
+ _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
113
+ oldCode = _useState4[0],
114
+ setOldCode = _useState4[1];
115
+ var _useState5 = (0, _react.useState)('code'),
114
116
  _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
115
- oldCode = _useState6[0],
116
- setOldCode = _useState6[1];
117
- var _useState7 = (0, _react.useState)('code'),
118
- _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
119
- previewMode = _useState8[0],
120
- setPreviewMode = _useState8[1];
121
- var _useState9 = (0, _react.useState)(function () {
117
+ previewMode = _useState6[0],
118
+ setPreviewMode = _useState6[1];
119
+ var _useState7 = (0, _react.useState)(function () {
122
120
  if (store.copyType.includes(_types.FormulaTypeEnum.ALL)) {
123
121
  return true;
124
122
  }
125
123
  return store.copyType.includes(_type);
126
124
  }),
127
- _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
128
- isCopy = _useState0[0],
129
- setIsCopy = _useState0[1];
125
+ _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
126
+ isCopy = _useState8[0],
127
+ setIsCopy = _useState8[1];
130
128
  // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
131
129
  // );
132
130
  var formulaList = (0, _react.useMemo)(function () {
@@ -135,10 +133,10 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
135
133
  (0, _react.useEffect)(function () {
136
134
  setOldCode(getPreviewStr(caseList));
137
135
  }, []);
138
- var _useState1 = (0, _react.useState)(''),
139
- _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
140
- filterVal = _useState10[0],
141
- setFilterVal = _useState10[1];
136
+ var _useState9 = (0, _react.useState)(''),
137
+ _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
138
+ filterVal = _useState0[0],
139
+ setFilterVal = _useState0[1];
142
140
  var setCaseList = function setCaseList(data) {
143
141
  var quotes = data.map(function (v, i) {
144
142
  if (v !== null && v !== void 0 && v.quotes) {
@@ -150,39 +148,40 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
150
148
  }
151
149
  }).join(' ');
152
150
  isSettingCaseList.current = true;
153
- setCaseListState(data);
151
+ // setCaseListState(data);
152
+ caseList = data;
154
153
  caseListRef.current = data;
155
154
  onChange === null || onChange === void 0 || onChange(data, quotes);
156
155
  };
157
- var _useState11 = (0, _react.useState)(-1),
158
- _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
159
- ind = _useState12[0],
160
- setInd = _useState12[1];
156
+ var _useState1 = (0, _react.useState)(-1),
157
+ _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
158
+ ind = _useState10[0],
159
+ setInd = _useState10[1];
161
160
  var filterCustomType = store.filterCustomType;
162
161
  var _ref = (0, _react.useRef)(null);
163
- var _useState13 = (0, _react.useState)({
162
+ var _useState11 = (0, _react.useState)({
164
163
  isError: false
165
164
  }),
165
+ _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
166
+ errorInfo = _useState12[0],
167
+ setErrorInfo = _useState12[1];
168
+ var _useState13 = (0, _react.useState)(false),
166
169
  _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
167
- errorInfo = _useState14[0],
168
- setErrorInfo = _useState14[1];
169
- var _useState15 = (0, _react.useState)(false),
170
- _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
171
- isCheck = _useState16[0],
172
- setIsCheck = _useState16[1];
170
+ isCheck = _useState14[0],
171
+ setIsCheck = _useState14[1];
173
172
  var myInstanceIdRef = (0, _react.useRef)(Math.random().toString(36).slice(2));
174
- var _useState17 = (0, _react.useState)(!!window.__sqb_selection_active__),
173
+ var _useState15 = (0, _react.useState)(!!window.__sqb_selection_active__),
174
+ _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
175
+ globalSelectionActive = _useState16[0],
176
+ setGlobalSelectionActive = _useState16[1];
177
+ var _useState17 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
175
178
  _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
176
- globalSelectionActive = _useState18[0],
177
- setGlobalSelectionActive = _useState18[1];
178
- var _useState19 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
179
+ globalSelectionOwner = _useState18[0],
180
+ setGlobalSelectionOwner = _useState18[1];
181
+ var _useState19 = (0, _react.useState)([]),
179
182
  _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
180
- globalSelectionOwner = _useState20[0],
181
- setGlobalSelectionOwner = _useState20[1];
182
- var _useState21 = (0, _react.useState)([]),
183
- _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
184
- selectedIndices = _useState22[0],
185
- setSelectedIndices = _useState22[1];
183
+ selectedIndices = _useState20[0],
184
+ setSelectedIndices = _useState20[1];
186
185
  (0, _react.useEffect)(function () {
187
186
  // Skip if this update came from setCaseList (to avoid infinite loop)
188
187
  if (isSettingCaseList.current) {
@@ -483,7 +482,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
483
482
  } : (0, _utils3.getTemplateItem)(type);
484
483
  if (position === 'add') {
485
484
  _caseList.push(temItem);
486
- _ind = index + 1;
485
+ _ind = _caseList.length - 1;
487
486
  } else if (position === 'before') {
488
487
  _caseList.splice(index, 0, temItem);
489
488
  _ind = index;
@@ -1012,7 +1011,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
1012
1011
  },
1013
1012
  children: "\u6E05\u9664\u590D\u5236"
1014
1013
  })]
1015
- }), caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
1014
+ }), (_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.map(function (v, i) {
1016
1015
  return (0, _jsxRuntime.jsxs)(_react["default"].Fragment, {
1017
1016
  children: [copyDom(i), (0, _jsxRuntime.jsxs)("div", {
1018
1017
  className: (0, _classnames["default"])('Sqb-Filter-item', {
package/lib/es/components/dialog/formula/index.js CHANGED
@@ -5,6 +5,7 @@ var _templateObject;
5
5
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
6
6
  import React, { useEffect, useState, useMemo, useRef } from 'react';
7
7
  import cx from 'classnames';
8
+ import isEqual from 'lodash/isEqual';
8
9
  import './index.less';
9
10
  import FormulaList from '../formula-list';
10
11
  import { AddIcon, CloseIcon } from '../../icons';
@@ -22,7 +23,7 @@ var VisualBox = Styled.div.attrs({
22
23
  className: 'visual-box'
23
24
  })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
24
25
  var CaseEditor = React.forwardRef(function (props, ref) {
25
- var _store$formulaTemplat, _formulaList$fun$name, _formulaList$fun$name2, _fun$args;
26
+ var _store$formulaTemplat, _fun$args;
26
27
  var store = useStore();
27
28
  var value = props.value,
28
29
  data = props.data,
@@ -42,6 +43,11 @@ var CaseEditor = React.forwardRef(function (props, ref) {
42
43
  var formulaList = useMemo(function () {
43
44
  return getObjTem(store.formulaTemplates);
44
45
  }, [store.formulaTemplates]);
46
+ var currentFormulaKey = fun.id || fun.name;
47
+ var currentFormulaTemplate = useMemo(function () {
48
+ return formulaList[currentFormulaKey];
49
+ }, [formulaList, currentFormulaKey]);
50
+ var effectiveArity = (currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.arity) || fun.arity;
45
51
  var _useState3 = useState({
46
52
  canAdd: true,
47
53
  canDel: true
@@ -50,8 +56,23 @@ var CaseEditor = React.forwardRef(function (props, ref) {
50
56
  formulaOpr = _useState4[0],
51
57
  setFormulaOpr = _useState4[1];
52
58
  useEffect(function () {
53
- setFormulaOpr(getParamActions(fun.args, fun.arity));
54
- }, [fun]);
59
+ setFormulaOpr(getParamActions(fun.args, effectiveArity));
60
+ }, [fun.args, effectiveArity]);
61
+ useEffect(function () {
62
+ if (!currentFormulaTemplate) return;
63
+ setFun(function (prev) {
64
+ var nextId = prev.id || currentFormulaKey;
65
+ var nextName = currentFormulaTemplate.name || prev.name;
66
+ if (prev.id === nextId && prev.name === nextName && isEqual(prev.arity, effectiveArity)) {
67
+ return prev;
68
+ }
69
+ return _objectSpread(_objectSpread({}, prev), {}, {
70
+ id: nextId,
71
+ name: nextName,
72
+ arity: effectiveArity
73
+ });
74
+ });
75
+ }, [currentFormulaKey, currentFormulaTemplate, effectiveArity]);
55
76
  var _ref = useRef(null);
56
77
  // EXPRESSION = 'expression', // 表达式
57
78
  // // FUNCTION = 'function', // 函数
@@ -75,6 +96,9 @@ var CaseEditor = React.forwardRef(function (props, ref) {
75
96
  // 确定
76
97
  var _onOk = function _onOk() {
77
98
  typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk(_objectSpread(_objectSpread({}, fun), {}, {
99
+ arity: effectiveArity,
100
+ id: currentFormulaKey,
101
+ name: (currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.name) || fun.name,
78
102
  quotes: getQuotes(fun, fun.args, formulaList)
79
103
  })));
80
104
  };
@@ -92,7 +116,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
92
116
  };
93
117
  var addParams = function addParams(index) {
94
118
  var _args = cloneDeep(fun.args);
95
- var tem = getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[fun.name].args)[index + 1] || {
119
+ var tem = getTemArgs(currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.args)[index + 1] || {
96
120
  type: AtomsTypeEnum.COLLECTION,
97
121
  list: []
98
122
  };
@@ -171,14 +195,14 @@ var CaseEditor = React.forwardRef(function (props, ref) {
171
195
  color: '#949aab'
172
196
  },
173
197
  children: [_jsxs("p", {
174
- children: ["\u63CF\u8FF0\uFF1A", (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.description]
198
+ children: ["\u63CF\u8FF0\uFF1A", currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.description]
175
199
  }), _jsxs("p", {
176
- children: ["\u6848\u4F8B\uFF1A", (_formulaList$fun$name2 = formulaList[fun.name]) === null || _formulaList$fun$name2 === void 0 ? void 0 : _formulaList$fun$name2.example]
200
+ children: ["\u6848\u4F8B\uFF1A", currentFormulaTemplate === null || currentFormulaTemplate === void 0 ? void 0 : currentFormulaTemplate.example]
177
201
  })]
178
202
  })]
179
203
  }), fun === null || fun === void 0 || (_fun$args = fun.args) === null || _fun$args === void 0 ? void 0 : _fun$args.map(function (v, i) {
180
204
  if (v.type === AtomsTypeEnum.COLLECTION) {
181
- var _store$preProps, _formulaList$fun$name3;
205
+ var _store$preProps, _currentFormulaTempla;
182
206
  return _jsxs("div", {
183
207
  className: 'Sqb-item-formula-args',
184
208
  children: [_jsxs("div", {
@@ -192,7 +216,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
192
216
  children: ["\u53C2\u6570", i + 1, ":"]
193
217
  }), _jsx(FormulaList, {
194
218
  otherTypes: (_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.otherTypes,
195
- check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name3 = formulaList[fun.name]) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3.args) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3[i]) === null || _formulaList$fun$name3 === void 0 ? void 0 : _formulaList$fun$name3.check) || '',
219
+ check: (currentFormulaTemplate === null || currentFormulaTemplate === void 0 || (_currentFormulaTempla = currentFormulaTemplate.args) === null || _currentFormulaTempla === void 0 || (_currentFormulaTempla = _currentFormulaTempla[i]) === null || _currentFormulaTempla === void 0 ? void 0 : _currentFormulaTempla.check) || '',
196
220
  value: v.list,
197
221
  data: data,
198
222
  ref: _ref,
package/lib/es/components/dialog/formula-list/index.js CHANGED
@@ -32,7 +32,7 @@ import ItemName from '../../modules/components/item-name';
32
32
  import DiffViewer from '../diff-viewer';
33
33
  import storage from '../../../utils/storage';
34
34
  var FormulaList = forwardRef(function (props, ref) {
35
- var _storage$_metabaseCop;
35
+ var _storage$_metabaseCop, _caseList2;
36
36
  // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
37
37
  var _useState = useState((storage === null || storage === void 0 || (_storage$_metabaseCop = storage._metabaseCopyItems) === null || _storage$_metabaseCop === void 0 ? void 0 : _storage$_metabaseCop.length) || 0),
38
38
  _useState2 = _slicedToArray(_useState, 2),
@@ -89,10 +89,8 @@ var FormulaList = forwardRef(function (props, ref) {
89
89
  });
90
90
  return map;
91
91
  }, [otherTypes]);
92
- var _useState3 = useState(cloneDeep(value)),
93
- _useState4 = _slicedToArray(_useState3, 2),
94
- caseList = _useState4[0],
95
- setCaseListState = _useState4[1];
92
+ var caseList = value || [];
93
+ // const [caseList, setCaseListState] = useState<AtomsItem[]>(cloneDeep(value));
96
94
  var caseListRef = useRef(caseList);
97
95
  var isSettingCaseList = useRef(false);
98
96
  var operatorList = useMemo(function () {
@@ -102,23 +100,23 @@ var FormulaList = forwardRef(function (props, ref) {
102
100
  return __operatorList;
103
101
  }
104
102
  }, [store.operatorList]);
105
- var _useState5 = useState(''),
103
+ var _useState3 = useState(''),
104
+ _useState4 = _slicedToArray(_useState3, 2),
105
+ oldCode = _useState4[0],
106
+ setOldCode = _useState4[1];
107
+ var _useState5 = useState('code'),
106
108
  _useState6 = _slicedToArray(_useState5, 2),
107
- oldCode = _useState6[0],
108
- setOldCode = _useState6[1];
109
- var _useState7 = useState('code'),
110
- _useState8 = _slicedToArray(_useState7, 2),
111
- previewMode = _useState8[0],
112
- setPreviewMode = _useState8[1];
113
- var _useState9 = useState(function () {
109
+ previewMode = _useState6[0],
110
+ setPreviewMode = _useState6[1];
111
+ var _useState7 = useState(function () {
114
112
  if (store.copyType.includes(FormulaTypeEnum.ALL)) {
115
113
  return true;
116
114
  }
117
115
  return store.copyType.includes(_type);
118
116
  }),
119
- _useState0 = _slicedToArray(_useState9, 2),
120
- isCopy = _useState0[0],
121
- setIsCopy = _useState0[1];
117
+ _useState8 = _slicedToArray(_useState7, 2),
118
+ isCopy = _useState8[0],
119
+ setIsCopy = _useState8[1];
122
120
  // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
123
121
  // );
124
122
  var formulaList = useMemo(function () {
@@ -127,10 +125,10 @@ var FormulaList = forwardRef(function (props, ref) {
127
125
  useEffect(function () {
128
126
  setOldCode(getPreviewStr(caseList));
129
127
  }, []);
130
- var _useState1 = useState(''),
131
- _useState10 = _slicedToArray(_useState1, 2),
132
- filterVal = _useState10[0],
133
- setFilterVal = _useState10[1];
128
+ var _useState9 = useState(''),
129
+ _useState0 = _slicedToArray(_useState9, 2),
130
+ filterVal = _useState0[0],
131
+ setFilterVal = _useState0[1];
134
132
  var setCaseList = function setCaseList(data) {
135
133
  var quotes = data.map(function (v, i) {
136
134
  if (v !== null && v !== void 0 && v.quotes) {
@@ -142,39 +140,40 @@ var FormulaList = forwardRef(function (props, ref) {
142
140
  }
143
141
  }).join(' ');
144
142
  isSettingCaseList.current = true;
145
- setCaseListState(data);
143
+ // setCaseListState(data);
144
+ caseList = data;
146
145
  caseListRef.current = data;
147
146
  onChange === null || onChange === void 0 || onChange(data, quotes);
148
147
  };
149
- var _useState11 = useState(-1),
150
- _useState12 = _slicedToArray(_useState11, 2),
151
- ind = _useState12[0],
152
- setInd = _useState12[1];
148
+ var _useState1 = useState(-1),
149
+ _useState10 = _slicedToArray(_useState1, 2),
150
+ ind = _useState10[0],
151
+ setInd = _useState10[1];
153
152
  var filterCustomType = store.filterCustomType;
154
153
  var _ref = useRef(null);
155
- var _useState13 = useState({
154
+ var _useState11 = useState({
156
155
  isError: false
157
156
  }),
157
+ _useState12 = _slicedToArray(_useState11, 2),
158
+ errorInfo = _useState12[0],
159
+ setErrorInfo = _useState12[1];
160
+ var _useState13 = useState(false),
158
161
  _useState14 = _slicedToArray(_useState13, 2),
159
- errorInfo = _useState14[0],
160
- setErrorInfo = _useState14[1];
161
- var _useState15 = useState(false),
162
- _useState16 = _slicedToArray(_useState15, 2),
163
- isCheck = _useState16[0],
164
- setIsCheck = _useState16[1];
162
+ isCheck = _useState14[0],
163
+ setIsCheck = _useState14[1];
165
164
  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
166
- var _useState17 = useState(!!window.__sqb_selection_active__),
165
+ var _useState15 = useState(!!window.__sqb_selection_active__),
166
+ _useState16 = _slicedToArray(_useState15, 2),
167
+ globalSelectionActive = _useState16[0],
168
+ setGlobalSelectionActive = _useState16[1];
169
+ var _useState17 = useState(window.__sqb_selection_owner__ || null),
167
170
  _useState18 = _slicedToArray(_useState17, 2),
168
- globalSelectionActive = _useState18[0],
169
- setGlobalSelectionActive = _useState18[1];
170
- var _useState19 = useState(window.__sqb_selection_owner__ || null),
171
+ globalSelectionOwner = _useState18[0],
172
+ setGlobalSelectionOwner = _useState18[1];
173
+ var _useState19 = useState([]),
171
174
  _useState20 = _slicedToArray(_useState19, 2),
172
- globalSelectionOwner = _useState20[0],
173
- setGlobalSelectionOwner = _useState20[1];
174
- var _useState21 = useState([]),
175
- _useState22 = _slicedToArray(_useState21, 2),
176
- selectedIndices = _useState22[0],
177
- setSelectedIndices = _useState22[1];
175
+ selectedIndices = _useState20[0],
176
+ setSelectedIndices = _useState20[1];
178
177
  useEffect(function () {
179
178
  // Skip if this update came from setCaseList (to avoid infinite loop)
180
179
  if (isSettingCaseList.current) {
@@ -475,7 +474,7 @@ var FormulaList = forwardRef(function (props, ref) {
475
474
  } : getTemplateItem(type);
476
475
  if (position === 'add') {
477
476
  _caseList.push(temItem);
478
- _ind = index + 1;
477
+ _ind = _caseList.length - 1;
479
478
  } else if (position === 'before') {
480
479
  _caseList.splice(index, 0, temItem);
481
480
  _ind = index;
@@ -1004,7 +1003,7 @@ var FormulaList = forwardRef(function (props, ref) {
1004
1003
  },
1005
1004
  children: "\u6E05\u9664\u590D\u5236"
1006
1005
  })]
1007
- }), caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
1006
+ }), (_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.map(function (v, i) {
1008
1007
  return _jsxs(React.Fragment, {
1009
1008
  children: [copyDom(i), _jsxs("div", {
1010
1009
  className: cx('Sqb-Filter-item', {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.114",
3
+ "version": "1.0.116",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",