ronds-metadata 1.3.81 → 1.3.82

package/es/comps/MetadataForm/DataCell/business/config.d.ts

@@ -246,8 +246,14 @@ export declare const BusinessSchema: {
                         type: string;
                         datasource: {
                             type: string[];
-                            kafka: {
-                                isMutiple: boolean;
+                            cassandra: {
+                                isPlusTable: boolean;
+                            };
+                            postgreSql: {
+                                isPlusTable: boolean;
+                            };
+                            sqlServer: {
+                                isPlusTable: boolean;
                             };
                         };
                     };

package/es/comps/MetadataForm/DataCell/business/config.js

@@ -277,8 +277,14 @@ var ETL_DIRECTION_SCHEMA = [{
           type: 'datasource',
           datasource: {
             type: ['Cassandra', 'PostgreSql', 'Minio', 'SqlServer'],
-            kafka: {
-              isMutiple: true
+            cassandra: {
+              isPlusTable: true
+            },
+            postgreSql: {
+              isPlusTable: true
+            },
+            sqlServer: {
+              isPlusTable: true
             }
           }
         }

package/es/comps/MetadataForm/DataCell/business/index.js

@@ -16,7 +16,6 @@ var BusinessForm = function BusinessForm(props) {
   var valueRef = React.useRef({});
   React.useEffect(function () {
     if (value) {
-      debugger;
       formRef.current.setFieldsValue(_objectSpread({}, value));
     }
   }, []);

package/es/comps/MetadataForm/DataCell/plugin/Datasource/Cassandra.js

@@ -14,7 +14,7 @@ import React from 'react';
 import { useGetDatasource } from './hooks';
 import { PlusOutlined } from '@ant-design/icons';
 var CassandraDatasource = function CassandraDatasource(props) {
-  var _extraInfo$datasource, _extraInfo$datasource2, _extraInfo$datasource3, _extraInfo$datasource4;
+  var _extraInfo$datasource, _extraInfo$datasource2, _extraInfo$datasource3, _extraInfo$datasource4, _extraInfo$datasource5, _extraInfo$datasource6, _extraInfo$datasource7, _extraInfo$datasource8;
   var extraInfo = props.extraInfo,
     datasource = props.datasource,
     onChange = props.onChange,
@@ -98,10 +98,10 @@ var CassandraDatasource = function CassandraDatasource(props) {
     style: {
       paddingBottom: '8px'
     }
-  }, /*#__PURE__*/React.createElement(_Input.Group, {
+  }, (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource3 = extraInfo.datasource) === null || _extraInfo$datasource3 === void 0 ? void 0 : (_extraInfo$datasource4 = _extraInfo$datasource3.cassandra) === null || _extraInfo$datasource4 === void 0 ? void 0 : _extraInfo$datasource4.isPlusTable) ? /*#__PURE__*/React.createElement(_Input.Group, {
     compact: true
   }, /*#__PURE__*/React.createElement(_Select, {
-    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource3 = extraInfo.datasource) === null || _extraInfo$datasource3 === void 0 ? void 0 : (_extraInfo$datasource4 = _extraInfo$datasource3.cassandra) === null || _extraInfo$datasource4 === void 0 ? void 0 : _extraInfo$datasource4.isMutiple) ? 'multiple' : undefined,
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource5 = extraInfo.datasource) === null || _extraInfo$datasource5 === void 0 ? void 0 : (_extraInfo$datasource6 = _extraInfo$datasource5.cassandra) === null || _extraInfo$datasource6 === void 0 ? void 0 : _extraInfo$datasource6.isMutiple) ? 'multiple' : undefined,
     allowClear: true,
     value: dataTable,
     options: dataTableOpts,
@@ -117,6 +117,12 @@ var CassandraDatasource = function CassandraDatasource(props) {
   }, /*#__PURE__*/React.createElement(_Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     onClick: onPlusClick
-  })))));
+  }))) : /*#__PURE__*/React.createElement(_Select, {
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource7 = extraInfo.datasource) === null || _extraInfo$datasource7 === void 0 ? void 0 : (_extraInfo$datasource8 = _extraInfo$datasource7.cassandra) === null || _extraInfo$datasource8 === void 0 ? void 0 : _extraInfo$datasource8.isMutiple) ? 'multiple' : undefined,
+    allowClear: true,
+    value: dataTable,
+    options: dataTableOpts,
+    onChange: onDataTableChange
+  })));
 };
 export default CassandraDatasource;

