@gingkoo/pandora-metabase 1.0.52 → 1.0.54

package/lib/cjs/components/dialog/select-column/index.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 require("./index.less");
@@ -37,7 +37,11 @@ var SelectColumn = function SelectColumn(_ref) {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     columns = _useState2[0],
     setColumns = _useState2[1];
-  var _useState3 = (0, _react.useState)(data.slice()),
+  var _useState3 = (0, _react.useState)(data.map(function (v) {
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+        fieldUuid: v.fieldUuid || (0, _helper.uuidv4)('field')
+      });
+    }).slice()),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     originList = _useState4[0],
     setOriginList = _useState4[1];

package/lib/cjs/components/dialog/select-column-multiple/index.js

@@ -83,7 +83,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
         open: open,
         searchText: '',
-        columns: v.columns.slice()
+        columns: v.columns.map(function (vv) {
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, vv), {}, {
+            fieldUuid: vv.fieldUuid || (0, _helper2.uuidv4)('field')
+          });
+        }).slice()
       });
     })),
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),

package/lib/cjs/components/modules/components/meta-icon.js

@@ -307,11 +307,12 @@ var sortList = function sortList(arr) {
   });
 };
 var NextDom = function NextDom(props) {
+  var _store$metaList;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = (0, _useProvider.useStore)();
   // @ts-ignore
-  if (!store.metaList[groupIndex].list[0].table.name) return null;
+  if (!((_store$metaList = store.metaList) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList[groupIndex]) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList.list) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList[0]) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList.table) !== null && _store$metaList !== void 0 && _store$metaList.name)) return null;
   var available = findNextIcon(store, props);
   if (!store.showToolbar(_enum.TypeEnum.permissionTable)) {
     available = available.filter(function (v) {
@@ -320,7 +321,8 @@ var NextDom = function NextDom(props) {
   }
   var size = judgeSize(store, props, available.length, groupIndex);
   function handleClick(type) {
-    var index = store.metaList[groupIndex].list.indexOf(meta);
+    var _store$metaList2;
+    var index = (_store$metaList2 = store.metaList) === null || _store$metaList2 === void 0 || (_store$metaList2 = _store$metaList2[groupIndex]) === null || _store$metaList2 === void 0 || (_store$metaList2 = _store$metaList2.list) === null || _store$metaList2 === void 0 ? void 0 : _store$metaList2.indexOf(meta);
     store.addMeta(type, index + 1, groupIndex);
   }
   var MetaIconDom = metaIcon(size, handleClick);

package/lib/es/components/dialog/select-column/index.js

@@ -1,5 +1,5 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
@@ -30,7 +30,11 @@ var SelectColumn = function SelectColumn(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     columns = _useState2[0],
     setColumns = _useState2[1];
-  var _useState3 = useState(data.slice()),
+  var _useState3 = useState(data.map(function (v) {
+      return _objectSpread(_objectSpread({}, v), {}, {
+        fieldUuid: v.fieldUuid || uuidv4('field')
+      });
+    }).slice()),
     _useState4 = _slicedToArray(_useState3, 2),
     originList = _useState4[0],
     setOriginList = _useState4[1];

package/lib/es/components/dialog/select-column-multiple/index.js

@@ -23,6 +23,7 @@ import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
 import { replaceTpl } from '../../../utils/helper';
+import { uuidv4 } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -77,7 +78,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',
-        columns: v.columns.slice()
+        columns: v.columns.map(function (vv) {
+          return _objectSpread(_objectSpread({}, vv), {}, {
+            fieldUuid: vv.fieldUuid || uuidv4('field')
+          });
+        }).slice()
       });
     })),
     _useState8 = _slicedToArray(_useState7, 2),

package/lib/es/components/modules/components/meta-icon.js

@@ -299,11 +299,12 @@ var sortList = function sortList(arr) {
   });
 };
 var NextDom = function NextDom(props) {
+  var _store$metaList;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = useStore();
   // @ts-ignore
-  if (!store.metaList[groupIndex].list[0].table.name) return null;
+  if (!((_store$metaList = store.metaList) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList[groupIndex]) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList.list) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList[0]) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList.table) !== null && _store$metaList !== void 0 && _store$metaList.name)) return null;
   var available = findNextIcon(store, props);
   if (!store.showToolbar(TypeEnum.permissionTable)) {
     available = available.filter(function (v) {
@@ -312,7 +313,8 @@ var NextDom = function NextDom(props) {
   }
   var size = judgeSize(store, props, available.length, groupIndex);
   function handleClick(type) {
-    var index = store.metaList[groupIndex].list.indexOf(meta);
+    var _store$metaList2;
+    var index = (_store$metaList2 = store.metaList) === null || _store$metaList2 === void 0 || (_store$metaList2 = _store$metaList2[groupIndex]) === null || _store$metaList2 === void 0 || (_store$metaList2 = _store$metaList2.list) === null || _store$metaList2 === void 0 ? void 0 : _store$metaList2.indexOf(meta);
     store.addMeta(type, index + 1, groupIndex);
   }
   var MetaIconDom = metaIcon(size, handleClick);

package/package.json

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