ronds-metadata 1.2.18 → 1.2.20

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

@@ -2,13 +2,15 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataIndex", "mode", "disabled"];
 
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-10-10 13:47:12
+ * @LastEditTime: 2023-03-07 16:05:56
  */
 import React from 'react';
 import { EditableContext } from '../interface';
@@ -22,6 +24,18 @@ function Index(props) {
   var _ref = React.useContext(EditableContext) || undefined,
       editConfig = _ref.editConfig;
 
+  var _React$useState = React.useState([]),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      options = _React$useState2[0],
+      setOptions = _React$useState2[1];
+
+  React.useEffect(function () {
+    if (restProps.enum) {
+      Promise.resolve(restProps.enum).then(function (value) {
+        setOptions(_toConsumableArray(value));
+      });
+    }
+  }, [restProps === null || restProps === void 0 ? void 0 : restProps.enum]);
   return /*#__PURE__*/React.createElement(_Form.Item, {
     name: dataIndex,
     style: {
@@ -41,7 +55,7 @@ function Index(props) {
       width: '100%'
     },
     size: "small",
-    options: restProps.enum
+    options: options
   }));
 }
 

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

@@ -84,7 +84,10 @@ function Index(props) {
       background: '#fff'
     }
   }, help || (items === null || items === void 0 ? void 0 : items.type)))), /*#__PURE__*/React.createElement(_Col, {
-    flex: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat((24 - labelSpan) * 100 / 24, "%") : 1
+    flex: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat((24 - labelSpan) * 100 / 24, "%") : 1,
+    style: {
+      width: "".concat((24 - labelSpan) * 100 / 24, "%")
+    }
   }, extraInfo.layout === 'table' && items.type === 'ref' ? /*#__PURE__*/React.createElement(TableArray, {
     initValue: formContext.initialValues,
     initEnumValue: initEnumValue,

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

@@ -34,7 +34,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-03-07 08:29:13
+ * @LastEditTime: 2023-03-07 15:10:14
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -452,8 +452,8 @@ function Index(props) {
         treeData: treeData,
         allowClear: true,
         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,
-        treeDefaultExpandAll: true,
+        placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder // treeDefaultExpandAll
+        ,
         maxTagCount: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagCount,
         maxTagTextLength: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagTextLength,
         maxTagPlaceholder: "..."

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

@@ -204,8 +204,54 @@ var TableArray = function TableArray(props) {
       firstLoadRef.current = false;
     }
   }, [initValue, form]);
+  var getEnumDataByUrl = React.useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(http) {
+      var server, _url, res, _res;
+
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              server = new MetadataService();
+              _url = http.url;
+              _context2.next = 4;
+              return server.GetEnumDataByUrl(_url, http.method, (http === null || http === void 0 ? void 0 : http.body) && JSON.parse(http === null || http === void 0 ? void 0 : http.body));
+
+            case 4:
+              res = _context2.sent;
+              _res = (res === null || res === void 0 ? void 0 : res.total) ? res === null || res === void 0 ? void 0 : res.list : res;
+
+              if (!(_res && _res.length > 0)) {
+                _context2.next = 10;
+                break;
+              }
+
+              return _context2.abrupt("return", _res.map(function (it) {
+                return {
+                  value: it[(http === null || http === void 0 ? void 0 : http.key) || 'id'],
+                  label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name'],
+                  disabled: false
+                };
+              }));
+
+            case 10:
+              console.warn("".concat(_url, " is not return success result"));
+              return _context2.abrupt("return", []);
+
+            case 12:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function (_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), []);
   var processEnumData = React.useCallback(function (data, _extraInfo) {
-    var _extraInfo$enum;
+    var _extraInfo$enum, _extraInfo$enum3;
 
     var _options = [];
 
@@ -216,6 +262,13 @@ var TableArray = function TableArray(props) {
       var _extraInfo$enum2;
 
       _enum = deepClone(_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum2 = _extraInfo.enum) === null || _extraInfo$enum2 === void 0 ? void 0 : _extraInfo$enum2.value);
+    } // 从接口拿数据
+
+
+    if (_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum3 = _extraInfo.enum) === null || _extraInfo$enum3 === void 0 ? void 0 : _extraInfo$enum3.http) {
+      var _extraInfo$enum4;
+
+      return getEnumDataByUrl(deepClone(_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum4 = _extraInfo.enum) === null || _extraInfo$enum4 === void 0 ? void 0 : _extraInfo$enum4.http));
     } // 目前是更具那么的id判断的，暂未考虑重名问题
 
 
@@ -249,7 +302,7 @@ var TableArray = function TableArray(props) {
     var _columns = [];
 
     for (var i = 0; i < _properties.length; i++) {
-      var _extraInfo$common;
+      var _extraInfo$common, _extraInfo$enum5;
 
       var it = _properties[i];
       var extraInfo = refFieldsRef.current.get(it.id);
@@ -260,7 +313,8 @@ var TableArray = function TableArray(props) {
         width: processColumnType(it, extraInfo) === 'buttonCell' ? 25 : 50,
         editable: !(extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$common = extraInfo.common) === null || _extraInfo$common === void 0 ? void 0 : _extraInfo$common.disabled),
         type: processColumnType(it, extraInfo),
-        enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined
+        enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined,
+        mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$enum5 = extraInfo.enum) === null || _extraInfo$enum5 === void 0 ? void 0 : _extraInfo$enum5.isMutiple) ? 'multiple' : undefined
       };
 
       _columns.push(obj);

package/es/comps/MetadataForm/HOC/index.less

@@ -27,6 +27,12 @@
     background-color: var(--card-bg);
     z-index: 1000;
   }
+  .ant-select-tree-indent {
+    .ant-select-tree-indent-unit {
+      width: 10px !important;
+    }
+  }
+
   /*   .ant-col-2.7 {
     display: block;
     flex: 0 0 75%;

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

@@ -38,8 +38,17 @@ interface IMetadataFormProps {
      * 一行占多少个表单
      */
     colSpan?: number;
+    /**
+     * label占比
+     */
     labelSpan?: number;
+    /**
+     * label是否换行
+     */
     labelWrap?: boolean;
+    /**
+     * label的布局
+     */
     layout?: 'vertical' | 'horizontal';
     /**
      * 获取表单的实例

package/es/comps/MetadataForm/index.js

@@ -70,7 +70,7 @@ var MetadataForm = function MetadataForm(props) {
   var firstLoadValue = React.useRef(true);
   var stream$ = useMemoSubject();
   var processStreamEvent = React.useCallback(function (p) {
-    var _p$payload, _p$payload2;
+    var _p$payload;
 
     switch (p === null || p === void 0 ? void 0 : p.type) {
       case STREAM_EVENT_TYPE.ON_SELECT_CHANGE:
@@ -82,7 +82,12 @@ var MetadataForm = function MetadataForm(props) {
         break;
 
       case STREAM_EVENT_TYPE.ON_VALUES_CHANGE:
-        onValuesChange && onValuesChange(p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.val, p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.allVals);
+        if (!(p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.trigger)) {
+          var _p$payload2, _p$payload3;
+
+          onValuesChange && onValuesChange(p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.val, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.allVals);
+        }
+
         break;
     }
   }, []);

package/package.json

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