ronds-metadata 1.3.68 → 1.3.70

package/es/api/index.js

@@ -10,7 +10,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { guid, md5 } from '../utils';
 import { addInterceptor, HttpHelper } from '../framework/http';
 var http = new HttpHelper();
-var token = 'Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkMyMTJFMjI1NTcwNjRDQTE3M0U2NjkxRjM4QzFDOEEyIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE3MjM0MzQ2MzEsImV4cCI6MTcyMzY5MzgzMSwiaXNzIjoiaHR0cDovL2ZhYmlvOjk5OTkvc3VwZXJjYXJlY29yZSIsImF1ZCI6ImVwbSIsImNsaWVudF9pZCI6ImVwbSIsInN1YiI6IjNhMTIxZDJiLWYwZDUtZDQ3OC0xN2Q3LWQwODEwZDgzZDViMSIsImF1dGhfdGltZSI6MTcyMzQzNDYzMSwiaWRwIjoibG9jYWwiLCJuYW1lIjoicGhtIiwiZW1haWwiOiJwaG1AYWJwLmlvIiwicm9sZSI6WyJhZG1pbiIsInBobV9hZG1pbiJdLCJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9naXZlbm5hbWUiOiJwaG3ov5Dnu7TotKblj7ciLCJwaG9uZV9udW1iZXIiOiIxMzYwMDAwMDAwMCIsInBob25lX251bWJlcl92ZXJpZmllZCI6IlRydWUiLCJlbWFpbF92ZXJpZmllZCI6IlRydWUiLCJpYXQiOjE3MjM0MzQ2MzEsInNjb3BlIjpbImFkZHJlc3MiLCJlbWFpbCIsImVwbSIsIm9wZW5pZCIsInBob25lIiwicHJvZmlsZSIsInJvbGUiLCJvZmZsaW5lX2FjY2VzcyJdLCJhbXIiOlsicHdkIl19.W_5480G2iW6ua9EzViDFCDN6nUnUvbsBi9uL_ChHOmnTXojVUn8qJEK-Z3TdIe22_E1Jjn_AZrvZ7JZpjV5RiUM77pOSpRwTx8zfZFApeiKVFtv6UdM0Amkvbh5eFw8xnVPDQhNCWe0oBpFbq4YEos2pXafr2nCYvAyPPfvToRolPDlKQ9-Fi-afjcFDzckNzLd5f-Gcdx3YOUcbhq2PxJpYGEmCHmUzp8chsZ09dMfejZdRbhy1_BWHu9SLsU4N1hjq3VjSd-QhgPzCvC1kzx1Ovd9NkwO4Jot8wn3GoycWYAjkYXoymWFzWPs-KRG5pZgAqO-vCSBIZ4Y_KEO_Rw';
+var token = 'Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkMyMTJFMjI1NTcwNjRDQTE3M0U2NjkxRjM4QzFDOEEyIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE3MjM4NzU4OTksImV4cCI6MTcyNDEzNTA5OSwiaXNzIjoiaHR0cDovL2ZhYmlvOjk5OTkvc3VwZXJjYXJlY29yZSIsImF1ZCI6ImVwbSIsImNsaWVudF9pZCI6ImVwbSIsInN1YiI6IjNhMTIxZDJiLWYwZDUtZDQ3OC0xN2Q3LWQwODEwZDgzZDViMSIsImF1dGhfdGltZSI6MTcyMzg3NTg5OSwiaWRwIjoibG9jYWwiLCJuYW1lIjoicGhtIiwiZW1haWwiOiJwaG1AYWJwLmlvIiwicm9sZSI6WyJhZG1pbiIsInBobV9hZG1pbiJdLCJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9naXZlbm5hbWUiOiJwaG3ov5Dnu7TotKblj7ciLCJwaG9uZV9udW1iZXIiOiIxMzYwMDAwMDAwMCIsInBob25lX251bWJlcl92ZXJpZmllZCI6IlRydWUiLCJlbWFpbF92ZXJpZmllZCI6IlRydWUiLCJpYXQiOjE3MjM4NzU4OTksInNjb3BlIjpbImFkZHJlc3MiLCJlbWFpbCIsImVwbSIsIm9wZW5pZCIsInBob25lIiwicHJvZmlsZSIsInJvbGUiLCJvZmZsaW5lX2FjY2VzcyJdLCJhbXIiOlsicHdkIl19.OK10CQsLVqkRSPEnpQKH_mJU9PbVug0ok4rb6C9EaG2g3-j6GvRhx4_4uPpbE3Y2vBRetkITUh3yccFeoh8kROKUJtr_9HT-W-jULSjfwZN9yd_GJFV1rL3fGEpoUZUqeUEoCvKifgB-8A_N_IN-utk5jzyD-gpKo9jUZySpPsd7JBzA_G_DGV-5vO-lXUJsBySDxt0S3NplnX1A17Pqoxh0ihLL1tlJ-mblSaX8lqWVrEbgBEjpU7Do1siSrZN_zaSBMLneCRkExQULwIWHq0z1agAxhO60YlSdTl78KfF9B_rgQFtkW8a6BZNOvyCwix95lDeedZj-uF2uym84Fg';
 addInterceptor(function (httpClient) {
   httpClient.interceptors.request.use(function (_config) {
     if (!_config.headers) {

package/es/comps/MetadataForm/DataCell/plugin/MapTable.d.ts

@@ -1,8 +1,5 @@
 import React from 'react';
 interface IMapTableProps {
-    dataSource: any;
-    dataTarget: any;
-    options: any;
     value?: any;
     onChange?: (value: any) => void;
 }

package/es/comps/MetadataForm/DataCell/plugin/MapTable.js

@@ -1,7 +1,5 @@
 import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/select/style";
@@ -12,33 +10,45 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { CloseCircleFilled, ArrowRightOutlined } from '@ant-design/icons';
 import React from 'react';
 import Editable from '../../../../comps/Editable';
+import { MetadataFormContext } from '../../interface';
 var MapTable = function MapTable(props) {
-  var dataSource = props.dataSource,
-    dataTarget = props.dataTarget,
-    options = props.options,
-    value = props.value,
+  var value = props.value,
     onChange = props.onChange;
-  var _React$useState = React.useState(dataSource),
+  var _React$useState = React.useState([]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     tableDataSource = _React$useState2[0],
     setTableDataSource = _React$useState2[1];
-  var _React$useState3 = React.useState(),
+  var _React$useState3 = React.useState([]),
     _React$useState4 = _slicedToArray(_React$useState3, 2),
-    mapping = _React$useState4[0],
-    setMapping = _React$useState4[1];
-  var _React$useState5 = React.useState(),
+    tableDataTarget = _React$useState4[0],
+    setTableDataTarget = _React$useState4[1];
+  var _React$useState5 = React.useState([]),
     _React$useState6 = _slicedToArray(_React$useState5, 2),
-    output = _React$useState6[0],
-    setOutput = _React$useState6[1];
+    options = _React$useState6[0],
+    setOptions = _React$useState6[1];
   var _React$useState7 = React.useState(),
     _React$useState8 = _slicedToArray(_React$useState7, 2),
-    disableArray = _React$useState8[0],
-    setDisableArray = _React$useState8[1];
-  var editableStreamRef = React.useRef();
+    mapping = _React$useState8[0],
+    setMapping = _React$useState8[1];
+  var _React$useState9 = React.useState(),
+    _React$useState10 = _slicedToArray(_React$useState9, 2),
+    output = _React$useState10[0],
+    setOutput = _React$useState10[1];
+  var _React$useState11 = React.useState(),
+    _React$useState12 = _slicedToArray(_React$useState11, 2),
+    disableArray = _React$useState12[0],
+    setDisableArray = _React$useState12[1];
+  var sourceEditableStreamRef = React.useRef();
+  var targetEditableStreamRef = React.useRef();
+  var _React$useContext = React.useContext(MetadataFormContext),
+    form = _React$useContext.form;
   var triggerChange = function triggerChange(changedValue) {
     onChange && onChange(_objectSpread({
       mapping: mapping,
-      output: output
+      output: output,
+      options: options,
+      dataSource: tableDataSource,
+      dataTarget: tableDataTarget
     }, changedValue));
   };
   var onBtnClick = function onBtnClick(index) {
@@ -52,12 +62,18 @@ var MapTable = function MapTable(props) {
       output: value
     });
   };
-  var onMove = function onMove(data) {
+  var onSourceMove = function onSourceMove(data) {
     var newDataSource = _toConsumableArray(tableDataSource);
     var removedElement = newDataSource.splice(data === null || data === void 0 ? void 0 : data.dragIndex, 1)[0];
     newDataSource.splice(data === null || data === void 0 ? void 0 : data.hoverIndex, 0, removedElement);
     setTableDataSource(newDataSource);
   };
+  var onTargetMove = function onTargetMove(data) {
+    var newDataTarget = _toConsumableArray(tableDataTarget);
+    var removedElement = newDataTarget.splice(data === null || data === void 0 ? void 0 : data.dragIndex, 1)[0];
+    newDataTarget.splice(data === null || data === void 0 ? void 0 : data.hoverIndex, 0, removedElement);
+    setTableDataTarget(newDataTarget);
+  };
   React.useEffect(function () {
     if (value) {
       if (value[mapping]) {
@@ -66,22 +82,22 @@ var MapTable = function MapTable(props) {
     }
   }, [value]);
   React.useEffect(function () {
-    setDisableArray(new Array(Math.min(tableDataSource === null || tableDataSource === void 0 ? void 0 : tableDataSource.length, dataTarget === null || dataTarget === void 0 ? void 0 : dataTarget.length)).fill(true));
+    setDisableArray(new Array(Math.min(tableDataSource === null || tableDataSource === void 0 ? void 0 : tableDataSource.length, tableDataTarget === null || tableDataTarget === void 0 ? void 0 : tableDataTarget.length)).fill(true));
   }, []);
   React.useEffect(function () {
     if (disableArray) {
       var _mapping = [];
       disableArray.forEach(function (_, idx) {
         if (disableArray[idx]) {
-          var _tableDataSource$idx, _tableDataSource$idx2, _dataTarget$idx, _dataTarget$idx2;
+          var _tableDataSource$idx, _tableDataSource$idx2, _tableDataTarget$idx, _tableDataTarget$idx2;
           _mapping.push({
             src: {
               name: (_tableDataSource$idx = tableDataSource[idx]) === null || _tableDataSource$idx === void 0 ? void 0 : _tableDataSource$idx.name,
               dataType: (_tableDataSource$idx2 = tableDataSource[idx]) === null || _tableDataSource$idx2 === void 0 ? void 0 : _tableDataSource$idx2.type
             },
             dst: {
-              name: (_dataTarget$idx = dataTarget[idx]) === null || _dataTarget$idx === void 0 ? void 0 : _dataTarget$idx.name,
-              dataType: (_dataTarget$idx2 = dataTarget[idx]) === null || _dataTarget$idx2 === void 0 ? void 0 : _dataTarget$idx2.type
+              name: (_tableDataTarget$idx = tableDataTarget[idx]) === null || _tableDataTarget$idx === void 0 ? void 0 : _tableDataTarget$idx.name,
+              dataType: (_tableDataTarget$idx2 = tableDataTarget[idx]) === null || _tableDataTarget$idx2 === void 0 ? void 0 : _tableDataTarget$idx2.type
             }
           });
         }
@@ -92,6 +108,12 @@ var MapTable = function MapTable(props) {
       });
     }
   }, [disableArray]);
+  React.useEffect(function () {
+    var values = form.getFieldsValue().mapTable;
+    values.dataSource && setTableDataSource(values.dataSource);
+    values.dataTarget && setTableDataTarget(values.dataTarget);
+    values.options && setOptions(values.options);
+  }, [form]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%',
@@ -102,7 +124,6 @@ var MapTable = function MapTable(props) {
       marginBottom: '10px'
     }
   }, /*#__PURE__*/React.createElement(_Select, {
-    defaultValue: "a1",
     onChange: onOutputChange,
     value: output,
     style: {
@@ -127,15 +148,15 @@ var MapTable = function MapTable(props) {
     onRowConfirm: function onRowConfirm() {},
     onRowDelete: function onRowDelete() {},
     getStreamInstance: function getStreamInstance(stream) {
-      return editableStreamRef.current = stream;
+      return sourceEditableStreamRef.current = stream;
     },
     onRowClick: function onRowClick(record) {},
-    onMove: onMove
+    onMove: onSourceMove
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '40px'
     }
-  }, _toConsumableArray(Array(Math.min(tableDataSource === null || tableDataSource === void 0 ? void 0 : tableDataSource.length, dataTarget === null || dataTarget === void 0 ? void 0 : dataTarget.length))).map(function (_, index) {
+  }, _toConsumableArray(Array(Math.min(tableDataSource === null || tableDataSource === void 0 ? void 0 : tableDataSource.length, tableDataTarget === null || tableDataTarget === void 0 ? void 0 : tableDataTarget.length))).map(function (_, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       style: {
@@ -155,13 +176,18 @@ var MapTable = function MapTable(props) {
     style: {
       width: '40%'
     }
-  }, /*#__PURE__*/React.createElement(_Table, {
-    className: "ronds-edit-table",
-    bordered: true,
-    columns: columnTarget,
-    dataSource: dataTarget,
-    pagination: false,
-    size: "small"
+  }, /*#__PURE__*/React.createElement(Editable, {
+    readonly: true,
+    type: "single",
+    columns: columnSource,
+    dataSource: tableDataTarget,
+    onRowConfirm: function onRowConfirm() {},
+    onRowDelete: function onRowDelete() {},
+    getStreamInstance: function getStreamInstance(stream) {
+      return targetEditableStreamRef.current = stream;
+    },
+    onRowClick: function onRowClick(record) {},
+    onMove: onTargetMove
   })))));
 };
 export default MapTable;

package/es/comps/MetadataForm/DataCell/plugin/SourceConfig.js

@@ -330,7 +330,7 @@ var SourceConfig = function SourceConfig(props) {
     body: '{"type":"Kafka","level":2}',
     value: 'name',
     watch: 'defaultSource',
-    key: 'name',
+    key: 'dfSourceId',
     url: '/dataset-web/source/cascade/data/v2'
   };
   var _React$useState29 = React.useState(),

package/es/comps/MetadataForm/DataCell/plugin/SparkSqlTable.js

@@ -143,6 +143,7 @@ var SparkSqlTable = function SparkSqlTable(props) {
       overflowY: 'auto'
     }
   }, list.map(function (item, idx) {
+    var _item$alias;
     return /*#__PURE__*/React.createElement("div", {
       key: idx,
       style: {
@@ -174,7 +175,7 @@ var SparkSqlTable = function SparkSqlTable(props) {
         marginLeft: '5px',
         marginRight: '8px'
       },
-      value: "tbl".concat(idx + 1),
+      value: (_item$alias = item.alias) !== null && _item$alias !== void 0 ? _item$alias : "tbl".concat(idx + 1),
       onChange: function onChange(val) {
         return onListChange(val, idx, 'alias');
       }
@@ -194,7 +195,7 @@ var SparkSqlTable = function SparkSqlTable(props) {
         overflowY: 'auto'
       }
     }, /*#__PURE__*/React.createElement(SqlEdit, {
-      value: "/*- name(tbl".concat(idx + 1, ")*/"),
+      value: "/*+".concat(item.alias ? "name(".concat(item.alias, ")") : "name(tbl".concat(idx + 1, ")"), " ").concat(item.outputView ? "output(".concat(item.outputView, ")") : '', "*/"),
       theme: 'neo',
       isLineNumbers: false,
       extraDico: extraDico,

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.3.68",
+  "version": "1.3.70",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",