ronds-metadata 1.3.66 → 1.3.67

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

@@ -1,8 +1,6 @@
 import React from 'react';
 interface IMapTableProps {
-    columnSource: any;
     dataSource: any;
-    columnTarget: any;
     dataTarget: any;
     options: any;
     value?: any;

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

@@ -1,3 +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";
@@ -11,9 +13,7 @@ import { CloseCircleFilled, ArrowRightOutlined } from '@ant-design/icons';
 import React from 'react';
 import Editable from '../../../../comps/Editable';
 var MapTable = function MapTable(props) {
-  var columnSource = props.columnSource,
-    dataSource = props.dataSource,
-    columnTarget = props.columnTarget,
+  var dataSource = props.dataSource,
     dataTarget = props.dataTarget,
     options = props.options,
     value = props.value,
@@ -24,8 +24,12 @@ var MapTable = function MapTable(props) {
     setMapping = _React$useState2[1];
   var _React$useState3 = React.useState(),
     _React$useState4 = _slicedToArray(_React$useState3, 2),
-    disableArray = _React$useState4[0],
-    setDisableArray = _React$useState4[1];
+    output = _React$useState4[0],
+    setOutput = _React$useState4[1];
+  var _React$useState5 = React.useState(),
+    _React$useState6 = _slicedToArray(_React$useState5, 2),
+    disableArray = _React$useState6[0],
+    setDisableArray = _React$useState6[1];
   var editableStreamRef = React.useRef();
   var triggerChange = function triggerChange(changedValue) {
     onChange && onChange(_objectSpread({
@@ -37,6 +41,12 @@ var MapTable = function MapTable(props) {
     _disableArray[index] = !_disableArray[index];
     setDisableArray(_disableArray);
   };
+  var onOutputChange = function onOutputChange(value) {
+    setOutput(value);
+    triggerChange({
+      output: value
+    });
+  };
   React.useEffect(function () {
     if (value) {
       if (value[mapping]) {
@@ -45,21 +55,22 @@ var MapTable = function MapTable(props) {
     }
   }, [value]);
   React.useEffect(function () {
-    setDisableArray(new Array(Math.min(dataSource.length, dataTarget.length)).fill(true));
+    setDisableArray(new Array(Math.min(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, dataTarget === null || dataTarget === void 0 ? void 0 : dataTarget.length)).fill(true));
   }, []);
   React.useEffect(function () {
     if (disableArray) {
       var _mapping = [];
       disableArray.forEach(function (_, idx) {
         if (disableArray[idx]) {
+          var _dataSource$idx, _dataSource$idx2, _dataTarget$idx, _dataTarget$idx2;
           _mapping.push({
             source: {
-              name: dataSource[idx].source,
-              dataType: dataSource[idx].type
+              name: (_dataSource$idx = dataSource[idx]) === null || _dataSource$idx === void 0 ? void 0 : _dataSource$idx.source,
+              dataType: (_dataSource$idx2 = dataSource[idx]) === null || _dataSource$idx2 === void 0 ? void 0 : _dataSource$idx2.type
             },
             target: {
-              name: dataTarget[idx].source,
-              dataType: dataTarget[idx].type
+              name: (_dataTarget$idx = dataTarget[idx]) === null || _dataTarget$idx === void 0 ? void 0 : _dataTarget$idx.source,
+              dataType: (_dataTarget$idx2 = dataTarget[idx]) === null || _dataTarget$idx2 === void 0 ? void 0 : _dataTarget$idx2.type
             }
           });
         }
@@ -81,7 +92,8 @@ var MapTable = function MapTable(props) {
     }
   }, /*#__PURE__*/React.createElement(_Select, {
     defaultValue: "a1",
-    onChange: function onChange() {},
+    onChange: onOutputChange,
+    value: output,
     style: {
       width: 150
     },
@@ -97,6 +109,7 @@ var MapTable = function MapTable(props) {
       width: '40%'
     }
   }, /*#__PURE__*/React.createElement(Editable, {
+    readonly: true,
     type: "single",
     columns: columnSource,
     dataSource: dataSource,
@@ -111,7 +124,7 @@ var MapTable = function MapTable(props) {
     style: {
       marginTop: '40px'
     }
-  }, _toConsumableArray(Array(Math.min(dataSource.length, dataTarget.length))).map(function (_, index) {
+  }, _toConsumableArray(Array(Math.min(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, dataTarget === null || dataTarget === void 0 ? void 0 : dataTarget.length))).map(function (_, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       style: {
@@ -140,4 +153,48 @@ var MapTable = function MapTable(props) {
     size: "small"
   })))));
 };
-export default MapTable;
+export default MapTable;
+var columnSource = [{
+  title: '来源表字段',
+  dataIndex: 'name',
+  key: 'name'
+}, {
+  title: '类型',
+  dataIndex: 'type',
+  key: 'type'
+}, {
+  title: '注释',
+  dataIndex: 'label',
+  key: 'label'
+}];
+var columnTarget = [{
+  title: '来源表字段',
+  dataIndex: 'name',
+  key: 'name'
+}, {
+  title: '类型',
+  dataIndex: 'type',
+  key: 'type'
+}, {
+  title: '注释',
+  dataIndex: 'label',
+  key: 'label'
+}, {
+  title: '主键',
+  dataIndex: 'key',
+  key: 'key',
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(_Checkbox, {
+      checked: val
+    });
+  }
+}, {
+  title: '非空',
+  dataIndex: 'require',
+  key: 'require',
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(_Checkbox, {
+      checked: val
+    });
+  }
+}];

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

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

package/package.json

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