package/es/comps/MetadataForm/DataCell/plugin/Datasource/Kafka.js

@@ -1,3 +1,9 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
 import "antd/es/col/style";
@@ -5,9 +11,10 @@ import _Col from "antd/es/col";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { tr } from '../../../../../framework/locale';
 import { useGetDatasource } from './hooks';
+import { PlusOutlined } from '@ant-design/icons';
 import React from 'react';
 var KafkaDatasource = function KafkaDatasource(props) {
-  var _extraInfo$datasource, _extraInfo$datasource2;
+  var _extraInfo$datasource, _extraInfo$datasource2, _extraInfo$datasource3, _extraInfo$datasource4, _extraInfo$datasource5, _extraInfo$datasource6;
   var extraInfo = props.extraInfo,
     datasource = props.datasource,
     onChange = props.onChange,
@@ -25,6 +32,11 @@ var KafkaDatasource = function KafkaDatasource(props) {
       topics: value
     });
   };
+  var onPlusClick = function onPlusClick() {
+    onChange && onChange({
+      plus: true
+    });
+  };
   React.useEffect(function () {
     if (initialValue) {
       onTopicChange(initialValue.topics);
@@ -49,8 +61,27 @@ var KafkaDatasource = function KafkaDatasource(props) {
     style: {
       paddingBottom: '8px'
     }
+  }, (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource = extraInfo.datasource) === null || _extraInfo$datasource === void 0 ? void 0 : (_extraInfo$datasource2 = _extraInfo$datasource.kafka) === null || _extraInfo$datasource2 === void 0 ? void 0 : _extraInfo$datasource2.isPlusTable) ? /*#__PURE__*/React.createElement(_Input.Group, {
+    compact: true
   }, /*#__PURE__*/React.createElement(_Select, {
-    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource = extraInfo.datasource) === null || _extraInfo$datasource === void 0 ? void 0 : (_extraInfo$datasource2 = _extraInfo$datasource.kafka) === null || _extraInfo$datasource2 === void 0 ? void 0 : _extraInfo$datasource2.isMutiple) ? 'multiple' : undefined,
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource3 = extraInfo.datasource) === null || _extraInfo$datasource3 === void 0 ? void 0 : (_extraInfo$datasource4 = _extraInfo$datasource3.kafka) === null || _extraInfo$datasource4 === void 0 ? void 0 : _extraInfo$datasource4.isMutiple) ? 'multiple' : undefined,
+    value: topic,
+    allowClear: true,
+    options: topicOpts,
+    onChange: onTopicChange,
+    style: {
+      width: 'calc(100% - 32px)'
+    }
+  }), /*#__PURE__*/React.createElement(_Tooltip, {
+    title: tr('手动建表'),
+    style: {
+      width: '32px'
+    }
+  }, /*#__PURE__*/React.createElement(_Button, {
+    icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
+    onClick: onPlusClick
+  }))) : /*#__PURE__*/React.createElement(_Select, {
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource5 = extraInfo.datasource) === null || _extraInfo$datasource5 === void 0 ? void 0 : (_extraInfo$datasource6 = _extraInfo$datasource5.kafka) === null || _extraInfo$datasource6 === void 0 ? void 0 : _extraInfo$datasource6.isMutiple) ? 'multiple' : undefined,
     value: topic,
     allowClear: true,
     options: topicOpts,

package/es/comps/MetadataForm/DataCell/plugin/Datasource/PostgreSQL.js

@@ -1,3 +1,9 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
 import "antd/es/col/style";
@@ -10,9 +16,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
  */
 import { tr } from '../../../../../framework/locale';
 import { useGetDatasource } from './hooks';
