ronds-metadata 1.2.58 → 1.2.60

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/NumberRange.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (props: any) => JSX.Element;
+export default _default;

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

@@ -0,0 +1,42 @@
+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 React from "react";
+/*
+ * @Author: uloveits 719310130@qq.com
+ * @Date: 2023-02-06 15:05:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-06-02 11:34:36
+ */
+import { withFieldCellWrapper } from '../HOC';
+var Index = function Index(props) {
+  var data = props.data,
+    fgStream = props.fgStream,
+    setting = props.setting;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input.Group, {
+    compact: true
+  }, /*#__PURE__*/React.createElement(_InputNumber, {
+    disabled: setting === null || setting === void 0 ? void 0 : setting.disabled,
+    style: {
+      width: (setting === null || setting === void 0 ? void 0 : setting.addonBefore) ? 'calc(50% - 44px)' : 'calc(50% - 14px)',
+      textAlign: 'center'
+    }
+  }), /*#__PURE__*/React.createElement(_Input, {
+    style: {
+      width: 30,
+      borderLeft: 0,
+      borderRight: 0,
+      pointerEvents: 'none'
+    },
+    placeholder: "~",
+    disabled: true
+  }), /*#__PURE__*/React.createElement(_InputNumber, {
+    disabled: setting === null || setting === void 0 ? void 0 : setting.disabled,
+    style: {
+      width: (setting === null || setting === void 0 ? void 0 : setting.addonBefore) ? 'calc(50% - 44px)' : 'calc(50% - 14px)',
+      textAlign: 'center'
+    }
+  })));
+};
+export default withFieldCellWrapper(Index);

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

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 11:35:45
- * @LastEditTime: 2023-02-27 10:13:49
+ * @LastEditTime: 2023-06-02 11:21:16
  */
 import React from 'react';
 import Input from './Cell/Input';
@@ -16,6 +16,7 @@ import Checkbox from './Cell/Checkbox';
 import Radio from './Cell/Radio';
 import Password from './Cell/Password';
 import Upload from './Cell/Upload';
+import NumberRange from './Cell/NumberRange';
 import Obj from './Cell/Obj';
 import List from './Cell/List';
 import Table from './Cell/Table';
@@ -52,6 +53,7 @@ var DataCellMap = {
   radio: Radio,
   password: Password,
   upload: Upload,
+  numberRange: NumberRange,
   obj: Obj,
   list: List,
   table: Table

package/es/comps/FormGenerator/settings/index.d.ts

@@ -687,6 +687,56 @@ export declare const settingSchema: {
             }[];
         }[];
     }[];
+    rangeNumber: {
+        id: string;
+        type: string;
+        properties: ({
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    label: string;
+                };
+            }[];
+        } | {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    common: {
+                        label: string;
+                    };
+                    'common-en-US': {};
+                };
+            }[];
+        })[];
+        types: {
+            id: string;
+            type: string;
+            properties: {
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        text: {};
+                        common: {
+                            label: string;
+                        };
+                        'common-en-US': {};
+                    };
+                }[];
+            }[];
+        }[];
+    }[];
     switch: {
         id: string;
         type: string;
@@ -1715,6 +1765,62 @@ export declare const radioParam: {
         type: string;
     };
 };
