ronds-metadata 1.2.1 → 1.2.3

package/es/comps/JsonView/index.less

@@ -1,41 +1,41 @@
-pre {
-  margin: 0;
-  font-weight: 900;
-  font-size: 14px;
-}
-.string {
-  color: #3ab54a;
-}
-.number {
-  color: #25aae2;
-}
-.boolean {
-  color: #f98280;
-}
-.null {
-  color: #f1592a;
-}
-.width-10 {
-  width: 10px;
-}
-.key {
-  color: #92278f;
-}
-.open {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  background: url('./icon/close.png') no-repeat;
-  background-size: 100% 100%;
-  vertical-align: middle;
-  cursor: pointer;
-}
-.close {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  background: url('./icon/open.png') no-repeat;
-  background-size: 100% 100%;
-  vertical-align: middle;
-  cursor: pointer;
-}
+pre {
+  margin: 0;
+  font-weight: 900;
+  font-size: 14px;
+}
+.string {
+  color: #3ab54a;
+}
+.number {
+  color: #25aae2;
+}
+.boolean {
+  color: #f98280;
+}
+.null {
+  color: #f1592a;
+}
+.width-10 {
+  width: 10px;
+}
+.key {
+  color: #92278f;
+}
+.open {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  background: url('./icon/close.png') no-repeat;
+  background-size: 100% 100%;
+  vertical-align: middle;
+  cursor: pointer;
+}
+.close {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  background: url('./icon/open.png') no-repeat;
+  background-size: 100% 100%;
+  vertical-align: middle;
+  cursor: pointer;
+}

package/es/comps/MetadataEdit/index.less

@@ -1,10 +1,10 @@
-.metadata-edit {
-  height: 100%;
-  width: 100%;
-  .ant-row {
-    display: block;
-  }
-  .pr-10 {
-    padding-right: 10px;
-  }
-}
+.metadata-edit {
+  height: 100%;
+  width: 100%;
+  .ant-row {
+    display: block;
+  }
+  .pr-10 {
+    padding-right: 10px;
+  }
+}

package/es/comps/MetadataEdit/type.d.ts

@@ -1,20 +1,20 @@
-export interface IMetaFileds {
-  id: string;
-  type: 'object';
-  properties: any[];
-  value: any;
-}
-
-export type ITypeStatus = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array';
-
-export type IMetaProperty = {
-  /**
-   * 属性的名称
-   */
-  id: string;
-  /**
-   * 类型
-   */
-  type: string;
-  enum?: any[];
-};
+export interface IMetaFileds {
+  id: string;
+  type: 'object';
+  properties: any[];
+  value: any;
+}
+
+export type ITypeStatus = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array';
+
+export type IMetaProperty = {
+  /**
+   * 属性的名称
+   */
+  id: string;
+  /**
+   * 类型
+   */
+  type: string;
+  enum?: any[];
+};

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

