@gingkoo/pandora-metabase 1.0.50 → 1.0.52

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 (27) hide show
  1. package/lib/cjs/components/dialog/custom-column/index.less +1 -1
  2. package/lib/cjs/components/dialog/select-column-multiple/index.js +54 -12
  3. package/lib/cjs/components/dialog/select-column-multiple/index.less +1 -1
  4. package/lib/cjs/components/dialog/select-join/index.less +1 -1
  5. package/lib/cjs/components/dialog/select-join-column/index.js +51 -9
  6. package/lib/cjs/components/dialog/select-join-column/index.less +1 -1
  7. package/lib/cjs/components/dialog/select-join-column-multiple/index.less +1 -1
  8. package/lib/cjs/components/dialog/select-list/index.less +1 -1
  9. package/lib/cjs/components/dialog/select-permission-table/index.js +1 -1
  10. package/lib/cjs/components/dialog/select-permission-table/index.less +2 -2
  11. package/lib/cjs/components/dialog/select-summarize/index.less +1 -1
  12. package/lib/cjs/components/dialog/select-table/index.js +2 -2
  13. package/lib/cjs/components/dialog/select-table/index.less +2 -2
  14. package/lib/es/components/dialog/custom-column/index.less +1 -1
  15. package/lib/es/components/dialog/select-column-multiple/index.js +54 -12
  16. package/lib/es/components/dialog/select-column-multiple/index.less +1 -1
  17. package/lib/es/components/dialog/select-join/index.less +1 -1
  18. package/lib/es/components/dialog/select-join-column/index.js +51 -9
  19. package/lib/es/components/dialog/select-join-column/index.less +1 -1
  20. package/lib/es/components/dialog/select-join-column-multiple/index.less +1 -1
  21. package/lib/es/components/dialog/select-list/index.less +1 -1
  22. package/lib/es/components/dialog/select-permission-table/index.js +1 -1
  23. package/lib/es/components/dialog/select-permission-table/index.less +2 -2
  24. package/lib/es/components/dialog/select-summarize/index.less +1 -1
  25. package/lib/es/components/dialog/select-table/index.js +2 -2
  26. package/lib/es/components/dialog/select-table/index.less +2 -2
  27. package/package.json +1 -1
package/lib/cjs/components/dialog/custom-column/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-CustomColumn--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/cjs/components/dialog/select-column-multiple/index.js CHANGED
@@ -72,9 +72,13 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
72
72
  _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
73
73
  curTable = _useState4[0],
74
74
  setCurTable = _useState4[1];
75
+ var _useState5 = (0, _react.useState)(''),
76
+ _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
77
+ searchTableText = _useState6[0],
78
+ setSearchTableText = _useState6[1]; // 搜索表的文字
75
79
  // 当前选择的表
76
80
  // const [curColumn, setCurColumn] = useState(_value); // 当前选择的字段
77
- var _useState5 = (0, _react.useState)(data.map(function (v, i) {
81
+ var _useState7 = (0, _react.useState)(data.map(function (v, i) {
78
82
  var open = !i && !curTable ? true : v.tableUuid === curTable; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
79
83
  return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
80
84
  open: open,
@@ -82,16 +86,16 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
82
86
  columns: v.columns.slice()
83
87
  });
84
88
  })),
85
- _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
86
- tableList = _useState6[0],
87
- setTableList = _useState6[1];
89
+ _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
90
+ tableList = _useState8[0],
91
+ setTableList = _useState8[1];
88
92
  (0, _react.useEffect)(function () {
89
93
  // setCurColumn(_value);
90
94
  setValue(_value);
91
95
  }, [_value]);
92
- var isActive = function isActive(id) {
96
+ var isActive = function isActive(id_alias) {
93
97
  return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
94
- return v.fieldId === id;
98
+ return v.fieldId + v.fieldAlias === id_alias;
95
99
  }).length) > 0;
96
100
  };
