ronds-metadata 1.3.62 → 1.3.63

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

@@ -1,7 +1,10 @@
 import React from 'react';
 interface ISourceConfigProps {
     configType: string;
-    http?: any[];
+    sourceHttp?: any[];
+    sourceEnums?: any[];
+    targetHttp?: any[];
+    targetEnums?: any[];
 }
 declare const SourceConfig: (props: ISourceConfigProps) => React.JSX.Element;
 export default SourceConfig;

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

@@ -4,47 +4,34 @@ import "antd/es/upload/style";
 import _Upload from "antd/es/upload";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/row/style";
+import _Row from "antd/es/row";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
+import "antd/es/col/style";
+import _Col from "antd/es/col";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { tr } from '../../../../framework/locale/index';
 import { LinkOutlined, UploadOutlined, PlusOutlined } from '@ant-design/icons';
 import React from 'react';
 import Editable from '../../../Editable/index';
+import { MetadataService } from '../../../../framework/metadata/MetadataService';
+import { useAsyncMemo } from '../../../../framework/hooks/use-async-memo';
+import { deepClone } from '../../../../utils';
 var SourceConfig = function SourceConfig(props) {
   var configType = props.configType,
-    http = props.http;
+    sourceHttp = props.sourceHttp,
+    sourceEnums = props.sourceEnums,
+    targetHttp = props.targetHttp,
+    targetEnums = props.targetEnums;
   var isTarget = configType === 'target';
   var isSource = configType === 'source';
-  var sourceOpts = isTarget ? [{
-    value: 'Cassandra',
-    label: 'Cassandra'
-  }, {
-    value: 'PgSql',
-    label: 'PgSql'
-  }, {
-    value: 'Minio',
-    label: 'Minio'
-  }, {
-    value: 'SqlServer',
-    label: 'SqlServer'
-  }] : [{
-    value: 'Kafka',
-    label: 'Kafka'
-  }, {
-    value: 'PgSql',
-    label: 'PgSql'
-  }, {
-    value: 'Minio',
-    label: 'Minio'
-  }, {
-    value: 'SqlServer',
-    label: 'SqlServer'
-  }];
   var _React$useState = React.useState(),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     source = _React$useState2[0],
@@ -62,13 +49,6 @@ var SourceConfig = function SourceConfig(props) {
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     batchDuration = _React$useState8[0],
     setBatchDuration = _React$useState8[1];
-  var strategyOpts = [{
-    value: 'earliest',
-    label: 'earliest'
-  }, {
-    value: 'latest',
-    label: 'latest'
-  }];
   // sql source
   var _React$useState9 = React.useState(),
     _React$useState10 = _slicedToArray(_React$useState9, 2),
@@ -150,106 +130,147 @@ var SourceConfig = function SourceConfig(props) {
     filePath = _React$useState24[0],
     setFilePath = _React$useState24[1];
   // http 调用接口
-  // const watchValueRef = React.useRef<string | any>();
-  // const totalRef = React.useRef<number>();
-  // const getEnumDataByUrl = React.useCallback(
-  //   async (
-  //     http: {
-  //       isCascader: boolean;
-  //       isGroup: boolean;
-  //       isTreeSelect: boolean;
-  //       url: string;
-  //       method?: 'get' | 'post';
-  //       body?: string;
-  //       key: string;
-  //       value: string;
-  //       watch: string;
-  //     },
-  //     pid?: string,
-  //     page?: string,
-  //   ) => {
-  //     let server = new MetadataService();
-  //     let _url = pid || pid === '' ? http.url.replace('{pid}', pid) : http.url;
-  //     _url = page ? http.url.replace('{page}', page) : _url;
-  //     if (watchValueRef.current) {
-  //       if (typeof watchValueRef.current === 'string') {
-  //         _url = _url.replace('{watch}', watchValueRef.current);
-  //       }
-  //     }
-  //     console.log('========================getEnumDataByUrl', _url, watchValueRef.current);
-  //     const res = await server.GetEnumDataByUrl(
-  //       _url,
-  //       http.method,
-  //       http?.body && JSON.parse(http?.body) ? { ...JSON.parse(http?.body), ...(watchValueRef.current || {}) } : watchValueRef.current,
-  //     );
-  //     console.log('====Select====res', res);
-  //     const _res = res?.total ? res?.list : res;
-  //     totalRef.current = res?.total;
-  //     if (_res && _res.length > 0) {
-  //       // 一次性加载情况
-  //       if (http?.isCascader && http.url.indexOf('{pid}') === -1) {
-  //         return _res;
-  //       }
-  //       // 选项分组展示
-  //       if (http?.isGroup) {
-  //         return _res;
-  //       }
-  //       // 树接口数据展示
-  //       if (http?.isTreeSelect) {
-  //         return _res;
-  //       }
-  //       return _res.map((it: any) => {
-  //         if (http?.isCascader) {
-  //           return {
-  //             value: it[http?.key || 'id'],
-  //             label: it[http?.value || 'name'],
-  //             isLeaf: it['isLeaf'] ? it['isLeaf'] : false,
-  //           };
-  //         } else {
-  //           return { value: it[http?.key || 'id'], label: it[http?.value || 'name'], disabled: false };
-  //         }
-  //       });
-  //     } else {
-  //       console.warn(`${_url} is not return success result`);
-  //       return [];
-  //     }
-  //   },
-  //   [],
-  // );
-  // const httpOptions = useAsyncMemo(async () => {
-  //   if (extraInfo?.http && extraInfo?.http.url) {
-  //     const res = await getEnumDataByUrl(deepClone(extraInfo?.http), '', extraInfo?.http?.isPagination && (pageRef.current as any));
-  //     return res;
-  //   } else {
-  //     // 目前是更具那么的id判断的，暂未考虑重名问题
-  //     if (initEnumValue[id]) {
-  //       const _enum = deepClone(initEnumValue[id]);
-  //       if (extraInfo?.http?.isCascader) {
-  //         setCascaderOption([..._enum]);
-  //       }
-  //       if (extraInfo?.http?.isTreeSelect) {
-  //         setTreeData([..._enum]);
-  //       }
-  //     }
-  //   }
-  //   return [];
-  // }, [http, watchValue, isRefreshHttp]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex'
-    }
+  var watchValueRef = React.useRef();
+  var pageRef = React.useRef(1);
+  var totalRef = React.useRef();
+  var processSelectOptionsData = function processSelectOptionsData() {
+    var _options = [];
+    var _items = [];
+    var _enum = deepClone(sourceEnums || targetEnums || []);
+    _enum.forEach(function (p) {
+      p.forEach(function (it) {
+        var _it$key;
+        var obj = {
+          label: it.value,
+          value: (_it$key = it === null || it === void 0 ? void 0 : it.key) !== null && _it$key !== void 0 ? _it$key : it === null || it === void 0 ? void 0 : it.value
+        };
+        _items.push(obj);
+      });
+      _options.push(_items);
+      _items = [];
+    });
+    return _options;
+  };
+  var options = React.useMemo(function () {
+    return processSelectOptionsData();
+  }, [sourceEnums, targetEnums]);
+  var getEnumDataByUrl = React.useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(http, pid, page) {
+      var server, _url, res, _res;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            server = new MetadataService();
+            _url = pid || pid === '' ? http.url.replace('{pid}', pid) : http.url;
+            _url = page ? http.url.replace('{page}', page) : _url;
+            if (watchValueRef.current) {
+              if (typeof watchValueRef.current === 'string') {
+                _url = _url.replace('{watch}', watchValueRef.current);
+              }
+            }
+            _context.next = 6;
+            return server.GetEnumDataByUrl(_url, http.method, (http === null || http === void 0 ? void 0 : http.body) && JSON.parse(http === null || http === void 0 ? void 0 : http.body) ? _objectSpread(_objectSpread({}, JSON.parse(http === null || http === void 0 ? void 0 : http.body)), watchValueRef.current || {}) : watchValueRef.current);
+          case 6:
+            res = _context.sent;
+            _res = (res === null || res === void 0 ? void 0 : res.total) ? res === null || res === void 0 ? void 0 : res.list : res;
+            totalRef.current = res === null || res === void 0 ? void 0 : res.total;
+            if (!(_res && _res.length > 0)) {
+              _context.next = 19;
+              break;
+            }
+            if (!((http === null || http === void 0 ? void 0 : http.isCascader) && http.url.indexOf('{pid}') === -1)) {
+              _context.next = 12;
+              break;
+            }
+            return _context.abrupt("return", _res);
+          case 12:
+            if (!(http === null || http === void 0 ? void 0 : http.isGroup)) {
+              _context.next = 14;
+              break;
+            }
+            return _context.abrupt("return", _res);
+          case 14:
+            if (!(http === null || http === void 0 ? void 0 : http.isTreeSelect)) {
+              _context.next = 16;
+              break;
+            }
+            return _context.abrupt("return", _res);
+          case 16:
+            return _context.abrupt("return", _res.map(function (it) {
+              if (http === null || http === void 0 ? void 0 : http.isCascader) {
+                return {
+                  value: it[(http === null || http === void 0 ? void 0 : http.key) || 'id'],
+                  label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name'],
+                  isLeaf: it['isLeaf'] ? it['isLeaf'] : false
+                };
+              } else {
+                return {
+                  value: it[(http === null || http === void 0 ? void 0 : http.key) || 'id'],
+                  label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name'],
+                  disabled: false
+                };
+              }
+            }));
+          case 19:
+            console.warn("".concat(_url, " is not return success result"));
+            return _context.abrupt("return", []);
+          case 21:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2, _x3) {
+      return _ref.apply(this, arguments);
+    };
+  }(), []);
+  var httpOptions = useAsyncMemo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _httpOptions;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _httpOptions = (sourceHttp || targetHttp).map(function (it) {
+            if (it && it.url) {
+              getEnumDataByUrl(deepClone(it), '', (it === null || it === void 0 ? void 0 : it.isPagination) && pageRef.current).then(function (res) {
+                return res;
+              });
+            }
+            return [];
+          });
+          return _context2.abrupt("return", _httpOptions);
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })), [sourceHttp, targetHttp]);
+  var myOptions = React.useMemo(function () {
+    var _options = options;
+    httpOptions && httpOptions.forEach(function (p, i) {
+      if (p && p.length > 0) {
+        _options[i] = p;
+      }
+    });
+    return _options;
+  }, [options, httpOptions]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, {
+    gutter: 16
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 8
   }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('数据源'),
     name: 'dataSource',
     required: true
   }, /*#__PURE__*/React.createElement(_Select, {
-    options: sourceOpts,
     value: source,
     onChange: function onChange(val) {
       return setSource(val);
     },
+    options: myOptions[0],
     allowClear: true
-  })), /*#__PURE__*/React.createElement(FormItem, {
+  }))), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(FormItem, {
     name: tr('defaultSource'),
     colon: false
   }, /*#__PURE__*/React.createElement(_Select, {
@@ -257,30 +278,35 @@ var SourceConfig = function SourceConfig(props) {
     onChange: function onChange(val) {
       return setDefaultSource(val);
     },
+    options: myOptions[1],
     allowClear: true
-  })), /*#__PURE__*/React.createElement(FormItem, {
+  }))), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(FormItem, {
     colon: false
   }, /*#__PURE__*/React.createElement(_Button, {
     className: "ml-2",
     type: "link",
     icon: /*#__PURE__*/React.createElement(LinkOutlined, null),
     onClick: function onClick() {}
-  }, tr('测试连接')))), isSource && source === 'Kafka' && /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex'
-    }
+  }, tr('测试连接'))))), isSource && source === 'Kafka' && /*#__PURE__*/React.createElement(_Row, {
+    gutter: 16
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 8
   }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('消费策略'),
     name: 'autoOffsetReset',
     required: true
   }, /*#__PURE__*/React.createElement(_Select, {
-    options: strategyOpts,
     value: autoOffsetReset,
     onChange: function onChange(val) {
       return setAutoOffsetReset(val);
     },
+    options: myOptions[2],
     allowClear: true
-  })), /*#__PURE__*/React.createElement(FormItem, {
+  }))), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('批间隔'),
     name: 'batchDuration',
     required: true
