ronds-metadata 1.2.11 → 1.2.12

package/es/comps/FormGenerator/transformer.js

@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 14:45:46
- * @LastEditTime: 2023-02-27 16:38:58
+ * @LastEditTime: 2023-02-28 09:22:50
  */
 import { deepClone } from '../../utils';
 import { basicComps, complexComps, layoutComps } from './settings';
@@ -205,25 +205,25 @@ var getTypeJson = function getTypeJson(id, type, field) {
 
 
   if (type === 'enum') {
-    var _field$enum, _field$enum2, _field$enum3, _field$enum4;
+    var _field$enum, _field$enum2, _field$enum3, _field$enum4, _field$enum5, _field$enum6, _field$enum7, _field$enum8;
 
     // select
-    if ((field === null || field === void 0 ? void 0 : (_field$enum = field.enum) === null || _field$enum === void 0 ? void 0 : _field$enum.type) !== 'checkbox' && !field.enum.isMutiple) {
+    if ((field === null || field === void 0 ? void 0 : (_field$enum = field.enum) === null || _field$enum === void 0 ? void 0 : _field$enum.type) !== 'checkbox' && !((_field$enum2 = field.enum) === null || _field$enum2 === void 0 ? void 0 : _field$enum2.isMutiple)) {
       res = renderJson(basicComps, 'select', id, field);
     } // mutiSelect
 
 
-    if ((field === null || field === void 0 ? void 0 : (_field$enum2 = field.enum) === null || _field$enum2 === void 0 ? void 0 : _field$enum2.type) !== 'checkbox' && field.enum.isMutiple) {
+    if ((field === null || field === void 0 ? void 0 : (_field$enum3 = field.enum) === null || _field$enum3 === void 0 ? void 0 : _field$enum3.type) !== 'checkbox' && ((_field$enum4 = field.enum) === null || _field$enum4 === void 0 ? void 0 : _field$enum4.isMutiple)) {
       res = renderJson(basicComps, 'mutiSelect', id, field);
     } // checkbox
 
 
-    if ((field === null || field === void 0 ? void 0 : (_field$enum3 = field.enum) === null || _field$enum3 === void 0 ? void 0 : _field$enum3.type) === 'checkbox' && field.enum.isMutiple) {
+    if ((field === null || field === void 0 ? void 0 : (_field$enum5 = field.enum) === null || _field$enum5 === void 0 ? void 0 : _field$enum5.type) === 'checkbox' && ((_field$enum6 = field.enum) === null || _field$enum6 === void 0 ? void 0 : _field$enum6.isMutiple)) {
       res = renderJson(complexComps, 'checkbox', id, field);
     } // radio
 
 
-    if ((field === null || field === void 0 ? void 0 : (_field$enum4 = field.enum) === null || _field$enum4 === void 0 ? void 0 : _field$enum4.type) === 'checkbox' && !field.enum.isMutiple) {
+    if ((field === null || field === void 0 ? void 0 : (_field$enum7 = field.enum) === null || _field$enum7 === void 0 ? void 0 : _field$enum7.type) === 'checkbox' && !((_field$enum8 = field.enum) === null || _field$enum8 === void 0 ? void 0 : _field$enum8.isMutiple)) {
       res = renderJson(complexComps, 'radio', id, field);
     }
   } // obj

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-25 11:21:22
+ * @LastEditTime: 2023-02-28 10:18:07
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -31,6 +31,7 @@ function Index(props) {
   var id = props.id,
       isRefForm = props.isRefForm,
       disabled = props.disabled,
+      notRequire = props.notRequire,
       field = props.field,
       labelSpan = props.labelSpan,
       name = props.name,
@@ -145,7 +146,7 @@ function Index(props) {
       } : undefined,
       name: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$addonAfter5 = extraInfo.addonAfter) === null || _extraInfo$addonAfter5 === void 0 ? void 0 : _extraInfo$addonAfter5.key) ? [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name), ['value']) : [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name)),
       rules: [{
-        required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+        required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }].concat(_toConsumableArray(rules)),
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -176,7 +177,7 @@ function Index(props) {
     } : 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
+      required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }].concat(_toConsumableArray(rules)),
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -187,7 +188,7 @@ function Index(props) {
     },
     name: [field === null || field === void 0 ? void 0 : field.name],
     rules: [{
-      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+      required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }].concat(_toConsumableArray(rules)),
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

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

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-23 16:31:33
+ * @LastEditTime: 2023-02-28 10:19:20
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -22,6 +22,7 @@ function Index(props) {
       name = props.name,
       isRefForm = props.isRefForm,
       disabled = props.disabled,
+      notRequire = props.notRequire,
       labelSpan = props.labelSpan,
       field = props.field,
       isObj = props.isObj;
@@ -72,7 +73,7 @@ function Index(props) {
         offset: 0
       } : undefined,
       rules: [{
-        required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+        required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }].concat(_toConsumableArray(rules)),
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -103,7 +104,7 @@ function Index(props) {
     } : undefined,
     name: name,
     rules: [{
-      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+      required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }].concat(_toConsumableArray(rules)),
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -117,7 +118,7 @@ function Index(props) {
     },
     name: [field === null || field === void 0 ? void 0 : field.name],
     rules: [{
-      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+      required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }].concat(_toConsumableArray(rules)),
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

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

@@ -32,7 +32,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-28 08:33:52
+ * @LastEditTime: 2023-02-28 10:19:57
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -54,6 +54,7 @@ function Index(props) {
       initEnumValue = _props$initEnumValue === void 0 ? {} : _props$initEnumValue,
       disabled = props.disabled,
       field = props.field,
+      notRequire = props.notRequire,
       labelSpan = props.labelSpan,
       isObj = props.isObj,
       _props$enum = props.enum,
@@ -508,7 +509,7 @@ function Index(props) {
       } : undefined,
       name: [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name)),
       rules: [{
-        required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+        required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -536,7 +537,7 @@ function Index(props) {
     } : undefined,
     name: name,
     rules: [{
-      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+      required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -547,7 +548,7 @@ function Index(props) {
     },
     name: [field === null || field === void 0 ? void 0 : field.name],
     rules: [{
-      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+      required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

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

@@ -8,7 +8,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-23 19:34:31
+ * @LastEditTime: 2023-02-28 10:01:17
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -21,6 +21,7 @@ function Index(props) {
       name = props.name,
       isRefForm = props.isRefForm,
       disabled = props.disabled,
+      notRequire = props.notRequire,
       labelSpan = props.labelSpan,
       field = props.field,
       isObj = props.isObj;
@@ -52,7 +53,7 @@ function Index(props) {
       name: [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name)),
       valuePropName: "checked",
       rules: [{
-        required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+        required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -85,7 +86,7 @@ function Index(props) {
     name: name,
     valuePropName: "checked",
     rules: [{
-      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+      required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -101,7 +102,7 @@ function Index(props) {
     name: [field === null || field === void 0 ? void 0 : field.name],
     valuePropName: "checked",
     rules: [{
-      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
+      required: notRequire ? !notRequire : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

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

@@ -9,7 +9,7 @@ import { MetadataFormContext } from '../interface';
 import './index.less';
 export function withAddOnAfter(WrappedComponent) {
   return function (props) {
-    var _fields$, _fields$$value, _fields$$value$common, _fields$4, _fields$4$value, _fields$4$value$commo, _fields$4$value$commo2;
+    var _fields$, _fields$$value, _fields$$value$common, _fields$4, _fields$4$value, _fields$4$value$commo, _fields$4$value$commo2, _fields$5, _fields$5$value, _fields$5$value$commo;
 
     var type = props.type,
         refId = props.refId,
@@ -102,7 +102,7 @@ export function withAddOnAfter(WrappedComponent) {
       return /*#__PURE__*/React.createElement(React.Fragment, null);
     }
 
-    return /*#__PURE__*/React.createElement(_Col, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Col, {
       key: id,
       span: cellColSpan
     }, /*#__PURE__*/React.createElement("div", {
@@ -117,9 +117,10 @@ export function withAddOnAfter(WrappedComponent) {
       },
       name: _name,
       labelSpan: labelSpan,
-      isObj: isObj
+      isObj: isObj,
+      notRequire: depend === null || depend === void 0 ? void 0 : depend.notRequire
     })), isShowTypeInfo && !field && type !== 'number' && type !== 'bool' && /*#__PURE__*/React.createElement("div", {
       className: "with-add-on-after-extra"
-    }, help !== null && help !== void 0 ? help : type)));
+    }, help !== null && help !== void 0 ? help : type))), ((_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, null));
   };
 }

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

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-23 14:53:08
+ * @LastEditTime: 2023-02-28 11:03:50
  */
 import { getLocale } from '../../../framework/locale';
 import moment from 'moment';
@@ -89,6 +89,17 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$) {
             setDepends(_objectSpread({}, _dr2));
             dependsRef.current = _dr2;
           }
+
+          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$);
+
+            var _dr3 = dependsRef.current;
+            _dr3.notRequire = _show2;
+            setDepends(_objectSpread({}, _dr3));
+            dependsRef.current = _dr3;
+          }
         }
       });
     }
@@ -99,7 +110,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$) {
 var processDependHiddenOrShow = function processDependHiddenOrShow(depend, changeData, stream$) {
   try {
     // const regex = /\w+(\.\w+)?[=<>!]{1}/g;
-    var regex = /\w+(\.\w+)?[=<>!]{1}|\w+(\.\w+)?(\.indexOf\('\w+'\)[=<>!]{1})/g;
+    var regex = /\w+(\.\w+)?[=<>!]{1}|\w+(\.\w+)?(\.indexOf\('.+'\)[=<>!]{1})/g;
     var keys = depend.trim().match(regex);
 
     if (!keys) {

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

@@ -31,7 +31,7 @@ export interface IMetaFormProps {
     id: string;
     idx?: number;
     type: string;
-    require?: boolean;
+    notRequire?: boolean;
     disabled?: boolean;
     isRefForm?: boolean;
     initEnumValue?: any;
@@ -53,6 +53,7 @@ export interface IMetaFormProps {
 export declare type IFiledDepend = {
     hidden: string;
     show: string;
+    notRequire: string;
 };
 export declare type IStreamEventType = 'onSelectChange' | 'onButtonCellClick' | 'onValuesChange' | 'onWatchDepend' | string;
 export declare type IStreamEvent = {

package/es/comps/MetadataForm/interface.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-22 15:51:59
+ * @LastEditTime: 2023-02-28 10:14:07
  */
 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.11",
+  "version": "1.2.12",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",