+export declare const numberRangeParam: {
+    type: string;
+    schema: {
+        id: string;
+        type: string;
+        properties: ({
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    label: string;
+                };
+            }[];
+        } | {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    common: {
+                        label: string;
+                    };
+                    'common-en-US': {};
+                };
+            }[];
+        })[];
+        types: {
+            id: string;
+            type: string;
+            properties: {
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        text: {};
+                        common: {
+                            label: string;
+                        };
+                        'common-en-US': {};
+                    };
+                }[];
+            }[];
+        }[];
+    }[];
+    rule: {
+        type: string;
+    };
+};
 export declare const complexComps: {
     id: string;
     name: string;

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

@@ -2,19 +2,23 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-02-28 16:43:15
+ * @LastEditTime: 2023-06-05 16:21:16
  */
 import { RefRule, Rule } from './ruleConfig';
 export var inputSchema = [{
   id: 'inputSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan,
+  // Rule.common.defaultValue,
+  Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
   types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.common.rules.types))
 }];
 export var textareaSchema = [{
   id: 'textareaSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, RefRule.textarea.props, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, RefRule.textarea.props,
+  // Rule.common.defaultValue,
+  Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
   types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.textarea.types), _toConsumableArray(RefRule.common.rules.types))
 }];
 export var dateSchema = [{
@@ -28,7 +32,9 @@ export var dateSchema = [{
 export var numberSchema = [{
   id: 'numberSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan,
+  // Rule.common.defaultValue,
+  Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
   types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.common.rules.types))
 }];
 export var switchSchema = [{
@@ -42,19 +48,25 @@ export var switchSchema = [{
 export var selectSchema = [{
   id: 'selectSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, RefRule.enum.props, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props],
+  properties: [Rule.common.id, Rule.common.label, RefRule.enum.props, Rule.common.color, Rule.common.colSpan,
+  // Rule.common.defaultValue,
+  Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props],
   types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.enum.types))
 }];
 export var colorSchema = [{
   id: 'colorSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props],
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan,
+  // Rule.common.defaultValue,
+  Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props],
   types: _toConsumableArray(RefRule.common.depend.types)
 }];
 export var passwordSchema = [{
   id: 'passwordSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan,
+  // Rule.common.defaultValue,
+  Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
   types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.common.rules.types))
 }];
 export var uploadSchema = [{
@@ -74,6 +86,7 @@ export var settingSchema = {
   textarea: textareaSchema,
   date: dateSchema,
   numebr: numberSchema,
+  rangeNumber: inputSchema,
   switch: switchSchema,
   select: selectSchema,
   color: colorSchema,
@@ -192,6 +205,13 @@ export var radioParam = {
     type: 'checkbox'
   }
 };
+export var numberRangeParam = {
+  type: 'text',
+  schema: settingSchema.rangeNumber,
+  rule: {
+    type: 'rangeNumber'
+  }
+};
 // 基础组件列表渲染
 export var complexComps = [{
   id: 'color',
@@ -218,6 +238,11 @@ export var complexComps = [{
   name: '单选框',
   type: 'radio',
   param: radioParam
+}, {
+  id: 'numberRange',
+  name: '数字范围',
+  type: 'numberRange',
+  param: numberRangeParam
 }];
 export var objParam = {
   type: 'ref',

package/es/comps/FormGenerator/settings/ruleConfig.d.ts

@@ -209,6 +209,23 @@ export declare const Rule: {
                 };
             }[];
         };
+        disabled: {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    text: {};
+                    common: {
+                        label: string;
+                        depend: {};
+                    };
+                    'common-en-US': {};
+                };
+            }[];
+        };
     };
     text: {
         type: {

package/es/comps/FormGenerator/settings/ruleConfig.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 10:36:25
- * @LastEditTime: 2023-02-28 16:11:14
+ * @LastEditTime: 2023-06-02 10:39:54
  */
 import { DEFAULT_DATE_FORMAT } from '../../../comps/MetadataForm/DataCell/Input';
 export var Rule = {
@@ -215,6 +215,23 @@ export var Rule = {
           'common-en-US': {}
         }
       }]
+    },
+    disabled: {
+      id: 'disabled',
+      type: 'text',
+      fields: [{
+        id: 'Rule.Form',
+        type: 'ref',
+        refId: 'com.ronds.schema.default.Rule.Form',
+        value: {
+          text: {},
+          common: {
+            label: '只读',
+            depend: {}
+          },
+          'common-en-US': {}
+        }
+      }]
     }
   },
   text: {
@@ -522,7 +539,7 @@ export var RefRule = {
       types: [{
         id: 'dependRule',
         type: 'object',
-        properties: [Rule.depend.show, Rule.depend.hidden, Rule.depend.notRequire]
+        properties: [Rule.depend.show, Rule.depend.hidden, Rule.depend.notRequire, Rule.depend.disabled]
       }]
     },
     rules: {

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

@@ -1,8 +1,8 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
+import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/upload/style";
 import _Upload from "antd/es/upload";
 import "antd/es/button/style";
@@ -16,7 +16,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-05-30 14:21:59
+ * @LastEditTime: 2023-06-02 10:46:41
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -80,7 +80,7 @@ function Index(props) {
     }
   }, [extraInfo]);
   var processInputType = function processInputType(_type) {
-    var _extraInfo$disabled, _extraInfo$disabled2, _extraInfo$disabled3, _extraInfo$disabled4, _extraInfo$disabled5, _extraInfo$addonAfter2, _extraInfo$addonAfter3, _extraInfo$addonAfter4, _extraInfo$addonAfter5, _extraInfo$disabled6;
+    var _extraInfo$disabled, _extraInfo$disabled2, _extraInfo$disabled3, _extraInfo$disabled4, _extraInfo$disabled5, _extraInfo$disabled6, _extraInfo$addonAfter2, _extraInfo$addonAfter3, _extraInfo$addonAfter4, _extraInfo$addonAfter5, _extraInfo$disabled7;
     switch (_type) {
       case 'password':
         return /*#__PURE__*/React.createElement(_Input.Password, {
@@ -119,7 +119,9 @@ function Index(props) {
           icon: /*#__PURE__*/React.createElement(UploadOutlined, null)
         }, "\u4E0A\u4F20"));
       case 'numberRange':
-        return /*#__PURE__*/React.createElement(NumberRange, extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.numberRange);
+        return /*#__PURE__*/React.createElement(NumberRange, _extends({}, extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.numberRange, {
+          disabled: (_extraInfo$disabled6 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled6 !== void 0 ? _extraInfo$disabled6 : disabled
+        }));
       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, {
@@ -134,7 +136,7 @@ function Index(props) {
           }))) : undefined,
           showCount: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.showCount,
           maxLength: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxLength,
-          disabled: (_extraInfo$disabled6 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled6 !== void 0 ? _extraInfo$disabled6 : disabled,
+          disabled: (_extraInfo$disabled7 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled7 !== void 0 ? _extraInfo$disabled7 : disabled,
           placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
           title: valueTitle,
           allowClear: true

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

@@ -200,16 +200,15 @@ function Index(props) {
       },
       icon: isFold ? /*#__PURE__*/React.createElement(CaretDownOutlined, null) : /*#__PURE__*/React.createElement(CaretUpOutlined, null)
     })))), /*#__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: !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.titleHidden) && labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat((24 - labelSpan) * 100 / 24, "%") : 1
     }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        padding: '10px',
+      style: !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.borderHidden) ? {
+        padding: '10px 10px 0 10px',
         border: '1px solid var(--ronds-metadata-color-border-1)',
         width: '100%',
         borderRadius: '4px',
-        margin: '0 0 8px',
         display: "".concat(formContext.isFoldForm && isFold ? 'none' : '')
-      }
+      } : {}
     }, /*#__PURE__*/React.createElement(MetadataRefContext.Provider, {
       value: {
         fields: refFieldsRef.current

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

@@ -1,11 +1,17 @@
 interface INumberRangeProps {
     startKey?: string;
     endKey?: string;
+    disabled?: boolean;
     addonBefore?: {
         key: string;
         defaultValue: string;
         value: string[];
     };
+    addonAfter?: {
+        key: string;
+        defaultValue: string;
+        value: string[];
+    };
     value?: any;
     onChange?: (value: any) => void;
 }

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

@@ -10,14 +10,16 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2023-05-30 13:36:05
- * @LastEditTime: 2023-05-30 15:04:46
+ * @LastEditTime: 2023-06-05 16:34:56
  */
 import React from 'react';
 var NumberRange = function NumberRange(props) {
   var startKey = props.startKey,
     value = props.value,
+    disabled = props.disabled,
     endKey = props.endKey,
     addonBefore = props.addonBefore,
+    addonAfter = props.addonAfter,
     onChange = props.onChange;
   var _React$useState = React.useState(),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -31,11 +33,18 @@ var NumberRange = function NumberRange(props) {
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     before = _React$useState6[0],
     setBefore = _React$useState6[1];
+  var _React$useState7 = React.useState(),
+    _React$useState8 = _slicedToArray(_React$useState7, 2),
+    after = _React$useState8[0],
+    setAfter = _React$useState8[1];
   React.useEffect(function () {
-    if (addonBefore.defaultValue) {
+    if (addonBefore === null || addonBefore === void 0 ? void 0 : addonBefore.defaultValue) {
       setBefore(addonBefore.defaultValue);
     }
-  }, [addonBefore]);
+    if (addonAfter === null || addonAfter === void 0 ? void 0 : addonAfter.defaultValue) {
+      setAfter(addonAfter.defaultValue);
+    }
+  }, [addonBefore, addonAfter]);
   React.useEffect(function () {
     if (value) {
       if (value[startKey || 'min']) {
@@ -44,14 +53,14 @@ var NumberRange = function NumberRange(props) {
       if (value[endKey || 'max']) {
         setMax(value[endKey || 'max']);
       }
-      if (addonBefore.key && value[addonBefore.key]) {
+      if ((addonBefore === null || addonBefore === void 0 ? void 0 : 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));
+    onChange && onChange(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, addonBefore === null || addonBefore === void 0 ? void 0 : addonBefore.key, before), _defineProperty(_objectSpread2, addonAfter === null || addonAfter === void 0 ? void 0 : addonAfter.key, after), _defineProperty(_objectSpread2, startKey || 'min', min), _defineProperty(_objectSpread2, endKey || 'max', max), _objectSpread2), changedValue));
   };
   var onStartChange = function onStartChange(v) {
     setMin(v);
@@ -63,11 +72,16 @@ var NumberRange = function NumberRange(props) {
   };
   var onBeforeChange = function onBeforeChange(v) {
     setBefore(v);
-    triggerChange(_defineProperty({}, addonBefore.key, v));
+    triggerChange(_defineProperty({}, addonBefore === null || addonBefore === void 0 ? void 0 : addonBefore.key, v));
+  };
+  var onAfterChange = function onAfterChange(v) {
+    setAfter(v);
+    triggerChange(_defineProperty({}, addonAfter === null || addonAfter === void 0 ? void 0 : addonAfter.key, v));
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input.Group, {
     compact: true
   }, addonBefore && /*#__PURE__*/React.createElement(_Select, {
+    disabled: disabled,
     style: {
       width: '60px'
     },
@@ -81,14 +95,14 @@ var NumberRange = function NumberRange(props) {
     }),
     onChange: onBeforeChange
   }), /*#__PURE__*/React.createElement(_InputNumber, {
+    disabled: disabled,
     value: min,
     style: {
-      width: addonBefore ? 'calc(50% - 44px)' : 'calc(50% - 14px)',
+      width: addonBefore || addonAfter ? 'calc(50% - 44px)' : 'calc(50% - 14px)',
       textAlign: 'center'
     },
     onChange: onStartChange
   }), /*#__PURE__*/React.createElement(_Input, {
-    className: "site-input-split",
     style: {
       width: 30,
       borderLeft: 0,
@@ -98,15 +112,27 @@ var NumberRange = function NumberRange(props) {
     placeholder: "~",
     disabled: true
   }), /*#__PURE__*/React.createElement(_InputNumber, {
+    disabled: disabled,
     value: max,
-    className: "site-input-right",
     style: {
-      width: addonBefore ? 'calc(50% - 44px)' : 'calc(50% - 14px)',
+      width: addonBefore || addonAfter ? 'calc(50% - 44px)' : 'calc(50% - 14px)',
       textAlign: 'center'
-    }
-    //   placeholder="Max"
-    ,
+    },
     onChange: onEndChange
+  }), addonAfter && /*#__PURE__*/React.createElement(_Select, {
+    disabled: disabled,
+    style: {
+      width: '60px'
+    },
+    defaultValue: addonAfter.defaultValue,
+    value: after,
+    options: addonAfter.value.map(function (it) {
+      return {
+        label: it,
+        value: it
+      };
+    }),
+    onChange: onAfterChange
   })));
 };
 export default NumberRange;

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

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-18 10:15:35
+ * @LastEditTime: 2023-06-02 10:55:33
  */
 import React from 'react';
 import { deepClone } from '../../../utils';
@@ -99,7 +99,8 @@ export function withAddOnAfter(WrappedComponent) {
       name: _name,
       labelSpan: labelSpan,
       isObj: isObj,
-      notRequire: depend === null || depend === void 0 ? void 0 : depend.notRequire
+      notRequire: depend === null || depend === void 0 ? void 0 : depend.notRequire,
+      disabled: (depend === null || depend === void 0 ? void 0 : depend.disabled) || false
     })), isShowTypeInfo && !field && type !== 'number' && type !== 'bool' && /*#__PURE__*/React.createElement("div", {
       className: "with-add-on-after-extra"
     }, help !== null && help !== void 0 ? help : type))), fields && ((_fields$5 = fields[0]) === null || _fields$5 === void 0 ? void 0 : (_fields$5$value = _fields$5.value) === null || _fields$5$value === void 0 ? void 0 : (_fields$5$value$commo = _fields$5$value.common) === null || _fields$5$value$commo === void 0 ? void 0 : _fields$5$value$commo.br) && /*#__PURE__*/React.createElement(_Col, {

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

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-28 15:38:07
+ * @LastEditTime: 2023-06-05 18:47:31
  */
 import { getLocale } from '../../../framework/locale';
 import moment from 'moment';
@@ -77,12 +77,20 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$, name) {
           }
           if (_depends === null || _depends === void 0 ? void 0 : _depends.notRequire) {
             var _p$payload3;
-            var _show2 = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.notRequire, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.allVals, stream$, name);
+            var _notRequire = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.notRequire, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.allVals, stream$, name);
             var _dr3 = dependsRef.current;
-            _dr3.notRequire = _show2;
+            _dr3.notRequire = _notRequire;
             setDepends(_objectSpread({}, _dr3));
             dependsRef.current = _dr3;
           }
