ronds-metadata 1.3.75 → 1.3.77

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

@@ -153,7 +153,6 @@ export declare const BusinessSchema: {
                     common: {
                         label: string;
                         colSpan: number;
-                        labelSpan: number;
                         require: boolean;
                     };
                     'common-en-US': {};
@@ -262,7 +261,6 @@ export declare const BusinessSchema: {
                     common: {
                         label: string;
                         colSpan: number;
-                        labelSpan: number;
                     };
                     'common-en-US': {};
                     text: {

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

@@ -171,7 +171,6 @@ var ETL_SOURCE_SCHEMA = [{
         common: {
           label: 'Spark Sql',
           colSpan: 2,
-          labelSpan: 4,
           require: true
         },
         'common-en-US': {},
@@ -294,8 +293,7 @@ var ETL_DIRECTION_SCHEMA = [{
       value: {
         common: {
           label: '字段映射',
-          colSpan: 2,
-          labelSpan: 4
+          colSpan: 2
         },
         'common-en-US': {},
         text: {

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

@@ -8,11 +8,17 @@ var BusinessForm = function BusinessForm(props) {
     disabled = props.disabled,
     value = props.value,
     onChange = props.onChange;
+  var formRef = React.useRef();
   var schema = React.useMemo(function () {
     var _extraInfo$bussiness;
     return BusinessSchema[extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$bussiness = extraInfo.bussiness) === null || _extraInfo$bussiness === void 0 ? void 0 : _extraInfo$bussiness.type];
   }, [extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$bussiness2 = extraInfo.bussiness) === null || _extraInfo$bussiness2 === void 0 ? void 0 : _extraInfo$bussiness2.type]);
   var valueRef = React.useRef({});
+  React.useEffect(function () {
+    if (value) {
+      formRef.current.setFieldsValue(_objectSpread({}, value));
+    }
+  }, [value]);
   var triggerChange = function triggerChange(changedValue) {
     valueRef.current = _objectSpread(_objectSpread({}, valueRef.current), changedValue);
     onChange && onChange(valueRef.current);
@@ -23,7 +29,7 @@ var BusinessForm = function BusinessForm(props) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(MetadataForm, {
     schema: schema,
     getFormInstance: function getFormInstance(form) {
-      // formRef.current = form;
+      formRef.current = form;
     },
     onValuesChange: onValuesChange
   }));

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

@@ -9,7 +9,7 @@ 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 { tr } from '@/framework/locale';
+import { tr } from '../../../../../framework/locale';
 import React from 'react';
 import { useGetDatasource } from './hooks';
 import { PlusOutlined } from '@ant-design/icons';
@@ -27,7 +27,6 @@ var CassandraDatasource = function CassandraDatasource(props) {
   var keySpaceOpts = useGetDatasource('Cassandra', 2, datasource);
   var dataTableOpts = useGetDatasource('Cassandra', 3, datasource, keySpace ? JSON.parse(keySpace).name : undefined);
   var onKeySpaceChange = function onKeySpaceChange(value) {
-    debugger;
     setKeySpace(value);
     onChange && onChange({
       keyspace: value

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

@@ -56,7 +56,8 @@ var DataSource = function DataSource(props) {
     setDsType(value);
     setDatasource('');
     triggerChange({
-      dsType: value
+      dsType: value,
+      datasource: ''
     });
   };
   var onDatasourceChange = function onDatasourceChange(value) {
@@ -68,10 +69,15 @@ var DataSource = function DataSource(props) {
   var onKafkaChange = function onKafkaChange(value) {
     triggerChange(_objectSpread({}, value));
   };
-  var onPgSqlChange = function onPgSqlChange(value) {};
+  var onPgSqlChange = function onPgSqlChange(value) {
+    triggerChange(_objectSpread({}, value));
+  };
   var onCassandraChange = function onCassandraChange(value) {
     triggerChange(_objectSpread({}, value));
   };
+  var onSqlServerChange = function onSqlServerChange(value) {
+    triggerChange(_objectSpread({}, value));
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.borderHidden) ? {
       padding: '10px 10px 10px 10px',
@@ -149,7 +155,7 @@ var DataSource = function DataSource(props) {
     labelCol: labelCol,
     extraInfo: extraInfo,
     datasource: datasource,
-    onChange: onCassandraChange
+    onChange: onSqlServerChange
   }))));
 };
 export default DataSource;

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

@@ -2,10 +2,10 @@ import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
 import "antd/es/row/style";
 import _Row from "antd/es/row";
-import "antd/es/col/style";
-import _Col from "antd/es/col";
 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 _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -15,7 +15,7 @@ import { CloseCircleFilled, ArrowRightOutlined } from '@ant-design/icons';
 import React from 'react';
 import Editable from '../../../../comps/Editable';
 import { MetadataFormContext } from '../../interface';
-import { useGetLabelCol } from './Datasource/hooks';
+import { useGetLabelCol, useGetWrapperCol } from './Datasource/hooks';
 var MapTable = function MapTable(props) {
   var value = props.value,
     onChange = props.onChange,
@@ -28,6 +28,8 @@ var MapTable = function MapTable(props) {
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     tableDataTarget = _React$useState4[0],
     setTableDataTarget = _React$useState4[1];
+  var tableDataSourceRef = React.useRef([]);
+  var tableDataTargetRef = React.useRef([]);
   var _React$useState5 = React.useState([]),
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     options = _React$useState6[0],
@@ -49,6 +51,7 @@ var MapTable = function MapTable(props) {
   var _React$useContext = React.useContext(MetadataFormContext),
     form = _React$useContext.form;
   var labelCol = useGetLabelCol(extraInfo);
+  var wrapperCol = useGetWrapperCol(extraInfo);
   var triggerChange = function triggerChange(changedValue) {
     onChange && onChange(_objectSpread({
       mapping: mapping,
@@ -74,12 +77,14 @@ var MapTable = function MapTable(props) {
     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);
+    tableDataSourceRef.current = 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);
+    tableDataTargetRef.current = newDataTarget;
   };
   React.useEffect(function () {
     if (value) {
@@ -114,44 +119,44 @@ var MapTable = function MapTable(props) {
   }, [disableArray]);
   React.useEffect(function () {
     var values = form.getFieldsValue().mapTable;
-    (values === null || values === void 0 ? void 0 : values.dataSource) && setTableDataSource(values.dataSource);
-    (values === null || values === void 0 ? void 0 : values.dataTarget) && setTableDataTarget(values.dataTarget);
+    debugger;
+    if (tableDataSourceRef.current.length !== 0) {
+      setTableDataSource(tableDataSourceRef.current);
+    } else {
+      (values === null || values === void 0 ? void 0 : values.dataSource) && setTableDataSource(values.dataSource);
+    }
+    if (tableDataTargetRef.current.length !== 0) {
+      setTableDataTarget(tableDataTargetRef.current);
+    } else {
+      (values === null || values === void 0 ? void 0 : values.dataTarget) && setTableDataTarget(values.dataTarget);
+    }
     (values === null || values === void 0 ? void 0 : values.options) && setOptions(values.options);
     if (!disableArray && (values === null || values === void 0 ? void 0 : values.dataSource) && (values === null || values === void 0 ? void 0 : values.dataTarget)) {
       var _values$dataSource, _values$dataTarget;
       var valueArray = new Array(Math.min((_values$dataSource = values.dataSource) === null || _values$dataSource === void 0 ? void 0 : _values$dataSource.length, (_values$dataTarget = values.dataTarget) === null || _values$dataTarget === void 0 ? void 0 : _values$dataTarget.length)).fill(true);
       setDisableArray(valueArray);
     }
-  }, [form.getFieldsValue()]);
+  }, [form.getFieldsValue(), disableArray]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, {
     className: !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.borderHidden) && 'ant-form-item',
     style: {
       alignItems: 'center'
     }
   }, /*#__PURE__*/React.createElement(_Col, {
-    span: !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.labelSpan) && (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.layout) === 'vertical' && 24,
-    flex: labelCol
-  }, /*#__PURE__*/React.createElement("div", {
+    flex: wrapperCol,
     style: {
-      width: '100%',
-      height: '100%'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: '10px'
+      paddingBottom: '8px'
     }
   }, /*#__PURE__*/React.createElement(_Select, {
     onChange: onOutputChange,
     value: output,
-    style: {
-      width: 150
-    },
     options: options
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
       width: '100%',
-      height: '100%'
+      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", {
     style: {
@@ -205,7 +210,7 @@ var MapTable = function MapTable(props) {
     },
     onRowClick: function onRowClick(record) {},
     onMove: onTargetMove
-  }))))))));
+  }))))));
 };
 export default MapTable;
 var columnSource = [{

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

@@ -14,7 +14,7 @@ import React from 'react';
 import { EyeOutlined, MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import Split from '../../../Split';
 import SqlEdit from '../../../JsonEdit';
-import { useGetLabelCol } from './Datasource/hooks';
+import { useGetLabelCol, useGetWrapperCol } from './Datasource/hooks';
 var SparkSqlTable = function SparkSqlTable(props) {
   var extraDico = props.extraDico,
     value = props.value,
@@ -33,6 +33,7 @@ var SparkSqlTable = function SparkSqlTable(props) {
     list = _React$useState6[0],
     setList = _React$useState6[1];
   var labelCol = useGetLabelCol(extraInfo);
+  var wrapperCol = useGetWrapperCol(extraInfo);
   var handleAddItem = function handleAddItem() {
     var _list = [].concat(_toConsumableArray(list), [{
       alias: undefined,
@@ -99,14 +100,15 @@ var SparkSqlTable = function SparkSqlTable(props) {
       alignItems: 'center'
     }
   }, /*#__PURE__*/React.createElement(_Col, {
-    span: !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.labelSpan) && (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.layout) === 'vertical' && 24,
-    flex: labelCol
+    flex: wrapperCol,
+    style: {
+      paddingBottom: '8px'
+    }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      border: '2px solid #bebebe',
+      border: '2px solid var(--ronds-metadata-color-border-1)',
       height: '500px',
-      margin: '6px',
-      width: '1135px'
+      width: '100%'
     }
   }, /*#__PURE__*/React.createElement(Split, {
     gutterSize: 2,
@@ -157,7 +159,8 @@ var SparkSqlTable = function SparkSqlTable(props) {
     style: {
       padding: '8px',
       height: '100%',
-      overflowY: 'auto'
+      overflowY: 'auto',
+      width: '100%'
     }
   }, list.map(function (item, idx) {
     var _item$alias;
@@ -171,8 +174,8 @@ var SparkSqlTable = function SparkSqlTable(props) {
       }
     }, /*#__PURE__*/React.createElement("div", {
       style: {
-        border: '1px solid #bbbbbb',
-        width: '1100px'
+        border: '1px solid var(--ronds-metadata-color-border-1)',
+        width: '100%'
       }
     }, /*#__PURE__*/React.createElement(Split, {
       gutterSize: 1,

package/package.json

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