ronds-metadata 1.2.1 → 1.2.2

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

@@ -17,7 +17,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-21 19:15:22
+ * @LastEditTime: 2023-02-22 15:51:51
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -32,6 +32,7 @@ function Index(props) {
       isRefForm = props.isRefForm,
       disabled = props.disabled,
       field = props.field,
+      labelSpan = props.labelSpan,
       name = props.name,
       isObj = props.isObj;
   var formContext = React.useContext(MetadataFormContext) || {};
@@ -156,6 +157,14 @@ function Index(props) {
         color: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.color
       } : {}
     }, (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id),
+    labelCol: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? {
+      span: labelSpan,
+      offset: 0
+    } : undefined,
+    wrapperCol: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? {
+      span: 24 - labelSpan,
+      offset: 0
+    } : undefined,
     name: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$addonAfter6 = extraInfo.addonAfter) === null || _extraInfo$addonAfter6 === void 0 ? void 0 : _extraInfo$addonAfter6.key) ? [].concat(_toConsumableArray(name), ['value']) : name,
     rules: [{
       required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require

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

@@ -34,6 +34,21 @@ export function withAddOnAfter(WrappedComponent) {
         cellColSpan = _React$useState4[0],
         setCellColSpan = _React$useState4[1];
 
+    var labelSpan = React.useMemo(function () {
+      var _fields$0$value, _fields$0$value$commo;
+
+      var _labelSpan = undefined;
+
+      var _colSpan = fields && ((_fields$0$value = fields[0].value) === null || _fields$0$value === void 0 ? void 0 : (_fields$0$value$commo = _fields$0$value.common) === null || _fields$0$value$commo === void 0 ? void 0 : _fields$0$value$commo.colSpan);
+
+      var _formLabelSpan = formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan;
+
+      if (_colSpan && _formLabelSpan) {
+        _labelSpan = _formLabelSpan / _colSpan;
+      }
+
+      return _labelSpan;
+    }, [fields, formContext === null || formContext === void 0 ? void 0 : formContext.colSpan, formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan]);
     React.useEffect(function () {
       if (refId) {
         var arr = refId.split(':');
@@ -87,6 +102,7 @@ export function withAddOnAfter(WrappedComponent) {
         display: 'flex !important'
       },
       name: _name,
+      labelSpan: labelSpan,
       isObj: isObj
     })), isShowTypeInfo && !field && type !== 'number' && type !== 'bool' && /*#__PURE__*/React.createElement("div", {
       className: "with-add-on-after-extra"

package/es/comps/MetadataForm/index.js

@@ -236,7 +236,7 @@ var MetadataForm = function MetadataForm(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MetadataFormContext.Provider, {
     value: {
       fields: fields,
-      colSpan: colSpan,
+      colSpan: (formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.colSpan) || colSpan,
       labelSpan: myLabelSpan,
       layout: myLayout,
       form: form,

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

@@ -40,7 +40,8 @@ export interface IMetaFormProps {
     name?: string[];
     isObj?: boolean;
     refId?: string;
-    colSpan: number;
+    colSpan?: number;
+    labelSpan?: number;
     enum?: {
         value: string;
     }[];

package/es/comps/MetadataForm/interface.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-03 16:08:47
+ * @LastEditTime: 2023-02-22 15:51:59
  */
 import React from 'react';
 export var MetadataFormContext = /*#__PURE__*/React.createContext(null);

package/package.json

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