@gingkoo/pandora-metabase 1.0.102 → 1.0.104

package/lib/cjs/components/dialog/custom-column/index.d.ts

@@ -1,7 +1,7 @@
 import './index.less';
 import { MetaCustom_Item, MetaData_ColumnsType } from '../../../store/types';
 interface PropsType {
-    value: MetaCustom_Item | null;
+    value: MetaCustom_Item;
     data: MetaData_ColumnsType[];
     onChange: (record: MetaCustom_Item) => void;
     onClose: Function;

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+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");
@@ -35,9 +36,9 @@ var CustomColumn = function CustomColumn(_ref) {
     return expression && name;
   }, [expression, name]);
   function onOk() {
-    typeof onChange === 'function' && onChange({
+    typeof onChange === 'function' && onChange((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, value), {}, {
       name: name
-    });
+    }));
   }
   var buttonText = isUpdate ? (0, _locale.__)('customColumn.update') : (0, _locale.__)('customColumn.complete');
   return (0, _jsxRuntime.jsx)("div", {

package/lib/cjs/components/dialog/custom-editor/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/taggedTemplateLiteral"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -53,10 +54,10 @@ var CaseEditor = function CaseEditor(props) {
       _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.nameForRules'));
       return false;
     }
-    typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk({
+    typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, value), {}, {
       name: name,
       formulaList: caseList
-    }));
+    })));
   };
   return (0, _jsxRuntime.jsxs)("div", {
     className: 'custom-box',

package/lib/cjs/components/modules/custom-column.js

@@ -249,7 +249,10 @@ var CustomColumn = function CustomColumn(props) {
             onCancel: function onCancel() {
               o.close();
             },
-            onOk: function onOk(data) {
+            onOk: function onOk(_data) {
+              var data = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _data), {}, {
+                fieldUuid: _data.fieldUuid || (0, _helper.uuidv4)('field')
+              });
               if (i === -1) {
                 newMeta[index].customColumn.push(data);
               } else {

package/lib/cjs/store/types.d.ts

@@ -223,6 +223,7 @@ export interface MetaJoin {
 export interface MetaCustom_Item {
     name: string;
     id?: string;
+    fieldUuid: string;
     type?: string;
     formulaList?: AtomsItem[];
 }

package/lib/cjs/utils.js

@@ -125,7 +125,9 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
     metaKey: -1,
     type: _enum.TypeEnum.customColumn,
     customColumn: [{
-      name: '' // 用户起的别名
+      name: '',
+      // 用户起的别名
+      fieldUuid: ''
       // formula: '', // 公式}];
     }]
   };
@@ -244,7 +246,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
             name: v.name,
             select: true,
             fieldAlias: '',
-            fieldUuid: (0, _helper2.uuidv4)('field')
+            fieldUuid: v.fieldUuid || (0, _helper2.uuidv4)('field')
           };
         });
         return {

package/lib/es/components/dialog/custom-column/index.d.ts

@@ -1,7 +1,7 @@
 import './index.less';
 import { MetaCustom_Item, MetaData_ColumnsType } from '../../../store/types';
 interface PropsType {
-    value: MetaCustom_Item | null;
+    value: MetaCustom_Item;
     data: MetaData_ColumnsType[];
     onChange: (record: MetaCustom_Item) => void;
     onClose: Function;

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

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import './index.less';
@@ -28,9 +29,9 @@ var CustomColumn = function CustomColumn(_ref) {
     return expression && name;
   }, [expression, name]);
   function onOk() {
-    typeof onChange === 'function' && onChange({
+    typeof onChange === 'function' && onChange(_objectSpread(_objectSpread({}, value), {}, {
       name: name
-    });
+    }));
   }
   var buttonText = isUpdate ? __('customColumn.update') : __('customColumn.complete');
   return _jsx("div", {

package/lib/es/components/dialog/custom-editor/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
 var _templateObject;
@@ -47,10 +48,10 @@ var CaseEditor = function CaseEditor(props) {
       Toast.warning(__('SqlQueryBuilder.nameForRules'));
       return false;
     }
-    typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk({
+    typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk(_objectSpread(_objectSpread({}, value), {}, {
       name: name,
       formulaList: caseList
-    }));
+    })));
   };
   return _jsxs("div", {
     className: 'custom-box',

package/lib/es/components/modules/custom-column.js

@@ -245,7 +245,10 @@ var CustomColumn = function CustomColumn(props) {
             onCancel: function onCancel() {
               o.close();
             },
-            onOk: function onOk(data) {
+            onOk: function onOk(_data) {
+              var data = _objectSpread(_objectSpread({}, _data), {}, {
+                fieldUuid: _data.fieldUuid || uuidv4('field')
+              });
               if (i === -1) {
                 newMeta[index].customColumn.push(data);
               } else {

package/lib/es/store/types.d.ts

@@ -223,6 +223,7 @@ export interface MetaJoin {
 export interface MetaCustom_Item {
     name: string;
     id?: string;
+    fieldUuid: string;
     type?: string;
     formulaList?: AtomsItem[];
 }

package/lib/es/utils.js

@@ -112,7 +112,9 @@ export var getSubColumns = function getSubColumns(metaList) {
     metaKey: -1,
     type: TypeEnum.customColumn,
     customColumn: [{
-      name: '' // 用户起的别名
+      name: '',
+      // 用户起的别名
+      fieldUuid: ''
       // formula: '', // 公式}];
     }]
   };
@@ -231,7 +233,7 @@ export var getSubColumns = function getSubColumns(metaList) {
             name: v.name,
             select: true,
             fieldAlias: '',
-            fieldUuid: uuidv4('field')
+            fieldUuid: v.fieldUuid || uuidv4('field')
           };
         });
         return {

package/package.json

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