97
101
  (0, _react.useEffect)(function () {
@@ -174,15 +178,49 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
174
178
  setCurTable(tableUuid);
175
179
  onSelect === null || onSelect === void 0 || onSelect(_value, getQuotes(_value));
176
180
  };
181
+ var onTableInput = function onTableInput(val) {
182
+ var newData = (0, _cloneDeep["default"])(data).map(function (v, i) {
183
+ var tableAlias = v.alias,
184
+ tableName = v.name,
185
+ _v$datasourceName = v.datasourceName,
186
+ datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
187
+ var fullName = datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName;
188
+ if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
189
+ // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
190
+ return (0, _objectSpread2["default"])({}, v);
191
+ }
192
+ return null;
193
+ }).filter(function (v) {
194
+ return v;
195
+ });
196
+ setSearchTableText(val);
197
+ setTableList(newData);
198
+ };
177
199
  // const _condition = value?.condition || '';
178
200
  return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
179
201
  children: [(0, _jsxRuntime.jsx)("div", {
180
202
  className: (0, _classnames["default"])("Sqb-SelectColumns--box ".concat(theme)),
181
- children: (0, _jsxRuntime.jsx)("div", {
203
+ children: (0, _jsxRuntime.jsxs)("div", {
182
204
  style: {
183
- width: 300
205
+ minWidth: 300
184
206
  },
185
- children: tableList.map(function (tableItem, i) {
207
+ children: [data.length > 1 && (0, _jsxRuntime.jsxs)("div", {
208
+ className: (0, _classnames["default"])("Sqb-List-search m-2 rounded-lg"),
209
+ children: [(0, _jsxRuntime.jsx)("span", {
210
+ className: 'px-2',
211
+ children: (0, _jsxRuntime.jsx)(_icons.SearchIcon, {})
212
+ }), (0, _jsxRuntime.jsx)("input", {
213
+ type: 'text',
214
+ className: 'p-2',
215
+ autoFocus: true,
216
+ value: searchTableText,
217
+ placeholder: (0, _locale.__)('joinData.search'),
218
+ onChange: function onChange() {},
219
+ onInput: function onInput(e) {
220
+ return onTableInput(e.target.value);
221
+ }
222
+ })]
223
+ }), tableList.map(function (tableItem, i) {
186
224
  var tableAlias = tableItem.alias,
187
225
  tableName = tableItem.name,
188
226
  columns = tableItem.columns,
@@ -195,6 +233,10 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
195
233
  _tableItem$tableUuid = tableItem.tableUuid,
196
234
  tableUuid = _tableItem$tableUuid === void 0 ? '' : _tableItem$tableUuid;
197
235
  var isMultiple = tableList.length > 1;
236
+ // 只有一张表时 展开
237
+ if (!isMultiple) {
238
+ open = true;
239
+ }
198
240
  var isSummarize = tableAlias === _helper.SummarizeAlias;
199
241
  return (0, _jsxRuntime.jsxs)("div", {
200
242
  children: [!isSummarize && (0, _jsxRuntime.jsx)("div", {
@@ -255,7 +297,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
255
297
  }), (0, _jsxRuntime.jsx)("input", {
256
298
  type: 'text',
257
299
  className: 'p-2',
258
- autoFocus: true,
300
+ // autoFocus
259
301
  value: searchText,
260
302
  placeholder: (0, _locale.__)('joinData.search'),
261
303
  onChange: function onChange() {},
@@ -287,7 +329,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
287
329
  className: (0, _classnames["default"])("Sqb-List-section"),
288
330
  children: (0, _jsxRuntime.jsx)("div", {
289
331
  className: (0, _classnames["default"])("Sqb-List-item mx-2", {
290
- active: isActive(v.id || v.name)
332
+ active: isActive((v.id || v.name) + v.fieldAlias)
291
333
  }),
292
334
  onClick: function onClick() {
293
335
  if (isSummarize) {
@@ -341,7 +383,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
341
383
  })]
342
384
  })]
343
385
  }, (tableUuid || tableAlias) + '' + i);
344
- })
386
+ })]
345
387
  })
346
388
  }), showNextBtn && multiple && (0, _jsxRuntime.jsx)(_pandora.Button, {
347
389
  block: true,
package/lib/cjs/components/dialog/select-column-multiple/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectColumns--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/cjs/components/dialog/select-join/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectJoin--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/cjs/components/dialog/select-join-column/index.js CHANGED
@@ -69,7 +69,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
69
69
  _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
70
70
  curColumn = _useState6[0],
71
71
  setCurColumn = _useState6[1]; // 当前选择的字段
72
- var _useState7 = (0, _react.useState)(data.map(function (v, i) {
72
+ var _useState7 = (0, _react.useState)(''),
73
+ _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
74
+ searchTableText = _useState8[0],
75
+ setSearchTableText = _useState8[1]; // 搜索表的文字
76
+ var _useState9 = (0, _react.useState)(data.map(function (v, i) {
73
77
  var open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
74
78
  return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
75
79
  open: open,
@@ -77,9 +81,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
77
81
  columns: v.columns.slice()
78
82
  });
79
83
  })),
80
- _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
81
- tableList = _useState8[0],
82
- setTableList = _useState8[1];
84
+ _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
85
+ tableList = _useState0[0],
86
+ setTableList = _useState0[1];
83
87
  (0, _react.useEffect)(function () {
84
88
  setValue(_value);
85
89
  setCurColumn(_value.name);
@@ -120,14 +124,48 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
120
124
  });
121
125
  setTableList(newData);
122
126
  }
127
+ var onTableInput = function onTableInput(val) {
128
+ var newData = (0, _cloneDeep["default"])(data).map(function (v, i) {
129
+ var tableAlias = v.alias,
130
+ tableName = v.name,
131
+ _v$datasourceName = v.datasourceName,
132
+ datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
133
+ var fullName = datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName;
134
+ if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
135
+ // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
136
+ return (0, _objectSpread2["default"])({}, v);
137
+ }
138
+ return null;
139
+ }).filter(function (v) {
140
+ return v;
141
+ });
142
+ setSearchTableText(val);
143
+ setTableList(newData);
144
+ };
123
145
  var _condition = (value === null || value === void 0 ? void 0 : value.condition) || '';
124
146
  return (0, _jsxRuntime.jsx)("div", {
125
147
  className: (0, _classnames["default"])("Sqb-SelectColumns--box ".concat(theme)),
126
- children: (0, _jsxRuntime.jsx)("div", {
148
+ children: (0, _jsxRuntime.jsxs)("div", {
127
149
  style: {
128
- width: isGroup && OPEN_GROUP ? 400 : 300
150
+ minWidth: 300
129
151
  },
130
- children: tableList.map(function (tableItem) {
152
+ children: [data.length > 1 && (0, _jsxRuntime.jsxs)("div", {
153
+ className: (0, _classnames["default"])("Sqb-List-search m-2 rounded-lg"),
154
+ children: [(0, _jsxRuntime.jsx)("span", {
155
+ className: 'px-2',
156
+ children: (0, _jsxRuntime.jsx)(_icons.SearchIcon, {})
157
+ }), (0, _jsxRuntime.jsx)("input", {
158
+ type: 'text',
159
+ className: 'p-2',
160
+ autoFocus: true,
161
+ value: searchTableText,
162
+ placeholder: (0, _locale.__)('joinData.search'),
163
+ onChange: function onChange() {},
164
+ onInput: function onInput(e) {
165
+ return onTableInput(e.target.value);
166
+ }
167
+ })]
168
+ }), tableList.map(function (tableItem) {
131
169
  var tableAlias = tableItem.alias,
132
170
  table = tableItem.table,
133
171
  tableId = tableItem.tableId,
@@ -141,6 +179,10 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
141
179
  _tableItem$tableUuid = tableItem.tableUuid,
142
180
  tableUuid = _tableItem$tableUuid === void 0 ? '' : _tableItem$tableUuid;
143
181
  var isMultiple = tableList.length > 1;
182
+ // 只有一张表时 展开
183
+ if (!isMultiple) {
184
+ open = true;
185
+ }
144
186
  var isSummarize = tableAlias === _helper.SummarizeAlias;
145
187
  return (0, _jsxRuntime.jsxs)("div", {
146
188
  children: [!isSummarize && (0, _jsxRuntime.jsx)("div", {
@@ -198,7 +240,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
198
240
  }), (0, _jsxRuntime.jsx)("input", {
199
241
  type: 'text',
200
242
  className: 'p-2',
201
- autoFocus: true,
243
+ // autoFocus
202
244
  value: searchText,
203
245
  placeholder: (0, _locale.__)('joinData.search'),
204
246
  onChange: function onChange() {},
@@ -354,7 +396,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
354
396
  })]
355
397
  })]
356
398
  }, tableUuid || tableAlias);
357
- })
399
+ })]
358
400
  })
359
401
  });
360
402
  };
package/lib/cjs/components/dialog/select-join-column/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectColumns--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/cjs/components/dialog/select-join-column-multiple/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectColumns--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/cjs/components/dialog/select-list/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectColumns--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/cjs/components/dialog/select-permission-table/index.js CHANGED
@@ -45,7 +45,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
45
45
  className: (0, _classnames["default"])("Sqb-SelectTable--box pb-2 pt-2"),
46
46
  children: (0, _jsxRuntime.jsx)("div", {
47
47
  style: {
48
- width: 300
48
+ minWidth: 300
49
49
  },
50
50
  children: (0, _jsxRuntime.jsxs)("div", {
51
51
  style: {
package/lib/cjs/components/dialog/select-permission-table/index.less CHANGED
@@ -1,7 +1,7 @@
1
1
  .Sqb-SelectDataSource--box {
2
2
  box-sizing: border-box;
3
3
  min-width: 1em;
4
- max-width: 500px;
4
+ max-width: 700px;
5
5
  background-color: #ffffff;
6
6
  overflow: hidden;
7
7
 
@@ -52,7 +52,7 @@
52
52
  .Sqb-SelectTable--box {
53
53
  box-sizing: border-box;
54
54
  min-width: 1em;
55
- max-width: 500px;
55
+ max-width: 700px;
56
56
  background-color: #ffffff;
57
57
  overflow: hidden;
58
58
 
package/lib/cjs/components/dialog/select-summarize/index.less CHANGED
@@ -1,7 +1,7 @@
1
1
  .Sqb-SelectSummarize-group--box {
2
2
  box-sizing: border-box;
3
3
  min-width: 1em;
4
- max-width: 500px;
4
+ max-width: 700px;
5
5
  background-color: #ffffff;
6
6
  overflow: hidden;
7
7
 
package/lib/cjs/components/dialog/select-table/index.js CHANGED
@@ -111,7 +111,7 @@ var SelectTable = function SelectTable(_ref) {
111
111
  className: (0, _classnames["default"])("Sqb-SelectDataSource--box pb-2 pt-2"),
112
112
  children: (0, _jsxRuntime.jsx)("div", {
113
113
  style: {
114
- width: 300
114
+ minWidth: 300
115
115
  },
116
116
  children: (0, _jsxRuntime.jsx)("div", {
117
117
  style: {
@@ -159,7 +159,7 @@ var SelectTable = function SelectTable(_ref) {
159
159
  className: (0, _classnames["default"])("Sqb-SelectTable--box pb-2"),
160
160
  children: (0, _jsxRuntime.jsx)("div", {
161
161
  style: {
162
- width: 300
162
+ minWidth: 300
163
163
  },
164
164
  children: (0, _jsxRuntime.jsxs)("div", {
165
165
  style: {
package/lib/cjs/components/dialog/select-table/index.less CHANGED
@@ -1,7 +1,7 @@
1
1
  .Sqb-SelectDataSource--box {
2
2
  box-sizing: border-box;
3
3
  min-width: 1em;
4
- max-width: 500px;
4
+ max-width: 700px;
5
5
  background-color: #ffffff;
6
6
  overflow: hidden;
7
7
 
@@ -52,7 +52,7 @@
52
52
  .Sqb-SelectTable--box {
53
53
  box-sizing: border-box;
54
54
  min-width: 1em;
55
- max-width: 500px;
55
+ max-width: 700px;
56
56
  background-color: #ffffff;
57
57
  overflow: hidden;
58
58
 
package/lib/es/components/dialog/custom-column/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-CustomColumn--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/es/components/dialog/select-column-multiple/index.js CHANGED
@@ -66,9 +66,13 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
66
66
  _useState4 = _slicedToArray(_useState3, 2),
67
67
  curTable = _useState4[0],
68
68
  setCurTable = _useState4[1];
69
+ var _useState5 = useState(''),
70
+ _useState6 = _slicedToArray(_useState5, 2),
71
+ searchTableText = _useState6[0],
72
+ setSearchTableText = _useState6[1]; // 搜索表的文字
69
73
  // 当前选择的表
70
74
  // const [curColumn, setCurColumn] = useState(_value); // 当前选择的字段
71
- var _useState5 = useState(data.map(function (v, i) {
75
+ var _useState7 = useState(data.map(function (v, i) {
72
76
  var open = !i && !curTable ? true : v.tableUuid === curTable; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
73
77
  return _objectSpread(_objectSpread({}, v), {}, {
74
78
  open: open,
@@ -76,16 +80,16 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
76
80
  columns: v.columns.slice()
77
81
  });
78
82
  })),
79
- _useState6 = _slicedToArray(_useState5, 2),
80
- tableList = _useState6[0],
81
- setTableList = _useState6[1];
83
+ _useState8 = _slicedToArray(_useState7, 2),
84
+ tableList = _useState8[0],
85
+ setTableList = _useState8[1];
82
86
  useEffect(function () {
83
87
  // setCurColumn(_value);
84
88
  setValue(_value);
85
89
  }, [_value]);
86
- var isActive = function isActive(id) {
90
+ var isActive = function isActive(id_alias) {
87
91
  return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
88
- return v.fieldId === id;
92
+ return v.fieldId + v.fieldAlias === id_alias;
89
93
  }).length) > 0;
90
94
  };
91
95
  useEffect(function () {
@@ -168,15 +172,49 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
168
172
  setCurTable(tableUuid);
169
173
  onSelect === null || onSelect === void 0 || onSelect(_value, getQuotes(_value));
170
174
  };
175
+ var onTableInput = function onTableInput(val) {
176
+ var newData = cloneDeep(data).map(function (v, i) {
177
+ var tableAlias = v.alias,
178
+ tableName = v.name,
179
+ _v$datasourceName = v.datasourceName,
180
+ datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
181
+ var fullName = datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName;
182
+ if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
183
+ // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
184
+ return _objectSpread({}, v);
185
+ }
186
+ return null;
187
+ }).filter(function (v) {
188
+ return v;
189
+ });
190
+ setSearchTableText(val);
191
+ setTableList(newData);
192
+ };
171
193
  // const _condition = value?.condition || '';
172
194
  return _jsxs(_Fragment, {
173
195
  children: [_jsx("div", {
174
196
  className: cx("Sqb-SelectColumns--box ".concat(theme)),
175
- children: _jsx("div", {
197
+ children: _jsxs("div", {
176
198
  style: {
177
- width: 300
199
+ minWidth: 300
178
200
  },
179
- children: tableList.map(function (tableItem, i) {
201
+ children: [data.length > 1 && _jsxs("div", {
202
+ className: cx("Sqb-List-search m-2 rounded-lg"),
203
+ children: [_jsx("span", {
204
+ className: 'px-2',
205
+ children: _jsx(SearchIcon, {})
206
+ }), _jsx("input", {
207
+ type: 'text',
208
+ className: 'p-2',
209
+ autoFocus: true,
210
+ value: searchTableText,
211
+ placeholder: __('joinData.search'),
212
+ onChange: function onChange() {},
213
+ onInput: function onInput(e) {
214
+ return onTableInput(e.target.value);
215
+ }
216
+ })]
217
+ }), tableList.map(function (tableItem, i) {
180
218
  var tableAlias = tableItem.alias,
181
219
  tableName = tableItem.name,
182
220
  columns = tableItem.columns,
@@ -189,6 +227,10 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
189
227
  _tableItem$tableUuid = tableItem.tableUuid,
190
228
  tableUuid = _tableItem$tableUuid === void 0 ? '' : _tableItem$tableUuid;
191
229
  var isMultiple = tableList.length > 1;
230
+ // 只有一张表时 展开
231
+ if (!isMultiple) {
232
+ open = true;
233
+ }
192
234
  var isSummarize = tableAlias === SummarizeAlias;
193
235
  return _jsxs("div", {
194
236
  children: [!isSummarize && _jsx("div", {
@@ -249,7 +291,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
249
291
  }), _jsx("input", {
250
292
  type: 'text',
251
293
  className: 'p-2',
252
- autoFocus: true,
294
+ // autoFocus
253
295
  value: searchText,
254
296
  placeholder: __('joinData.search'),
255
297
  onChange: function onChange() {},
@@ -281,7 +323,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
281
323
  className: cx("Sqb-List-section"),
282
324
  children: _jsx("div", {
283
325
  className: cx("Sqb-List-item mx-2", {
284
- active: isActive(v.id || v.name)
326
+ active: isActive((v.id || v.name) + v.fieldAlias)
285
327
  }),
286
328
  onClick: function onClick() {
287
329
  if (isSummarize) {
@@ -335,7 +377,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
335
377
  })]
336
378
  })]
337
379
  }, (tableUuid || tableAlias) + '' + i);
338
- })
380
+ })]
339
381
  })
340
382
  }), showNextBtn && multiple && _jsx(Button, {
341
383
  block: true,
package/lib/es/components/dialog/select-column-multiple/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectColumns--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/es/components/dialog/select-join/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectJoin--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/es/components/dialog/select-join-column/index.js CHANGED
@@ -61,7 +61,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
61
61
  _useState6 = _slicedToArray(_useState5, 2),
62
62
  curColumn = _useState6[0],
63
63
  setCurColumn = _useState6[1]; // 当前选择的字段
64
- var _useState7 = useState(data.map(function (v, i) {
64
+ var _useState7 = useState(''),
65
+ _useState8 = _slicedToArray(_useState7, 2),
66
+ searchTableText = _useState8[0],
67
+ setSearchTableText = _useState8[1]; // 搜索表的文字
68
+ var _useState9 = useState(data.map(function (v, i) {
65
69
  var open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
66
70
  return _objectSpread(_objectSpread({}, v), {}, {
67
71
  open: open,
@@ -69,9 +73,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
69
73
  columns: v.columns.slice()
70
74
  });
71
75
  })),
72
- _useState8 = _slicedToArray(_useState7, 2),
73
- tableList = _useState8[0],
74
- setTableList = _useState8[1];
76
+ _useState0 = _slicedToArray(_useState9, 2),
77
+ tableList = _useState0[0],
78
+ setTableList = _useState0[1];
75
79
  useEffect(function () {
76
80
  setValue(_value);
77
81
  setCurColumn(_value.name);
@@ -112,14 +116,48 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
112
116
  });
113
117
  setTableList(newData);
114
118
  }
119
+ var onTableInput = function onTableInput(val) {
120
+ var newData = cloneDeep(data).map(function (v, i) {
121
+ var tableAlias = v.alias,
122
+ tableName = v.name,
123
+ _v$datasourceName = v.datasourceName,
124
+ datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
125
+ var fullName = datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName;
126
+ if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
127
+ // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
128
+ return _objectSpread({}, v);
129
+ }
130
+ return null;
131
+ }).filter(function (v) {
132
+ return v;
133
+ });
134
+ setSearchTableText(val);
135
+ setTableList(newData);
136
+ };
115
137
  var _condition = (value === null || value === void 0 ? void 0 : value.condition) || '';
116
138
  return _jsx("div", {
117
139
  className: cx("Sqb-SelectColumns--box ".concat(theme)),
118
- children: _jsx("div", {
140
+ children: _jsxs("div", {
119
141
  style: {
120
- width: isGroup && OPEN_GROUP ? 400 : 300
142
+ minWidth: 300
121
143
  },
122
- children: tableList.map(function (tableItem) {
144
+ children: [data.length > 1 && _jsxs("div", {
145
+ className: cx("Sqb-List-search m-2 rounded-lg"),
146
+ children: [_jsx("span", {
147
+ className: 'px-2',
148
+ children: _jsx(SearchIcon, {})
149
+ }), _jsx("input", {
150
+ type: 'text',
151
+ className: 'p-2',
152
+ autoFocus: true,
153
+ value: searchTableText,
154
+ placeholder: __('joinData.search'),
155
+ onChange: function onChange() {},
156
+ onInput: function onInput(e) {
157
+ return onTableInput(e.target.value);
158
+ }
159
+ })]
160
+ }), tableList.map(function (tableItem) {
123
161
  var tableAlias = tableItem.alias,
124
162
  table = tableItem.table,
125
163
  tableId = tableItem.tableId,
@@ -133,6 +171,10 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
133
171
  _tableItem$tableUuid = tableItem.tableUuid,
134
172
  tableUuid = _tableItem$tableUuid === void 0 ? '' : _tableItem$tableUuid;
135
173
  var isMultiple = tableList.length > 1;
174
+ // 只有一张表时 展开
175
+ if (!isMultiple) {
176
+ open = true;
177
+ }
136
178
  var isSummarize = tableAlias === SummarizeAlias;
137
179
  return _jsxs("div", {
138
180
  children: [!isSummarize && _jsx("div", {
@@ -190,7 +232,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
190
232
  }), _jsx("input", {
191
233
  type: 'text',
192
234
  className: 'p-2',
193
- autoFocus: true,
235
+ // autoFocus
194
236
  value: searchText,
195
237
  placeholder: __('joinData.search'),
196
238
  onChange: function onChange() {},
@@ -346,7 +388,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
346
388
  })]
347
389
  })]
348
390
  }, tableUuid || tableAlias);
349
- })
391
+ })]
350
392
  })
351
393
  });
352
394
  };
package/lib/es/components/dialog/select-join-column/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectColumns--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/es/components/dialog/select-join-column-multiple/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectColumns--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/es/components/dialog/select-list/index.less CHANGED
@@ -2,7 +2,7 @@
2
2
  .Sqb-SelectColumns--box {
3
3
  box-sizing: border-box;
4
4
  min-width: 1em;
5
- max-width: 500px;
5
+ max-width: 700px;
6
6
  background-color: #ffffff;
7
7
  overflow: hidden;
8
8
 
package/lib/es/components/dialog/select-permission-table/index.js CHANGED
@@ -37,7 +37,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
37
37
  className: cx("Sqb-SelectTable--box pb-2 pt-2"),
38
38
  children: _jsx("div", {
39
39
  style: {
40
- width: 300
40
+ minWidth: 300
41
41
  },
42
42
  children: _jsxs("div", {
43
43
  style: {
package/lib/es/components/dialog/select-permission-table/index.less CHANGED
@@ -1,7 +1,7 @@
1
1
  .Sqb-SelectDataSource--box {
2
2
  box-sizing: border-box;
3
3
  min-width: 1em;
4
- max-width: 500px;
4
+ max-width: 700px;
5
5
  background-color: #ffffff;
6
6
  overflow: hidden;
7
7
 
@@ -52,7 +52,7 @@
52
52
  .Sqb-SelectTable--box {
53
53
  box-sizing: border-box;
54
54
  min-width: 1em;
55
- max-width: 500px;
55
+ max-width: 700px;
56
56
  background-color: #ffffff;
57
57
  overflow: hidden;
58
58
 
package/lib/es/components/dialog/select-summarize/index.less CHANGED
@@ -1,7 +1,7 @@
1
1
  .Sqb-SelectSummarize-group--box {
2
2
  box-sizing: border-box;
3
3
  min-width: 1em;
4
- max-width: 500px;
4
+ max-width: 700px;
5
5
  background-color: #ffffff;
6
6
  overflow: hidden;
7
7
 
package/lib/es/components/dialog/select-table/index.js CHANGED
@@ -104,7 +104,7 @@ var SelectTable = function SelectTable(_ref) {
104
104
  className: cx("Sqb-SelectDataSource--box pb-2 pt-2"),
105
105
  children: _jsx("div", {
106
106
  style: {
107
- width: 300
107
+ minWidth: 300
108
108
  },
109
109
  children: _jsx("div", {
110
110
  style: {
@@ -152,7 +152,7 @@ var SelectTable = function SelectTable(_ref) {
152
152
  className: cx("Sqb-SelectTable--box pb-2"),
153
153
  children: _jsx("div", {
154
154
  style: {
155
- width: 300
155
+ minWidth: 300
156
156
  },
157
157
  children: _jsxs("div", {
158
158
  style: {
package/lib/es/components/dialog/select-table/index.less CHANGED
@@ -1,7 +1,7 @@
1
1
  .Sqb-SelectDataSource--box {
2
2
  box-sizing: border-box;
3
3
  min-width: 1em;
4
- max-width: 500px;
4
+ max-width: 700px;
5
5
  background-color: #ffffff;
6
6
  overflow: hidden;
7
7
 
@@ -52,7 +52,7 @@
52
52
  .Sqb-SelectTable--box {
53
53
  box-sizing: border-box;
54
54
  min-width: 1em;
55
- max-width: 500px;
55
+ max-width: 700px;
56
56
  background-color: #ffffff;
57
57
  overflow: hidden;
58
58
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.50",
3
+ "version": "1.0.52",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",