ronds-metadata 1.1.86 → 1.1.88

package/es/api/index.d.ts

@@ -15,5 +15,5 @@ export default class Api implements IAPI {
     /** 添加元数据 */
     SaveMetadata(data: any, metadataTag: string): Promise<any>;
     GetMetadataObjList(data: any): Promise<any>;
-    GetEnumDataByUrl(url: string): Promise<any>;
+    GetEnumDataByUrl(url: string, method: 'get' | 'post', body?: any): Promise<any>;
 }

package/es/api/index.js

@@ -6,7 +6,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-12-07 15:45:18
+ * @LastEditTime: 2023-02-09 19:16:42
  */
 import { guid, md5 } from '../utils';
 import { addInterceptor, HttpHelper } from '../framework/http';
@@ -200,20 +200,34 @@ var Api = /*#__PURE__*/function () {
   }, {
     key: "GetEnumDataByUrl",
     value: function () {
-      var _GetEnumDataByUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url) {
-        var res;
+      var _GetEnumDataByUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url, method, body) {
+        var res, _res;
+
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                _context5.next = 2;
+                if (!(method === 'get')) {
+                  _context5.next = 7;
+                  break;
+                }
+
+                _context5.next = 3;
                 return http.get(encodeURI(url));
 
-              case 2:
+              case 3:
                 res = _context5.sent;
                 return _context5.abrupt("return", res.successed ? res.data : []);
 
-              case 4:
+              case 7:
+                _context5.next = 9;
+                return http.post(encodeURI(url), body);
+
+              case 9:
+                _res = _context5.sent;
+                return _context5.abrupt("return", _res.successed ? _res.data : []);
+
+              case 11:
               case "end":
                 return _context5.stop();
             }
@@ -221,7 +235,7 @@ var Api = /*#__PURE__*/function () {
         }, _callee5);
       }));
 
-      function GetEnumDataByUrl(_x6) {
+      function GetEnumDataByUrl(_x6, _x7, _x8) {
         return _GetEnumDataByUrl.apply(this, arguments);
       }
 

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Date.js

@@ -1,15 +1,8 @@
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 import React from "react";
-
-/*
- * @Author: uloveits 719310130@qq.com
- * @Date: 2023-02-06 15:05:42
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-02-08 13:43:36
- */
-import { DEFAULT_DATE_FORMAT } from '../../../../../../../comps/MetadataForm/DataCell/Input';
 import { withFieldCellWrapper } from '../HOC';
+import { DEFAULT_DATE_FORMAT } from '../../../../../../../comps/MetadataForm/DataCell/Input';
 
 var Index = function Index(props) {
   var data = props.data;

package/es/comps/FormGenerator/comps/Canvas/core/index.js

@@ -39,6 +39,11 @@ var CanvasCore = function CanvasCore(props) {
       formSetting = _React$useState6[0],
       setFormSetting = _React$useState6[1];
 
+  var _React$useState7 = React.useState(),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      allSetting = _React$useState8[0],
+      setAllSetting = _React$useState8[1];
+
   React.useEffect(function () {
     onChange && onChange(listRef.current);
   }, [list]);
@@ -60,7 +65,7 @@ var CanvasCore = function CanvasCore(props) {
     listRef.current = _list;
   }, []);
   var processFgStreamData = React.useCallback(function (p) {
-    var _p$payload;
+    var _p$payload, _p$payload3;
 
     switch (p === null || p === void 0 ? void 0 : p.type) {
       case streamEventType.onClearCanvas:
@@ -97,6 +102,7 @@ var CanvasCore = function CanvasCore(props) {
           setFormSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.formSetting));
         }
 
+        setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.allSetting));
         break;
     }
   }, []);
@@ -121,6 +127,16 @@ var CanvasCore = function CanvasCore(props) {
     });
   };
 
+  var processColSpan = function processColSpan(compColSpan, formColSpan) {
+    var _formColSpan = formColSpan !== null && formColSpan !== void 0 ? formColSpan : 24;
+
+    if (compColSpan) {
+      return compColSpan * _formColSpan <= 24 ? compColSpan * _formColSpan : 24;
+    }
+
+    return _formColSpan;
+  };
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "canvas-wrapper",
     ref: dropRef,