@@ -12,7 +12,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-22 13:54:18
+ * @LastEditTime: 2023-02-22 16:38:00
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
@@ -30,6 +30,7 @@ function Index(props) {
       isRefForm = props.isRefForm,
       fieldRule = props.fields,
       colSpan = props.colSpan,
+      labelSpan = props.labelSpan,
       initEnumValue = props.initEnumValue,
       name = props.name,
       disabled = props.disabled;
@@ -72,15 +73,15 @@ function Index(props) {
     }
   }, [items]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, null, /*#__PURE__*/React.createElement(_Col, {
-    span: (formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan) && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan : 24
+    span: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? labelSpan : 24
   }, !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.titleHidden) && /*#__PURE__*/React.createElement("div", {
     style: {
       position: 'relative',
       width: '100%',
-      textAlign: "".concat((formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan) && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? 'right' : 'left')
+      textAlign: "".concat(labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? 'right' : 'left')
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: "ant-form-item-label mt-1 "
+    className: "ant-form-item-label ant-form-item-label-wrap mt-1 "
   }, /*#__PURE__*/React.createElement("label", {
     className: "".concat((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require) && 'ant-form-item-required')
   }, extraInfo.label || fieldRule && ((_fieldRule$ = fieldRule[0]) === null || _fieldRule$ === void 0 ? void 0 : (_fieldRule$$value = _fieldRule$.value) === null || _fieldRule$$value === void 0 ? void 0 : _fieldRule$$value.label) || fieldRule && ((_fieldRule$2 = fieldRule[0]) === null || _fieldRule$2 === void 0 ? void 0 : (_fieldRule$2$value = _fieldRule$2.value) === null || _fieldRule$2$value === void 0 ? void 0 : _fieldRule$2$value.common.label) || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
@@ -92,7 +93,7 @@ function Index(props) {
       background: '#fff'
     }
   }, help || (items === null || items === void 0 ? void 0 : items.type)))), /*#__PURE__*/React.createElement(_Col, {
-    span: (formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan) && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? 24 - (formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan) : 24
+    span: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? 24 - labelSpan : 24
   }, extraInfo.layout === 'table' && items.type === 'ref' ? /*#__PURE__*/React.createElement(TableArray, {
     initValue: formContext.initialValues,
     initEnumValue: initEnumValue,

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/DataCell/Select.js

@@ -31,7 +31,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-21 19:19:39
+ * @LastEditTime: 2023-02-23 09:58:36
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -88,73 +88,77 @@ function Index(props) {
     var _watch = extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.watch;
 
     if (_watch && (p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
-      var _watchArr = _watch.split(',');
+      try {
+        var _watchArr = _watch.split(',');
 
-      if (_watchArr.length === 1) {
-        var evalString = '';
+        if (_watchArr.length === 1) {
+          var evalString = '';
 
-        for (var i = 0; i < name.length; i++) {
-          if (i < name.length - 1) {
-            evalString = "".concat(evalString, "[name[").concat(i, "]]");
+          for (var i = 0; i < name.length; i++) {
+            if (i < name.length - 1) {
+              evalString = "".concat(evalString, "[name[").concat(i, "]]");
+            }
           }
-        }
 
-        var _value = eval("p?.payload?.allVals".concat(evalString, "[_watchArr[0]]"));
+          var _value = eval("p?.payload?.allVals".concat(evalString, "[_watchArr[0]]"));
 
-        var _changeData = eval("p?.payload?.val".concat(evalString, "[_watchArr[0]]"));
+          var _changeData = eval("p?.payload?.val".concat(evalString, "[_watchArr[0]]"));
 
-        if (_value && _changeData) {
-          if ((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http.method) === 'post') {
-            var _wRef = watchValueRef.current || {};
+          if (_value && _changeData) {
+            if ((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http.method) === 'post') {
+              var _wRef = watchValueRef.current || {};
 
-            _wRef[_watchArr[0]] = _value;
-            watchValueRef.current = _wRef;
-            setWatchValue(_value);
-          } else {
-            setWatchValue(_value.toString());
-            watchValueRef.current = _value;
+              _wRef[_watchArr[0]] = _value;
+              watchValueRef.current = _wRef;
+              setWatchValue(_value);
+            } else {
+              setWatchValue(_value.toString());
+              watchValueRef.current = _value;
+            }
           }
-        }
 
-        if (_changeData) {
-          setTimeout(function () {
-            var v = {};
-            assign(name, undefined, v);
-            formContext.form.setFieldsValue(_objectSpread({}, v));
-          }, 100);
-        }
-      } else {
-        var b = false;
+          if (_changeData) {
+            setTimeout(function () {
+              var v = {};
+              assign(name, undefined, v);
+              formContext.form.setFieldsValue(_objectSpread({}, v));
+            }, 100);
+          }
+        } else {
+          var b = false;
 
-        for (var _i = 0; _i < _watchArr.length; _i++) {
-          var w = _watchArr[_i];
-          var _evalString = '';
+          for (var _i = 0; _i < _watchArr.length; _i++) {
+            var w = _watchArr[_i];
+            var _evalString = '';
 
-          for (var _i2 = 0; _i2 < name.length; _i2++) {
-            if (_i2 < name.length - 1) {
-              _evalString = "".concat(_evalString, "[name[").concat(_i2, "]]");
+            for (var _i2 = 0; _i2 < name.length; _i2++) {
+              if (_i2 < name.length - 1) {
+                _evalString = "".concat(_evalString, "[name[").concat(_i2, "]]");
+              }
             }
-          }
 
-          var _value2 = eval("p?.payload?.allVals".concat(_evalString, "[w]"));
+            var _value2 = eval("p?.payload?.allVals".concat(_evalString, "[w]"));
 
-          if (_value2) {
-            var _wRef2 = watchValueRef.current || {};
+            if (_value2) {
+              var _wRef2 = watchValueRef.current || {};
 
-            _wRef2[w] = _value2;
-            watchValueRef.current = _wRef2;
-            b = eval("p?.payload?.val".concat(_evalString, "[w]"));
+              _wRef2[w] = _value2;
+              watchValueRef.current = _wRef2;
+              b = eval("p?.payload?.val".concat(_evalString, "[w]"));
+            }
           }
-        }
 
-        if (b) {
-          setWatchValue(_objectSpread({}, watchValueRef.current));
-          setTimeout(function () {
-            var v = {};
-            assign(name, undefined, v);
-            formContext.form.setFieldsValue(_objectSpread({}, v));
-          }, 100);
+          if (b) {
+            setWatchValue(_objectSpread({}, watchValueRef.current));
+            setTimeout(function () {
+              var v = {};
+              assign(name, undefined, v);
+              formContext.form.setFieldsValue(_objectSpread({}, v));
+            }, 100);
+          }
         }
+      } catch (error) {
+        console.warn('watch:' + error);
       }
     }
   }, [formContext.stream$, extraInfo]);

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

@@ -1,5 +1,3 @@
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -325,11 +323,6 @@ var TableArray = function TableArray(props) {
       width: '100%',
       height: addButtonHidden || readonly ? "".concat(rowNumber * getCellHeight(readonly) + 45, "px") : "".concat(rowNumber * getCellHeight(readonly) + 45 + 40, "px")
     }
-  }, /*#__PURE__*/React.createElement(_Form.Item, {
-    name: name,
-    style: {
-      margin: 0
-    }
   }, /*#__PURE__*/React.createElement(Editable, {
     type: "multiple",
     readonly: readonly,
@@ -350,7 +343,7 @@ var TableArray = function TableArray(props) {
         y: addButtonHidden || readonly ? "".concat(rowNumber * getCellHeight(readonly) + 45, "px ") : "".concat(rowNumber * getCellHeight(readonly), "px ")
       }
     }
-  })));
+  }));
 };
 
 export default TableArray;

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 = formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan;
+
+      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/es/framework/libs/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "fa"; /* Project id 2247093 */
-  src: url('iconfont.woff2?t=1667906194044') format('woff2'),
-       url('iconfont.woff?t=1667906194044') format('woff'),
-       url('iconfont.ttf?t=1667906194044') format('truetype');
+  src: url('iconfont.woff2?t=1677113748870') format('woff2'),
+       url('iconfont.woff?t=1677113748870') format('woff'),
+       url('iconfont.ttf?t=1677113748870') format('truetype');
 }
 
 .fa {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.fa-Es:before {
+  content: "\e6a1";
+}
+
 .fa-transform:before {
   content: "\ed70";
 }