+          if (_depends === null || _depends === void 0 ? void 0 : _depends.disabled) {
+            var _p$payload4;
+            var _disabled = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.disabled, p === null || p === void 0 ? void 0 : (_p$payload4 = p.payload) === null || _p$payload4 === void 0 ? void 0 : _p$payload4.allVals, stream$, name);
+            var _dr4 = dependsRef.current;
+            _dr4.disabled = _disabled;
+            setDepends(_objectSpread({}, _dr4));
+            dependsRef.current = _dr4;
+          }
         }
       });
     }
@@ -93,7 +101,7 @@ var processDependHiddenOrShow = function processDependHiddenOrShow(depend, chang
   try {
     // const regex = /\w+(\.\w+)?[=<>!]{1}/g;
     var regex = /\w+(\.\w+)?[=<>!]{1}|\w+(\.\w+)?(\.indexOf\('.+'\)[=<>!]{1})/g;
-    var keys = depend.trim().match(regex);
+    var keys = depend.trim().replace(/\s/g, '').match(regex);
     if (!keys) {
       return false;
     }

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

@@ -54,6 +54,7 @@ export type IFiledDepend = {
     hidden: string;
     show: string;
     notRequire: string;
+    disabled: string;
 };
 export type IStreamEventType = 'onSelectChange' | 'onButtonCellClick' | 'onValuesChange' | 'onWatchDepend' | string;
 export type IStreamEvent = {

package/es/comps/MetadataForm/interface.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-28 10:14:07
+ * @LastEditTime: 2023-06-02 10:50:12
  */
 import React from 'react';
 export var MetadataFormContext = /*#__PURE__*/React.createContext(null);

package/es/utils.js

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-20 15:15:56
+ * @LastEditTime: 2023-06-02 09:16:28
  */
 import saveAs from 'file-saver';
 import { asBlob } from 'html-docx-js-typescript';
@@ -191,7 +191,7 @@ function _handleMd2Doc() {
             margin: {
               top: 100
             },
-            orientation: 'landscape'
+            orientation: 'portrait'
           };
           _context.next = 6;
           return asBlob(html, opt);

package/package.json

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