+import { PlusOutlined } from '@ant-design/icons';
 import React from 'react';
 var PostgreSQLDatasource = function PostgreSQLDatasource(props) {
-  var _extraInfo$datasource, _extraInfo$datasource2, _extraInfo$datasource3, _extraInfo$datasource4, _extraInfo$datasource5, _extraInfo$datasource6;
+  var _extraInfo$datasource, _extraInfo$datasource2, _extraInfo$datasource3, _extraInfo$datasource4, _extraInfo$datasource5, _extraInfo$datasource6, _extraInfo$datasource7, _extraInfo$datasource8, _extraInfo$datasource9, _extraInfo$datasource10;
   var extraInfo = props.extraInfo,
     wrapperCol = props.wrapperCol,
     labelCol = props.labelCol,
@@ -52,6 +59,11 @@ var PostgreSQLDatasource = function PostgreSQLDatasource(props) {
       dt: value
     });
   };
+  var onPlusClick = function onPlusClick() {
+    onChange && onChange({
+      plus: true
+    });
+  };
   React.useEffect(function () {
     if (initialValue) {
       onDataBaseChange(initialValue.db);
@@ -128,8 +140,27 @@ var PostgreSQLDatasource = function PostgreSQLDatasource(props) {
     style: {
       paddingBottom: '8px'
     }
+  }, (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource5 = extraInfo.datasource) === null || _extraInfo$datasource5 === void 0 ? void 0 : (_extraInfo$datasource6 = _extraInfo$datasource5.postgreSql) === null || _extraInfo$datasource6 === void 0 ? void 0 : _extraInfo$datasource6.isPlusTable) ? /*#__PURE__*/React.createElement(_Input.Group, {
+    compact: true
   }, /*#__PURE__*/React.createElement(_Select, {
-    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource5 = extraInfo.datasource) === null || _extraInfo$datasource5 === void 0 ? void 0 : (_extraInfo$datasource6 = _extraInfo$datasource5.postgreSql) === null || _extraInfo$datasource6 === void 0 ? void 0 : _extraInfo$datasource6.isMutiple) ? 'multiple' : undefined,
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource7 = extraInfo.datasource) === null || _extraInfo$datasource7 === void 0 ? void 0 : (_extraInfo$datasource8 = _extraInfo$datasource7.postgreSql) === null || _extraInfo$datasource8 === void 0 ? void 0 : _extraInfo$datasource8.isMutiple) ? 'multiple' : undefined,
+    allowClear: true,
+    value: dataTable,
+    options: dataTableOpts,
+    onChange: onDataTableChange,
+    style: {
+      width: 'calc(100% - 32px)'
+    }
+  }), /*#__PURE__*/React.createElement(_Tooltip, {
+    title: tr('手动建表'),
+    style: {
+      width: '32px'
+    }
+  }, /*#__PURE__*/React.createElement(_Button, {
+    icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
+    onClick: onPlusClick
+  }))) : /*#__PURE__*/React.createElement(_Select, {
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource9 = extraInfo.datasource) === null || _extraInfo$datasource9 === void 0 ? void 0 : (_extraInfo$datasource10 = _extraInfo$datasource9.postgreSql) === null || _extraInfo$datasource10 === void 0 ? void 0 : _extraInfo$datasource10.isMutiple) ? 'multiple' : undefined,
     allowClear: true,
     value: dataTable,
     options: dataTableOpts,

package/es/comps/MetadataForm/DataCell/plugin/Datasource/SqlServer.js

@@ -1,13 +1,20 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
 import "antd/es/col/style";
 import _Col from "antd/es/col";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { PlusOutlined } from '@ant-design/icons';
 import { tr } from '../../../../../framework/locale';
 import { useGetDatasource } from './hooks';
 import React from 'react';
 var SqlServerDatasource = function SqlServerDatasource(props) {
-  var _extraInfo$datasource, _extraInfo$datasource2, _extraInfo$datasource3, _extraInfo$datasource4, _extraInfo$datasource5, _extraInfo$datasource6;
+  var _extraInfo$datasource, _extraInfo$datasource2, _extraInfo$datasource3, _extraInfo$datasource4, _extraInfo$datasource5, _extraInfo$datasource6, _extraInfo$datasource7, _extraInfo$datasource8, _extraInfo$datasource9, _extraInfo$datasource10;
   var extraInfo = props.extraInfo,
     datasource = props.datasource,
     wrapperCol = props.wrapperCol,
@@ -47,6 +54,11 @@ var SqlServerDatasource = function SqlServerDatasource(props) {
       dt: value
     });
   };
