zmdms-webui 2.1.6 → 2.1.7

package/dist/es/formitem/formItem.d.ts

@@ -107,10 +107,6 @@ interface IFormItem extends FormItemProps {
      * 布局
      */
     directionColumn?: boolean;
-    /**
-     * 额外的组件，不用走formItem
-     */
-    outsideRender?: (itemProps: any, formInstance?: FormInstance<any>) => React__default.ReactNode;
 }
 declare const _default: React__default.NamedExoticComponent<IFormItem & {
     outsideState: any;

package/dist/es/formitem/formItem.js

@@ -10,25 +10,16 @@ import { Col, Tooltip } from 'antd';
 
 var hiddenLabelCol = { span: 0 };
 var FormItem = function (props) {
-    var children = props.children, isDisplay = props.isDisplay, isRequired = props.isRequired, isChangeable = props.isChangeable, isStress = props.isStress, preNode = props.preNode, nextNode = props.nextNode; props.dynamicDisabled; var hiddenBorder = props.hiddenBorder, singleSelectShowBorder = props.singleSelectShowBorder, singleSelect = props.singleSelect, hiddenLabel = props.hiddenLabel, width = props.width, className = props.className, itemClassName = props.itemClassName, render = props.render, shouldUpdateNames = props.shouldUpdateNames; props.shouldUpdateClear; var dependencies = props.dependencies, shouldUpdate = props.shouldUpdate; props.index; props.outsideState; props.shouldUpdateBeOutsideState; props.nonForm; var isCustomItem = props.isCustomItem, customStyle = props.customStyle, tipString = props.tipString, directionColumn = props.directionColumn, divider = props.divider, outsideRender = props.outsideRender, resetProps = __rest(props, ["children", "isDisplay", "isRequired", "isChangeable", "isStress", "preNode", "nextNode", "dynamicDisabled", "hiddenBorder", "singleSelectShowBorder", "singleSelect", "hiddenLabel", "width", "className", "itemClassName", "render", "shouldUpdateNames", "shouldUpdateClear", "dependencies", "shouldUpdate", "index", "outsideState", "shouldUpdateBeOutsideState", "nonForm", "isCustomItem", "customStyle", "tipString", "directionColumn", "divider", "outsideRender"]);
+    var children = props.children, isDisplay = props.isDisplay, isRequired = props.isRequired, isChangeable = props.isChangeable, isStress = props.isStress, preNode = props.preNode, nextNode = props.nextNode; props.dynamicDisabled; var hiddenBorder = props.hiddenBorder, singleSelectShowBorder = props.singleSelectShowBorder, singleSelect = props.singleSelect, hiddenLabel = props.hiddenLabel, width = props.width, className = props.className, itemClassName = props.itemClassName, render = props.render, shouldUpdateNames = props.shouldUpdateNames; props.shouldUpdateClear; var dependencies = props.dependencies, shouldUpdate = props.shouldUpdate; props.index; props.outsideState; props.shouldUpdateBeOutsideState; props.nonForm; var isCustomItem = props.isCustomItem, customStyle = props.customStyle, tipString = props.tipString, directionColumn = props.directionColumn, divider = props.divider, resetProps = __rest(props, ["children", "isDisplay", "isRequired", "isChangeable", "isStress", "preNode", "nextNode", "dynamicDisabled", "hiddenBorder", "singleSelectShowBorder", "singleSelect", "hiddenLabel", "width", "className", "itemClassName", "render", "shouldUpdateNames", "shouldUpdateClear", "dependencies", "shouldUpdate", "index", "outsideState", "shouldUpdateBeOutsideState", "nonForm", "isCustomItem", "customStyle", "tipString", "directionColumn", "divider"]);
     var form = MemoForm.useFormInstance();
     // 根据配置属性，判断是否渲染表单项
     // 是否显示表单项
     if (isDisplay === false || isDisplay === "0") {
         return null;
     }
-    if (typeof isDisplay === "function") {
-        var isD = isDisplay(form);
-        if (!isD) {
-            return null;
-        }
-    }
     if (divider) {
         return (jsx(ItemWrap, { width: width, className: className, tipString: tipString, style: { paddingBottom: 0 } }));
     }
-    if (outsideRender) {
-        return (jsx(ItemWrap, __assign({ width: width, className: className, tipString: tipString, style: { paddingBottom: 0, display: "block" } }, { children: outsideRender(resetProps, form) })));
-    }
     // 更新是否必填配置
     var updateIsRequired = function (isRequired) {
         var _a;
@@ -106,6 +97,12 @@ var FormItem = function (props) {
             }
             : shouldUpdate;
         return (jsx(MemoForm.Item, __assign({ shouldUpdate: shouldUpdateHandle, noStyle: true }, { children: function (formInstance) {
+                if (typeof isDisplay === "function") {
+                    var isD = isDisplay(form);
+                    if (!isD) {
+                        return null;
+                    }
+                }
                 if (typeof isRequired === "function") {
                     var isR = isRequired(form);
                     updateIsRequired(isR);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",