@@ -147,10 +163,10 @@ var CanvasCore = function CanvasCore(props) {
   }, /*#__PURE__*/React.createElement(_Row, {
     gutter: 8
   }, list.map(function (it) {
-    var _formSetting$colSpan;
+    var _allSetting$it$id;
 
     return /*#__PURE__*/React.createElement(_Col, {
-      span: (_formSetting$colSpan = formSetting === null || formSetting === void 0 ? void 0 : formSetting.colSpan) !== null && _formSetting$colSpan !== void 0 ? _formSetting$colSpan : 24,
+      span: processColSpan(allSetting && ((_allSetting$it$id = allSetting[it.id]) === null || _allSetting$it$id === void 0 ? void 0 : _allSetting$it$id.colSpan), formSetting === null || formSetting === void 0 ? void 0 : formSetting.colSpan),
       style: {
         width: '100%'
       }

package/es/comps/FormGenerator/comps/Canvas/core/index.less

@@ -1,24 +1,24 @@
-.canvas-wrapper {
-  .drag-item {
-    position: relative;
-    border: 1px dashed var(--ronds-metadata-color-border-1);
-    background: var(--ronds-metadata-color-bg-4);
-    padding: 4px 10px;
-    margin-bottom: 8px;
-  }
-
-  .drag-item-selected {
-    border: 3px dashed var(--ronds-metadata-color-border-2);
-  }
-
-  .ant-form-item {
-    margin-bottom: '4px' !important;
-  }
-  .ant-form-item-label {
-    padding: 0%;
-  }
-  .ant-input-number,
-  .ant-picker {
-    width: 100%;
-  }
-}
+.canvas-wrapper {
+  .drag-item {
+    position: relative;
+    border: 1px dashed var(--ronds-metadata-color-border-1);
+    background: var(--ronds-metadata-color-bg-4);
+    padding: 4px 10px;
+    margin-bottom: 8px;
+  }
+
+  .drag-item-selected {
+    border: 3px dashed var(--ronds-metadata-color-border-2);
+  }
+
+  .ant-form-item {
+    margin-bottom: '4px' !important;
+  }
+  .ant-form-item-label {
+    padding: 0%;
+  }
+  .ant-input-number,
+  .ant-picker {
+    width: 100%;
+  }
+}

package/es/comps/FormGenerator/comps/Canvas/index.js

@@ -4,13 +4,6 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-
-/*
- * @Author: wangxian
- * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-02-08 15:54:27
- */
-import useObservable from '@/framework/rxjs-hooks/useObservable';
 import React from 'react';
 import copy from 'copy-to-clipboard';
 import { FGCtx } from '../../Provider';
@@ -18,6 +11,7 @@ import { streamEventType } from '../../settings';
 import { transFG2Schema } from '../../transformer';
 import CanvasCore from './core';
 import MetadataForm from '../../../../comps/MetadataForm';
+import useObservable from '../../../../framework/rxjs-hooks/useObservable';
 
 var Canvas = function Canvas() {
   var nodesRef = React.useRef([]);

package/es/comps/FormGenerator/index.js

@@ -3,9 +3,8 @@ import React from "react";
 /*
  * @Author: wangxian
  * @Date: 2023-02-04 13:45:31
- * @LastEditTime: 2023-02-08 14:58:33
+ * @LastEditTime: 2023-02-09 14:50:24
  */
-import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import Canvas from './comps/Canvas';
@@ -13,6 +12,7 @@ import Settings from './comps/Settings';
 import Sidebar from './comps/Sidebar';
 import './index.less';
 import { FGCtx } from './Provider';
+import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
 
 var FormGenerator = function FormGenerator(props) {
   var FGStream = useMemoSubject();

package/es/comps/FormGenerator/index.less

@@ -1,21 +1,21 @@
-.form-generator-container {
-  display: flex;
-  width: 100%;
-  height: 100%;
-
-  .ant-tabs {
-    height: 100%;
-    .ant-tabs-nav {
-      margin: 0px 0 8px 0;
-    }
-    .ant-tabs-content-holder {
-      height: calc(100% - 50px);
-      .ant-tabs-content {
-        height: 100%;
-        padding: 8px;
-        overflow-y: auto;
-        overflow-x: hidden;
-      }
-    }
-  }
-}
+.form-generator-container {
+  display: flex;
+  width: 100%;
+  height: 100%;
+
+  .ant-tabs {
+    height: 100%;
+    .ant-tabs-nav {
+      margin: 0px 0 8px 0;
+    }
+    .ant-tabs-content-holder {
+      height: calc(100% - 50px);
+      .ant-tabs-content {
+        height: 100%;
+        padding: 8px;
+        overflow-y: auto;
+        overflow-x: hidden;
+      }
+    }
+  }
+}