@@ -290,10 +316,10 @@ var SourceConfig = function SourceConfig(props) {
       var _e$target;
       return setBatchDuration(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
     }
-  }))), isSource && (source === 'PgSql' || source === 'SqlServer') && /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex'
-    }
+  })))), isSource && (source === 'PgSql' || source === 'SqlServer') && /*#__PURE__*/React.createElement(_Row, {
+    gutter: 16
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 8
   }, /*#__PURE__*/React.createElement(FormItem, {
     label: 'fetch size',
     name: 'fetchSize',
@@ -304,7 +330,9 @@ var SourceConfig = function SourceConfig(props) {
       var _e$target2;
       return setFetchSize(e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value);
     }
-  })), /*#__PURE__*/React.createElement(FormItem, {
+  }))), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(FormItem, {
     label: 'sql',
     name: 'sql',
     required: true
@@ -314,7 +342,7 @@ var SourceConfig = function SourceConfig(props) {
       var _e$target3;
       return setSql(e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.value);
     }
-  }))), isSource && source === 'Minio' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormItem, {
+  })))), isSource && source === 'Minio' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('上传文件'),
     name: 'filepath',
     required: true
@@ -326,7 +354,11 @@ var SourceConfig = function SourceConfig(props) {
     }
   }, /*#__PURE__*/React.createElement(_Button, {
     icon: /*#__PURE__*/React.createElement(UploadOutlined, null)
-  }, tr('上传'))))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormItem, {
+  }, tr('上传')))), /*#__PURE__*/React.createElement(_Row, {
+    gutter: 16
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 16
+  }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('文件信息'),
     name: 'headers'
   }, /*#__PURE__*/React.createElement(Editable, {
@@ -346,7 +378,11 @@ var SourceConfig = function SourceConfig(props) {
       width: '100%',
       marginTop: '2px'
     }
-  }, tr('添加一行'))))), isTarget && source === 'Cassandra' && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormItem, {
+  }, tr('添加一行')))))), isTarget && source === 'Cassandra' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, {
+    gutter: 16
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('键空间'),
     name: 'keyspace',
     required: true
@@ -355,11 +391,10 @@ var SourceConfig = function SourceConfig(props) {
     onChange: function onChange(val) {
       return setKeyspace(val);
     },
+    options: myOptions[2],
     allowClear: true
-  })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex'
-    }
+  }))), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
   }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('数据表'),
     name: 'dtname',