+  var onPlusClick = function onPlusClick() {
+    onChange && onChange({
+      plus: true
+    });
+  };
   React.useEffect(function () {
     if (initialValue) {
       onDataBaseChange(initialValue.db);
@@ -123,8 +135,27 @@ var SqlServerDatasource = function SqlServerDatasource(props) {
     style: {
       paddingBottom: '8px'
     }
+  }, (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource5 = extraInfo.datasource) === null || _extraInfo$datasource5 === void 0 ? void 0 : (_extraInfo$datasource6 = _extraInfo$datasource5.sqlServer) === null || _extraInfo$datasource6 === void 0 ? void 0 : _extraInfo$datasource6.isPlusTable) ? /*#__PURE__*/React.createElement(_Input.Group, {
+    compact: true
   }, /*#__PURE__*/React.createElement(_Select, {
-    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource5 = extraInfo.datasource) === null || _extraInfo$datasource5 === void 0 ? void 0 : (_extraInfo$datasource6 = _extraInfo$datasource5.sqlServer) === null || _extraInfo$datasource6 === void 0 ? void 0 : _extraInfo$datasource6.isMutiple) ? 'multiple' : undefined,
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource7 = extraInfo.datasource) === null || _extraInfo$datasource7 === void 0 ? void 0 : (_extraInfo$datasource8 = _extraInfo$datasource7.sqlServer) === null || _extraInfo$datasource8 === void 0 ? void 0 : _extraInfo$datasource8.isMutiple) ? 'multiple' : undefined,
+    allowClear: true,
+    value: dataTable,
+    options: dataTableOpts,
+    onChange: onDataTableChange,
+    style: {
+      width: 'calc(100% - 32px)'
+    }
+  }), /*#__PURE__*/React.createElement(_Tooltip, {
+    title: tr('手动建表'),
+    style: {
+      width: '32px'
+    }
+  }, /*#__PURE__*/React.createElement(_Button, {
+    icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
+    onClick: onPlusClick
+  }))) : /*#__PURE__*/React.createElement(_Select, {
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$datasource9 = extraInfo.datasource) === null || _extraInfo$datasource9 === void 0 ? void 0 : (_extraInfo$datasource10 = _extraInfo$datasource9.sqlServer) === null || _extraInfo$datasource10 === void 0 ? void 0 : _extraInfo$datasource10.isMutiple) ? 'multiple' : undefined,
     allowClear: true,
     value: dataTable,
     options: dataTableOpts,

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

@@ -16,6 +16,8 @@ import React from 'react';
 import Editable from '../../../../comps/Editable';
 import { MetadataFormContext } from '../../interface';
 import { useGetLabelCol, useGetWrapperCol } from './Datasource/hooks';
