ronds-metadata 1.3.65 → 1.3.67

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.eyJuYmYiOjE3MjE3MzM1NTMsImV4cCI6MTcyMTk5Mjc1MywiaXNzIjoiaHR0cDovL2ZhYmlvOjk5OTkvc3VwZXJjYXJlY29yZSIsImF1ZCI6ImVwbSIsImNsaWVudF9pZCI6ImVwbSIsInN1YiI6IjNhMTIxZDJiLWYwZDUtZDQ3OC0xN2Q3LWQwODEwZDgzZDViMSIsImF1dGhfdGltZSI6MTcyMTczMzU1MywiaWRwIjoibG9jYWwiLCJuYW1lIjoicGhtIiwiZW1haWwiOiJwaG1AYWJwLmlvIiwicm9sZSI6WyJhZG1pbiIsInBobV9hZG1pbiJdLCJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9naXZlbm5hbWUiOiJwaG3ov5Dnu7TotKblj7ciLCJwaG9uZV9udW1iZXIiOiIxMzYwMDAwMDAwMCIsInBob25lX251bWJlcl92ZXJpZmllZCI6IlRydWUiLCJlbWFpbF92ZXJpZmllZCI6IlRydWUiLCJpYXQiOjE3MjE3MzM1NTMsInNjb3BlIjpbImFkZHJlc3MiLCJlbWFpbCIsImVwbSIsIm9wZW5pZCIsInBob25lIiwicHJvZmlsZSIsInJvbGUiLCJvZmZsaW5lX2FjY2VzcyJdLCJhbXIiOlsicHdkIl19.KqDd_VKMll9xS7h3WbC8K2jVgtX7mcgAr2gENrr-PR2W7gUKdLe6TLwBBSXTYgj5XIvPdAc6wqfVPDenauFDmbpQ8-7azDdQ-R7pNo6TZ5iOxyhqfcAjy7Ych7RFP5uZPppLtow_ojnhEuLz-dH0v-2a2SAbELqfijd3NzqB_L0PRAIqQwPEh2g8VHhKYOmZoTMXubrDpAhcloxuzEPWikbWDu46vjFzX3HXYCoi00e32Y3KvSV1Gx2lTg3_ydBuHtPEnG4weDXauEiqRZ5tKDFBXOEFSFNQ2laRfXaAoyphD_sxvmdnDRsleamsgyQ6PAD2Q-_Gztt9IlVj_txthg';
+var token = 'Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkMyMTJFMjI1NTcwNjRDQTE3M0U2NjkxRjM4QzFDOEEyIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE3MjM0MzQ2MzEsImV4cCI6MTcyMzY5MzgzMSwiaXNzIjoiaHR0cDovL2ZhYmlvOjk5OTkvc3VwZXJjYXJlY29yZSIsImF1ZCI6ImVwbSIsImNsaWVudF9pZCI6ImVwbSIsInN1YiI6IjNhMTIxZDJiLWYwZDUtZDQ3OC0xN2Q3LWQwODEwZDgzZDViMSIsImF1dGhfdGltZSI6MTcyMzQzNDYzMSwiaWRwIjoibG9jYWwiLCJuYW1lIjoicGhtIiwiZW1haWwiOiJwaG1AYWJwLmlvIiwicm9sZSI6WyJhZG1pbiIsInBobV9hZG1pbiJdLCJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9naXZlbm5hbWUiOiJwaG3ov5Dnu7TotKblj7ciLCJwaG9uZV9udW1iZXIiOiIxMzYwMDAwMDAwMCIsInBob25lX251bWJlcl92ZXJpZmllZCI6IlRydWUiLCJlbWFpbF92ZXJpZmllZCI6IlRydWUiLCJpYXQiOjE3MjM0MzQ2MzEsInNjb3BlIjpbImFkZHJlc3MiLCJlbWFpbCIsImVwbSIsIm9wZW5pZCIsInBob25lIiwicHJvZmlsZSIsInJvbGUiLCJvZmZsaW5lX2FjY2VzcyJdLCJhbXIiOlsicHdkIl19.W_5480G2iW6ua9EzViDFCDN6nUnUvbsBi9uL_ChHOmnTXojVUn8qJEK-Z3TdIe22_E1Jjn_AZrvZ7JZpjV5RiUM77pOSpRwTx8zfZFApeiKVFtv6UdM0Amkvbh5eFw8xnVPDQhNCWe0oBpFbq4YEos2pXafr2nCYvAyPPfvToRolPDlKQ9-Fi-afjcFDzckNzLd5f-Gcdx3YOUcbhq2PxJpYGEmCHmUzp8chsZ09dMfejZdRbhy1_BWHu9SLsU4N1hjq3VjSd-QhgPzCvC1kzx1Ovd9NkwO4Jot8wn3GoycWYAjkYXoymWFzWPs-KRG5pZgAqO-vCSBIZ4Y_KEO_Rw';
 addInterceptor(function (httpClient) {
   httpClient.interceptors.request.use(function (_config) {
     if (!_config.headers) {

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.d.ts

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