ronds-metadata 1.1.31 → 1.1.34

package/es/api/index.js

@@ -6,10 +6,32 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-21 08:37:14
+ * @LastEditTime: 2022-08-29 18:32:10
  */
-import { HttpHelper } from '../framework/http';
+import { guid, md5 } from '@/utils';
+import { addInterceptor, HttpHelper } from '../framework/http';
 var http = new HttpHelper();
+var token = 'Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkNBMzFBMEJDMkQ5M0I3RkVFOTBDMDkwMDI4MUVBMTlEIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE2Mzg1MTM1NzMsImV4cCI6MTY3MDA0OTU3MywiaXNzIjoiaHR0cDovLzE5Mi4xNjguMS4xNzk6MzEwMDIiLCJhdWQiOiJlcG0iLCJjbGllbnRfaWQiOiJlcG0iLCJzdWIiOiIzYTAwMjYxOS1kNGRjLTY5NGMtYjUzNi0xNzM3YzVjZjRlM2UiLCJhdXRoX3RpbWUiOjE2Mzg1MTM1NzMsImlkcCI6ImxvY2FsIiwicGhvbmVfbnVtYmVyIjoiMTgxNjQ0NjI0MDAiLCJwaG9uZV9udW1iZXJfdmVyaWZpZWQiOiJGYWxzZSIsImVtYWlsIjoieGlhbi53YW5nQHJvbmRzLmNvbS5jbiIsImVtYWlsX3ZlcmlmaWVkIjoiRmFsc2UiLCJuYW1lIjoid2FuZ3hpYW4iLCJpYXQiOjE2Mzg1MTM1NzMsInNjb3BlIjpbImFkZHJlc3MiLCJlbWFpbCIsImVwbSIsIm9wZW5pZCIsInBob25lIiwicHJvZmlsZSIsInJvbGUiLCJvZmZsaW5lX2FjY2VzcyJdLCJhbXIiOlsicHdkIl19.FI4lIbjLwCn0sF9iZ1aaJ9vXLEi8TxQiLROab_8XYdDrR4HVFIcWYHbxUWqhdQtaCKwyyhL8tJLVgi-O_EaOTj_ui5AZLH_LVSR1_lAzYIER3yfoz2vEOaR0T0HlPAVuO60nI_In4q9XyuW12_8morm1f4NukrYxVqDiRh8_biUevWXAH0WgeXmLyzKBduDrE-5dZzAx4O6dFBSqDpedIJt36ILQR5vXEBtje7IlVgVN2jRCQ-jdHfiGYoTsggoybQ1YfI5aUDv9RHMEETTgdHWtRSvlyv5QuW1yF7LiHvT1a2KKN3YhHnKtcmPkoD-WT8taVxsAn3oxGwyZ0Ru5sw';
+addInterceptor(function (httpClient) {
+  httpClient.interceptors.request.use(function (_config) {
+    if (!_config.headers) {
+      _config.headers = {};
+    }
+
+    _config.headers.Authorization = token;
+    var url = _config.url;
+    var timestamp = new Date().getTime();
+
+    var _guid = guid();
+
+    var signature = md5("".concat(url).concat(timestamp).concat(guid));
+    _config.headers.url = url;
+    _config.headers.timestamp = timestamp;
+    _config.headers.nonce = _guid;
+    _config.headers.signature = signature;
+    return _config;
+  });
+});
 
 var Api = /*#__PURE__*/function () {
   function Api() {

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

@@ -1,10 +1,12 @@
 import 'react-markdown-editor-lite/lib/index.css';
+import 'github-markdown-css';
 import './index.less';
 interface IMdEditProps {
     value: string;
     width?: number;
     height?: number;
     onChange: (txt: string) => void;
+    onImageUpload?: (file: any) => void;
 }
 declare const MdEdit: (props: IMdEditProps) => JSX.Element;
 export default MdEdit;

package/es/comps/MdEdit/index.js

@@ -1,48 +1,42 @@
 /*
  * @Author: your name
  * @Date: 2021-12-15 15:29:51
- * @LastEditTime: 2022-03-16 17:08:11
+ * @LastEditTime: 2022-08-29 18:29:30
  */
 import React from 'react';
 import MdEditor from 'react-markdown-editor-lite';
-import MarkdownIt from 'markdown-it';
-import emoji from 'markdown-it-emoji';
+import ReactMarkdown from 'react-markdown';
 import 'react-markdown-editor-lite/lib/index.css';
+import remarkGfm from 'remark-gfm';
+import 'github-markdown-css';
 import './index.less';
-var mdParser = new MarkdownIt({
-  html: true,
-  linkify: true,
-  typographer: true // highlight: (str: string = '', lang: string) => {
-  //   if (lang && hljs.getLanguage(lang)) {
-  //     try {
-  //       return hljs.highlight(lang, str).value;
-  //     } catch (__) {
-  //       // ...
-  //     }
-  //   }
-  //   return '';
-  // },
-
-}).use(emoji);
 
 var MdEdit = function MdEdit(props) {
   var value = props.value,
       width = props.width,
       height = props.height,
-      onChange = props.onChange;
+      onChange = props.onChange,
+      onImageUpload = props.onImageUpload;
 
   var onValueChange = function onValueChange(v) {
     onChange && onChange(v.text);
   };
 
+  var onMyImageUpload = function onMyImageUpload(file) {
+    onImageUpload && onImageUpload(file);
+  };
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MdEditor, {
     value: value,
+    onImageUpload: onMyImageUpload,
     style: {
       width: "".concat(width, "px"),
       height: "".concat(height, "px")
     },
     renderHTML: function renderHTML(text) {
-      return mdParser.render(text);
+      return /*#__PURE__*/React.createElement(ReactMarkdown, {
+        remarkPlugins: [remarkGfm]
+      }, text);
     },
     onChange: onValueChange
   }));

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

@@ -3,6 +3,14 @@ import _Form from "antd/es/form";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
+import "antd/es/pagination/style";
+import _Pagination from "antd/es/pagination";
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import "antd/es/divider/style";
+import _Divider from "antd/es/divider";
 import "antd/es/cascader/style";
 import _Cascader from "antd/es/cascader";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -14,7 +22,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-07-04 15:54:53
+ * @LastEditTime: 2022-08-11 18:42:06
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -22,9 +30,10 @@ import { useGetExtraInfo } from '../hooks';
 import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { deepClone } from '../../../utils';
 import { useAsyncMemo } from '../../../framework/hooks/use-async-memo';
+import { tr } from '../../../framework/locale';
 
 function Index(props) {
-  var _extraInfo$http3, _extraInfo$http4;
+  var _extraInfo$http5, _extraInfo$http6, _extraInfo$http7, _extraInfo$http8;
 
   var id = props.id,
       name = props.name,
@@ -45,6 +54,9 @@ function Index(props) {
       cascaderOption = _React$useState2[0],
       setCascaderOption = _React$useState2[1];
 
+  var pageRef = React.useRef(1);
+  var totalRef = React.useRef();
+
   var onSelect = function onSelect(value) {
     formContext.stream$ && formContext.stream$.next({
       type: 'onSelectChange',
@@ -53,8 +65,8 @@ function Index(props) {
   };
 
   var getEnumDataByUrl = React.useCallback( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(http, pid) {
-      var server, _url, res;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(http, pid, page) {
+      var server, _url, res, _res;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -62,18 +74,21 @@ function Index(props) {
             case 0:
               server = new MetadataService();
               _url = pid || pid === '' ? http.url.replace('{pid}', pid) : http.url;
-              _context.next = 4;
+              _url = page ? http.url.replace('{page}', page) : http.url;
+              _context.next = 5;
               return server.GetEnumDataByUrl(_url);
 
-            case 4:
+            case 5:
               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 = 9;
+              if (!(_res && _res.length > 0)) {
+                _context.next = 12;
                 break;
               }
 
-              return _context.abrupt("return", res.map(function (it) {
+              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'],
@@ -88,11 +103,11 @@ function Index(props) {
                 }
               }));
 
-            case 9:
+            case 12:
               console.warn("".concat(_url, " is not return success result"));
               return _context.abrupt("return", []);
 
-            case 11:
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -100,7 +115,7 @@ function Index(props) {
       }, _callee);
     }));
 
-    return function (_x, _x2) {
+    return function (_x, _x2, _x3) {
       return _ref.apply(this, arguments);
     };
   }(), []);
@@ -136,7 +151,7 @@ function Index(props) {
     return processSelectOptionsData();
   }, [initEnumValue, myEnum, id]);
   var httpOptions = useAsyncMemo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var _extraInfo$http, res;
+    var _extraInfo$http, _extraInfo$http2, res;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
@@ -148,12 +163,12 @@ function Index(props) {
             }
 
             _context2.next = 3;
-            return getEnumDataByUrl(deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http), '');
+            return getEnumDataByUrl(deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http), '', (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.isPagination) && pageRef.current);
 
           case 3:
             res = _context2.sent;
 
-            if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.isCascader) {
+            if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http2 = extraInfo.http) === null || _extraInfo$http2 === void 0 ? void 0 : _extraInfo$http2.isCascader) {
               setCascaderOption(_toConsumableArray(res));
             }
 