+import useObservable from '@/framework/rxjs-hooks/useObservable';
+import { STREAM_EVENT_TYPE } from '../../constants';
 var MapTable = function MapTable(props) {
   var value = props.value,
     onChange = props.onChange,
@@ -52,6 +54,10 @@ var MapTable = function MapTable(props) {
     form = _React$useContext.form;
   var labelCol = useGetLabelCol(extraInfo);
   var wrapperCol = useGetWrapperCol(extraInfo);
+  var formContext = React.useContext(MetadataFormContext) || {};
+  useObservable(function (p) {
+    if ((p === null || p === void 0 ? void 0 : p.type) === STREAM_EVENT_TYPE.ON_VALUES_CHANGE) {}
+  }, [formContext === null || formContext === void 0 ? void 0 : formContext.stream$]);
   var triggerChange = function triggerChange(changedValue) {
     onChange && onChange(_objectSpread({
       mapping: mapping,
@@ -186,7 +192,7 @@ var MapTable = function MapTable(props) {
       height: '100%',
       marginTop: '2px'
     }
-  }, (tableDataSource === null || tableDataSource === void 0 ? void 0 : tableDataSource.length) > 0 && (tableDataTarget === null || tableDataTarget === void 0 ? void 0 : tableDataTarget.length) > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       width: '40%'
     }
@@ -204,7 +210,8 @@ var MapTable = function MapTable(props) {
     onMove: onSourceMove
   })), /*#__PURE__*/React.createElement("div", {
     style: {
-      marginTop: '40px'
+      marginTop: '40px',
+      marginRight: '6px'
     }
   }, _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", {

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

@@ -16,6 +16,9 @@ import { useGetWrapperCol } from './Datasource/hooks';
 import CodeEdit from '../../../../comps/CodeEdit';
 import { getConfig } from '../../../../config';
 import { modifyComment } from '../../utils';
+import { MetadataFormContext } from '../../interface';
+import useObservable from '@/framework/rxjs-hooks/useObservable';
+import { STREAM_EVENT_TYPE } from '../../constants';
 var SparkSqlTable = function SparkSqlTable(props) {
   var value = props.value,
     extraInfo = props.extraInfo,
@@ -34,6 +37,30 @@ var SparkSqlTable = function SparkSqlTable(props) {
     setList = _React$useState6[1];
   var listRef = React.useRef([]);
   var wrapperCol = useGetWrapperCol(extraInfo);
+  var formContext = React.useContext(MetadataFormContext) || {};
+  useObservable(function (p) {
+    if ((p === null || p === void 0 ? void 0 : p.type) === STREAM_EVENT_TYPE.ON_VALUES_CHANGE) {
+      var _p$payload, _val$datasource, _val$datasource3;
+      var val = p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.val;
+      var _selected;
+      if (val === null || val === void 0 ? void 0 : (_val$datasource = val.datasource) === null || _val$datasource === void 0 ? void 0 : _val$datasource.topics) {
+        var _val$datasource2, _val$datasource2$topi;
+        _selected = val === null || val === void 0 ? void 0 : (_val$datasource2 = val.datasource) === null || _val$datasource2 === void 0 ? void 0 : (_val$datasource2$topi = _val$datasource2.topics) === null || _val$datasource2$topi === void 0 ? void 0 : _val$datasource2$topi.map(function (p) {
+          var _JSON$parse;
+          return (_JSON$parse = JSON.parse(p)) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.name;
+        });
+        setSelected(_toConsumableArray(_selected));
+      }
+      if (val === null || val === void 0 ? void 0 : (_val$datasource3 = val.datasource) === null || _val$datasource3 === void 0 ? void 0 : _val$datasource3.dt) {
+        var _val$datasource4, _val$datasource4$dt;
+        _selected = val === null || val === void 0 ? void 0 : (_val$datasource4 = val.datasource) === null || _val$datasource4 === void 0 ? void 0 : (_val$datasource4$dt = _val$datasource4.dt) === null || _val$datasource4$dt === void 0 ? void 0 : _val$datasource4$dt.map(function (p) {
+          var _JSON$parse2;
+          return (_JSON$parse2 = JSON.parse(p)) === null || _JSON$parse2 === void 0 ? void 0 : _JSON$parse2.name;
+        });
+        setSelected(_toConsumableArray(_selected));
+      }
+    }
+  }, [formContext === null || formContext === void 0 ? void 0 : formContext.stream$]);
   var handleAddItem = function handleAddItem() {
     var item = {
       alias: "tbl".concat(listRef.current.length + 1),
@@ -60,7 +87,6 @@ var SparkSqlTable = function SparkSqlTable(props) {
   var triggerChange = function triggerChange(changedValue) {
     onChange && onChange(_objectSpread({
       view: view,
-      selected: selected,
       list: list
     }, changedValue));
   };
@@ -70,12 +96,6 @@ var SparkSqlTable = function SparkSqlTable(props) {
       view: v.target.value
     });
   };
-  var onSelectedChange = function onSelectedChange(v) {
-    setSelected(v.target.value);
-    triggerChange({
-      selected: v.target.value
-    });
-  };
   var onListChange = function onListChange(v, index, key) {
     var _list = listRef.current;
     if (key === 'alias' || key === 'outputView') {
@@ -96,12 +116,6 @@ var SparkSqlTable = function SparkSqlTable(props) {
           view: value.view
         });
       }
-      if (value.selected) {
-        setSelected(value.selected);
-        triggerChange({
-          selected: value.selected
-        });
-      }
       if (value.list) {
         setList(value.list);
         listRef.current = value.list;
@@ -164,7 +178,6 @@ var SparkSqlTable = function SparkSqlTable(props) {
       },
       addonAfter: /*#__PURE__*/React.createElement(EyeOutlined, null),
       value: p,
-      onChange: onSelectedChange,
       disabled: true
     });
   }))), /*#__PURE__*/React.createElement("div", {

package/package.json

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