ronds-metadata 1.1.63 → 1.1.65

package/es/comps/FileView/index.d.ts

@@ -0,0 +1,2 @@
+declare const FileView: () => JSX.Element;
+export default FileView;

package/es/comps/FileView/index.js

@@ -0,0 +1,19 @@
+import React from "react";
+
+/*
+ * @Author: wangxian
+ * @Date: 2022-11-25 14:14:50
+ * @LastEditTime: 2022-11-25 14:30:35
+ */
+import FileViewer from 'react-file-viewer';
+
+var FileView = function FileView() {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FileViewer, {
+    fileType: "xslx" //文件类型
+    ,
+    filePath: 'http://192.168.1.186:9006/experiment//1fc9b9e3-51a3-79c0-de28-5ddff261d8fd/%E8%A1%A8%E6%A0%BC/%E6%B5%8B%E8%AF%95/test.xlsx?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20221125%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221125T061952Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=97b63c66f7d2e9181d3b1486e360bdd7000e3104fc486a1d8fafd8db3d0623b4' //文件地址（后台给返的二进制流也可以）
+
+  }));
+};
+
+export default FileView;

package/es/comps/MdView/index.js

@@ -6,7 +6,7 @@ import React from "react";
 /*
  * @Author: wangxian
  * @Date: 2022-09-02 16:17:38
- * @LastEditTime: 2022-11-23 08:39:29
+ * @LastEditTime: 2022-11-23 09:09:46
  */
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
@@ -41,18 +41,16 @@ var MdView = function MdView(props) {
             children = _ref.children,
             props = _objectWithoutProperties(_ref, _excluded);
 
-        var match = /language-(\w+)/.exec(className || '');
+        var match = /language-(\w+)/.exec(className || 'javascript');
         return !inline && match ? /*#__PURE__*/React.createElement(SyntaxHighlighter, _extends({
           showLineNumbers: true,
           style: oneLight,
           language: match[1],
-          PreTag: "div"
-        }, props), String(children).replace(/\n$/, '')) : /*#__PURE__*/React.createElement(SyntaxHighlighter, _extends({
-          showLineNumbers: true,
-          style: oneLight,
-          language: 'javascript',
-          PreTag: "div"
-        }, props), String(children).replace(/\n$/, ''));
+          PreTag: "div",
+          className: "self-highlighter"
+        }, props), String(children).replace(/\n$/, '')) : /*#__PURE__*/React.createElement("code", _extends({
+          className: className
+        }, props), children);
       }
     }
   }, source)), isMarkNav && /*#__PURE__*/React.createElement("div", {

package/es/comps/MdView/index.less

@@ -219,12 +219,16 @@
     }
   }
   pre {
-    padding: 0 !important;
-    background-color: transparent;
+    padding: 10px !important;
+    background-color: rgb(250, 250, 250);
     code {
       font-weight: 300;
       background-color: transparent;
     }
+    .self-highlighter {
+      padding: 0 !important;
+      margin: 0 !important;
+    }
   }
 
   // list

package/es/comps/MetadataForm/DataCell/Select.js

@@ -26,7 +26,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-11-22 16:10:55
+ * @LastEditTime: 2022-11-28 16:28:25
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -116,10 +116,18 @@ function Index(props) {
               totalRef.current = res === null || res === void 0 ? void 0 : res.total;
 
               if (!(_res && _res.length > 0)) {
-                _context.next = 13;
+                _context.next = 15;
                 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:
               return _context.abrupt("return", _res.map(function (it) {
                 if (http === null || http === void 0 ? void 0 : http.isCascader) {
                   return {
@@ -135,11 +143,11 @@ function Index(props) {
                 }
               }));
 
-            case 13:
+            case 15:
               console.warn("".concat(_url, " is not return success result"));
               return _context.abrupt("return", []);
 
-            case 15:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -219,6 +227,8 @@ function Index(props) {
 
   var loadData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(selectedOptions) {
+      var _targetOption$childre;
+
       var targetOption, _children;
 
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -227,10 +237,16 @@ function Index(props) {
             case 0:
               targetOption = selectedOptions[selectedOptions.length - 1];
               targetOption.loading = true;
-              _context3.next = 4;
+
+              if (!(!targetOption.isLeaf && (!(targetOption === null || targetOption === void 0 ? void 0 : targetOption.children) || ((_targetOption$childre = targetOption.children) === null || _targetOption$childre === void 0 ? void 0 : _targetOption$childre.length) === 0))) {
+                _context3.next = 7;
+                break;
+              }
+
+              _context3.next = 5;
               return getEnumDataByUrl(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http, targetOption.value);
 
-            case 4:
+            case 5:
               _children = _context3.sent;
               setTimeout(function () {
                 targetOption.loading = false;
@@ -238,7 +254,7 @@ function Index(props) {
                 setCascaderOption(_toConsumableArray(cascaderOption));
               }, 500);
 
-            case 6:
+            case 7:
             case "end":
               return _context3.stop();
           }

package/es/index.d.ts

@@ -7,6 +7,7 @@ export { default as JsonView } from './comps/JsonView';
 export { default as JsonEdit } from './comps/JsonEdit';
 export { default as MdEditor } from './comps/MdEdit';
 export { default as MdView } from './comps/MdView';
+export { default as FileView } from './comps/FileView';
 export { default as Editable } from './comps/Editable';
 export { default as DynamicPorts } from './comps/DynamicPorts';
 export { default as DragNode } from './comps/DynamicPorts/comps/DragNode';

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-09-02 16:19:21
+ * @LastEditTime: 2022-11-25 14:17:34
  */
 import './theme.less';
 export { default as MetadataEdit } from './comps/MetadataEdit';
@@ -12,6 +12,7 @@ export { default as JsonView } from './comps/JsonView';
 export { default as JsonEdit } from './comps/JsonEdit';
 export { default as MdEditor } from './comps/MdEdit';
 export { default as MdView } from './comps/MdView';
+export { default as FileView } from './comps/FileView';
 export { default as Editable } from './comps/Editable';
 export { default as DynamicPorts } from './comps/DynamicPorts';
 export { default as DragNode } from './comps/DynamicPorts/comps/DragNode';

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.63",
+  "version": "1.1.65",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -52,6 +52,7 @@
     "react": "^17.0.2",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
+    "react-file-viewer": "^1.2.1",
     "react-markdown": "^8.0.3",
     "react-markdown-editor-lite": "^1.3.2",
     "react-popper": "^2.2.3",