@@ -199,20 +214,24 @@ function Index(props) {
       }, _callee3);
     }));
 
-    return function loadData(_x3) {
+    return function loadData(_x4) {
       return _ref3.apply(this, arguments);
     };
   }();
 
-  var processSelectType = function processSelectType(b) {
-    if (b) {
+  var onSearch = function onSearch(value) {};
+
+  var onPagination = function onPagination(page, pageSize) {};
+
+  var processSelectType = function processSelectType(isCascader, isPagination) {
+    if (isCascader) {
       return /*#__PURE__*/React.createElement(_Cascader, {
         multiple: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple,
         options: cascaderOption,
         loadData: loadData,
         maxTagCount: 10
       });
-    } else {
+    } else if (isPagination) {
       var _extraInfo$disabled;
 
       return /*#__PURE__*/React.createElement(_Select, {
@@ -221,9 +240,47 @@ function Index(props) {
         disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
         placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
         options: httpOptions && httpOptions.length > 0 ? httpOptions : options,
+        dropdownRender: function dropdownRender(menu) {
+          return /*#__PURE__*/React.createElement(React.Fragment, null, menu, /*#__PURE__*/React.createElement(_Divider, {
+            style: {
+              margin: '8px 0'
+            }
+          }), /*#__PURE__*/React.createElement(_Space, {
+            style: {
+              padding: '0 8px 4px',
+              width: '100%',
+              display: 'flex'
+            }
+          }, /*#__PURE__*/React.createElement(_Input.Search, {
+            placeholder: tr('根据名称检索'),
+            onSearch: onSearch
+          }), /*#__PURE__*/React.createElement(_Pagination, {
+            simple: true,
+            defaultCurrent: pageRef.current,
+            total: totalRef.current,
+            pageSize: 30,
+            onChange: onPagination
+          })));
+        },
+        getPopupContainer: function getPopupContainer(triggerNode) {
+          return triggerNode.parentNode;
+        },
+        allowClear: true
+      });
+    } else {
+      var _extraInfo$disabled2;
+
+      return /*#__PURE__*/React.createElement(_Select, {
+        mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
+        onSelect: onSelect,
+        disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
+        placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
+        options: httpOptions && httpOptions.length > 0 ? httpOptions : options,
         showSearch: true,
         filterOption: function filterOption(input, option) {
-          return (option === null || option === void 0 ? void 0 : option.label.indexOf(input)) >= 0;
+          var _option$label;
+
+          return (option === null || option === void 0 ? void 0 : (_option$label = option.label) === null || _option$label === void 0 ? void 0 : _option$label.toString().indexOf(input)) >= 0;
         },
         getPopupContainer: function getPopupContainer(triggerNode) {
           return triggerNode.parentNode;
@@ -234,7 +291,7 @@ function Index(props) {
   };
 
   if (isObj && isRefForm && field) {
-    var _extraInfo$http2;
+    var _extraInfo$http3, _extraInfo$http4;
 
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
@@ -249,7 +306,7 @@ function Index(props) {
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-    }), processSelectType((_extraInfo$http2 = extraInfo.http) === null || _extraInfo$http2 === void 0 ? void 0 : _extraInfo$http2.isCascader));
+    }), processSelectType((_extraInfo$http3 = extraInfo.http) === null || _extraInfo$http3 === void 0 ? void 0 : _extraInfo$http3.isCascader, (_extraInfo$http4 = extraInfo.http) === null || _extraInfo$http4 === void 0 ? void 0 : _extraInfo$http4.isPagination));
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
@@ -265,7 +322,7 @@ function Index(props) {
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-  }, processSelectType((_extraInfo$http3 = extraInfo.http) === null || _extraInfo$http3 === void 0 ? void 0 : _extraInfo$http3.isCascader)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+  }, processSelectType((_extraInfo$http5 = extraInfo.http) === null || _extraInfo$http5 === void 0 ? void 0 : _extraInfo$http5.isCascader, (_extraInfo$http6 = extraInfo.http) === null || _extraInfo$http6 === void 0 ? void 0 : _extraInfo$http6.isPagination)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
     style: {
       flex: 1,
       paddingRight: '10px'
@@ -277,7 +334,7 @@ function Index(props) {
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-  }), processSelectType((_extraInfo$http4 = extraInfo.http) === null || _extraInfo$http4 === void 0 ? void 0 : _extraInfo$http4.isCascader));
+  }), processSelectType((_extraInfo$http7 = extraInfo.http) === null || _extraInfo$http7 === void 0 ? void 0 : _extraInfo$http7.isCascader, (_extraInfo$http8 = extraInfo.http) === null || _extraInfo$http8 === void 0 ? void 0 : _extraInfo$http8.isPagination));
 }
 
 export default /*#__PURE__*/React.memo(Index);

