ronds-metadata 1.2.57 → 1.2.58

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

@@ -6,8 +6,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: uloveits 719310130@qq.com
  * @Date: 2023-02-04 16:35:15
- * @LastEditors: uloveits 719310130@qq.com
- * @LastEditTime: 2023-04-04 19:34:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-05-30 15:19:23
  */
 import React from 'react';
 import { FGCtx } from '../../Provider';
@@ -115,8 +115,7 @@ var Settings = function Settings() {
     getFormInstance: function getFormInstance(form) {
       compFormRef.current = form;
     },
-    colSpan: 24,
-    labelSpan: 8,
+    layout: "vertical",
     onValuesChange: function onValuesChange(val, allVals) {
       _onValuesChange(curNode.id, val, allVals);
     }
@@ -129,7 +128,6 @@ var Settings = function Settings() {
     getFormInstance: function getFormInstance(form) {
       formRef.current = form;
     },
-    colSpan: 24,
     layout: "vertical",
     onValuesChange: function onValuesChange(val, allVals) {
       _onValuesChange(formSetting.id, val, allVals);

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

@@ -16,13 +16,14 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-05-16 11:13:07
+ * @LastEditTime: 2023-05-30 14:21:59
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
 import useObservable from '../../../framework/rxjs-hooks/useObservable';
+import NumberRange from './plugin/NumberRange';
 var TextArea = _Input.TextArea;
 function Index(props) {
   var _extraInfo$addonAfter7;
@@ -117,6 +118,8 @@ function Index(props) {
           disabled: (_extraInfo$disabled5 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled5 !== void 0 ? _extraInfo$disabled5 : disabled,
           icon: /*#__PURE__*/React.createElement(UploadOutlined, null)
         }, "\u4E0A\u4F20"));
+      case 'numberRange':
+        return /*#__PURE__*/React.createElement(NumberRange, extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.numberRange);
       default:
         return /*#__PURE__*/React.createElement(_Input, {
           addonAfter: ((_extraInfo$addonAfter2 = extraInfo.addonAfter) === null || _extraInfo$addonAfter2 === void 0 ? void 0 : _extraInfo$addonAfter2.key) ? /*#__PURE__*/React.createElement(_Form.Item, {

package/es/comps/MetadataForm/DataCell/plugin/NumberRange.d.ts

@@ -0,0 +1,13 @@
+interface INumberRangeProps {
+    startKey?: string;
+    endKey?: string;
+    addonBefore?: {
+        key: string;
+        defaultValue: string;
+        value: string[];
+    };
+    value?: any;
+    onChange?: (value: any) => void;
+}
+declare const NumberRange: (props: INumberRangeProps) => JSX.Element;
+export default NumberRange;

package/es/comps/MetadataForm/DataCell/plugin/NumberRange.js

@@ -0,0 +1,112 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import "antd/es/input-number/style";
+import _InputNumber from "antd/es/input-number";
+import "antd/es/select/style";
+import _Select from "antd/es/select";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+/*
+ * @Author: wangxian
+ * @Date: 2023-05-30 13:36:05
+ * @LastEditTime: 2023-05-30 15:04:46
+ */
+import React from 'react';
+var NumberRange = function NumberRange(props) {
+  var startKey = props.startKey,
+    value = props.value,
+    endKey = props.endKey,
+    addonBefore = props.addonBefore,
+    onChange = props.onChange;
+  var _React$useState = React.useState(),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    min = _React$useState2[0],
+    setMin = _React$useState2[1];
+  var _React$useState3 = React.useState(),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    max = _React$useState4[0],
+    setMax = _React$useState4[1];
+  var _React$useState5 = React.useState(),
+    _React$useState6 = _slicedToArray(_React$useState5, 2),
+    before = _React$useState6[0],
+    setBefore = _React$useState6[1];
+  React.useEffect(function () {
+    if (addonBefore.defaultValue) {
+      setBefore(addonBefore.defaultValue);
+    }
+  }, [addonBefore]);
+  React.useEffect(function () {
+    if (value) {
+      if (value[startKey || 'min']) {
+        setMin(value[startKey || 'min']);
+      }
+      if (value[endKey || 'max']) {
+        setMax(value[endKey || 'max']);
+      }
+      if (addonBefore.key && value[addonBefore.key]) {
+        setBefore(value[addonBefore.key]);
+      }
+    }
+  }, [value]);
+  var triggerChange = function triggerChange(changedValue) {
+    var _objectSpread2;
+    onChange && onChange(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, addonBefore.key, before), _defineProperty(_objectSpread2, startKey || 'min', min), _defineProperty(_objectSpread2, endKey || 'max', max), _objectSpread2), changedValue));
+  };
+  var onStartChange = function onStartChange(v) {
+    setMin(v);
+    triggerChange(_defineProperty({}, startKey || 'min', v));
+  };
+  var onEndChange = function onEndChange(v) {
+    setMax(v);
+    triggerChange(_defineProperty({}, endKey || 'max', v));
+  };
+  var onBeforeChange = function onBeforeChange(v) {
+    setBefore(v);
+    triggerChange(_defineProperty({}, addonBefore.key, v));
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input.Group, {
+    compact: true
+  }, addonBefore && /*#__PURE__*/React.createElement(_Select, {
+    style: {
+      width: '60px'
+    },
+    defaultValue: addonBefore.defaultValue,
+    value: before,
+    options: addonBefore.value.map(function (it) {
+      return {
+        label: it,
+        value: it
+      };
+    }),
+    onChange: onBeforeChange
+  }), /*#__PURE__*/React.createElement(_InputNumber, {
+    value: min,
+    style: {
+      width: addonBefore ? 'calc(50% - 44px)' : 'calc(50% - 14px)',
+      textAlign: 'center'
+    },
+    onChange: onStartChange
+  }), /*#__PURE__*/React.createElement(_Input, {
+    className: "site-input-split",
+    style: {
+      width: 30,
+      borderLeft: 0,
+      borderRight: 0,
+      pointerEvents: 'none'
+    },
+    placeholder: "~",
+    disabled: true
+  }), /*#__PURE__*/React.createElement(_InputNumber, {
+    value: max,
+    className: "site-input-right",
+    style: {
+      width: addonBefore ? 'calc(50% - 44px)' : 'calc(50% - 14px)',
+      textAlign: 'center'
+    }
+    //   placeholder="Max"
+    ,
+    onChange: onEndChange
+  })));
+};
+export default NumberRange;

package/es/comps/MetadataForm/index.less

@@ -4,7 +4,7 @@
   // }
   .ant-form-item {
     margin: 0 !important;
-    flex-wrap: nowrap !important;
+    // flex-wrap: nowrap !important;
   }
   .ant-form-item-label > label .ant-form-item-tooltip {
     margin-left: 5px;

package/package.json

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