@@ -369,18 +404,21 @@ var SourceConfig = function SourceConfig(props) {
     onChange: function onChange(val) {
       return setDtname(val);
     },
+    options: myOptions[3],
     allowClear: true
-  })), /*#__PURE__*/React.createElement(FormItem, {
+  }))), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(FormItem, {
     colon: false
   }, /*#__PURE__*/React.createElement(_Button, {
     className: "ml-2",
     type: "link",
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     onClick: function onClick() {}
-  }, tr('手动建表'))))), isTarget && (source === 'PgSql' || source === 'SqlServer') && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex'
-    }
+  }, tr('手动建表')))))), isTarget && (source === 'PgSql' || source === 'SqlServer') && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, {
+    gutter: 16
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 8
   }, /*#__PURE__*/React.createElement(FormItem, {
     label: 'schema',
     name: 'schema',
@@ -390,8 +428,11 @@ var SourceConfig = function SourceConfig(props) {
     onChange: function onChange(val) {
       return setSchema(val);
     },
+    options: myOptions[4],
     allowClear: true
-  })), /*#__PURE__*/React.createElement(FormItem, {
+  }))), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('数据库'),
     name: 'dbname',
     required: true
@@ -400,11 +441,12 @@ var SourceConfig = function SourceConfig(props) {
     onChange: function onChange(val) {
       return setDbname(val);
     },
+    options: myOptions[5],
     allowClear: true
-  }))), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex'
-    }
+  })))), /*#__PURE__*/React.createElement(_Row, {
+    gutter: 16
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 8
   }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('数据表'),
     name: 'dtname',
@@ -414,15 +456,22 @@ var SourceConfig = function SourceConfig(props) {
     onChange: function onChange(val) {
       return setDtname(val);
     },
+    options: myOptions[6],
     allowClear: true
-  })), /*#__PURE__*/React.createElement(FormItem, {
+  }))), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(FormItem, {
     colon: false
   }, /*#__PURE__*/React.createElement(_Button, {
     className: "ml-2",
     type: "link",
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     onClick: function onClick() {}
-  }, tr('手动建表'))))), isTarget && source === 'Minio' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormItem, {
+  }, tr('手动建表')))))), isTarget && source === 'Minio' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, {
+    gutter: 16
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 16
+  }, /*#__PURE__*/React.createElement(FormItem, {
     label: tr('文件路径'),
     name: 'filepath',
     required: true
@@ -431,7 +480,7 @@ var SourceConfig = function SourceConfig(props) {
     onChange: function onChange(e) {
       return setFilePath(e.target.value);
     }
-  }))));
+  }))))));
 };
 export default SourceConfig;
 var FormItem = function FormItem(props) {

package/package.json

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