package/es/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -211,6 +211,10 @@ var TableArray = function TableArray(props) {
 
   var onTableChange = function onTableChange(values) {
     form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
+    formContext.stream$.next({
+      type: 'onValuesChange',
+      payload: _defineProperty({}, "".concat(name), _objectSpread({}, values))
+    });
   };
 
   var onButtonCellClick = function onButtonCellClick(record) {

package/es/framework/metadata/MetadataService.d.ts

@@ -16,5 +16,5 @@ export declare class MetadataService {
     /** 获取元数据的值 */
     GetMetadataObjList(data: any): Promise<any[]>;
     /** 通过扩展规则获取枚举类型的值 */
-    GetEnumDataByUrl(url: string): Promise<any[]>;
+    GetEnumDataByUrl(url: string): Promise<any>;
 }

package/es/framework/metadata/types.d.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-23 12:00:58
+ * @LastEditTime: 2022-08-11 18:26:11
  */
 export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
 
@@ -94,5 +94,5 @@ export interface IAPI {
   // 获取元数据的值
   GetMetadataObjList(data: any): Promise<any[]>;
   /** 通过扩展规则获取枚举类型的值 */
-  GetEnumDataByUrl(url: string): Promise<any[]>;
+  GetEnumDataByUrl(url: string): Promise<any>;
 }

package/es/utils.d.ts

@@ -13,3 +13,4 @@ export declare function useDebounce(fn: Function, delay: number, dep?: Dependenc
 export declare function useThrottle(fn: Function, delay: number, dep?: DependencyList): (...args: any[]) => void;
 export declare function deepClone<T = any>(target: T): T;
 export declare function guid(): string;
+export declare const md5: (data: string, digest?: string) => any;

package/es/utils.js

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-04-13 15:00:29
+ * @LastEditTime: 2022-08-11 09:42:43
  */
 import { useCallback, useEffect, useRef } from 'react';
 /** 防抖 */
@@ -102,4 +102,11 @@ export function guid() {
   }
 
   return id;
-}
+}
+
+var crypto = require('crypto');
+
+export var md5 = function md5(data) {
+  var digest = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'hex';
+  return crypto.createHash('md5').update(data).digest(digest || 'base64');
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.31",
+  "version": "1.1.34",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -37,23 +37,28 @@
     "@babel/helper-create-regexp-features-plugin": "^7.12.13",
     "@babel/runtime": "^7.11.2",
     "@popperjs/core": "^2.4.4",
+    "@types/markdown-navbar": "^1.4.0",
     "ahooks": "^3.4.0",
     "axios": "^0.21.4",
     "babel-plugin-import": "^1.13.3",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "bl": "^5.0.0",
     "codemirror": "^5.63.0",
+    "github-markdown-css": "^5.1.0",
     "highlight.js": "11.3.1",
     "immer": "^9.0.14",
     "lodash": "^4.17.21",
     "markdown-it": "^12.3.2",
     "markdown-it-emoji": "^2.0.0",
+    "markdown-navbar": "^1.4.3",
     "qs": "^6.10.1",
     "react": "^17.0.2",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
+    "react-markdown": "^8.0.3",
     "react-markdown-editor-lite": "^1.3.2",
     "react-popper": "^2.2.3",
+    "remark-gfm": "^3.0.1",
     "rxjs": "^7.5.4"
   },
   "peerDependencies": {
@@ -72,6 +77,7 @@
     "@umijs/test": "^3.0.5",
     "antd": "^4.18.1",
     "babel-loader": "^8.1.0",
+    "copy-to-clipboard": "^3.3.1",
     "css-loader": "^4.2.2",
     "dumi": "^1.0.16",
     "father-build": "^1.17.2",
@@ -81,7 +87,6 @@
     "prettier": "^2.2.1",
     "style-loader": "^1.2.1",
     "webpack-cli": "^3.3.12",
-    "copy-to-clipboard": "^3.3.1",
     "yorkie": "^2.0.0"
   }
 }