fix: 表单支持默认隐藏

package.json

 {
   "name": "panda-xform",
-  "version": "6.9.22",
-  "description": "6.9.22 表单点击详情字段显示问题",
+  "version": "6.9.23",
+  "description": "6.9.23 表单支持默认隐藏",
   "keywords": [
     "panda-xform"
   ],

src/core/FormDesigner/config/settings.js

@@ -124,7 +124,17 @@ const textWidgets = [
         description: '所有形态默认显示',
         widget: 'HiddenCondition',
         disabled: disabled,
-        dependencies: ['tableTypeParent', 'IsSystemField'],
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['tableTypeParent', 'IsSystemField', 'isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        disabled: disabled,
+        displayType: 'row',
+        labelWidth: 80,
       },
       presetValue: {
         title: '默认值',
@@ -318,7 +328,17 @@ const textWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       presetValue: {
         title: '默认值',
@@ -426,7 +446,17 @@ const textWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       rules: {
         title: '正则校验',
@@ -568,7 +598,17 @@ const textWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       presetValue: {
         title: '默认值',
@@ -650,22 +690,17 @@ const textWidgets = [
         type: 'string',
         description: '所有形态默认显示',
         widget: 'HiddenCondition',
-        disabled: disabled,
-        dependencies: ['tableTypeParent', 'IsSystemField'],
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
-      // required: {
-      //   title: '必填',
-      //   type: 'boolean',
-      //   default: false,
-      //   width: '40%',
-      //   props: {
-      //     style: {
-      //       marginLeft: '10px'
-      //     }
-      //   },
-      //   disabled: disabled,
-      //   dependencies: ['tableTypeParent', 'IsSystemField'],
-      // },
       prefixion: {
         title: '前缀',
         type: 'string',
@@ -738,7 +773,17 @@ const textWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       coordSync: {
         title: '坐标同步',
@@ -817,7 +862,17 @@ const selectWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       presetValue: {
         title: '默认值',
@@ -976,7 +1031,17 @@ const selectWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       sourceType: {
         title: '来源方式',
@@ -1090,7 +1155,18 @@ const selectWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        disabled: disabled,
+        displayType: 'row',
+        labelWidth: 80,
       },
       sourceType: {
         title: '来源方式',
@@ -1206,7 +1282,18 @@ const selectWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        disabled: disabled,
+        displayType: 'row',
+        labelWidth: 80,
       },
       disabled: {
         title: '只读',
@@ -1287,7 +1374,17 @@ const selectWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       fieldParent: {
         title: '父字段名',
@@ -1372,7 +1469,17 @@ const selectWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       sourceType: {
         title: '来源方式',
@@ -1462,7 +1569,17 @@ const businessWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       role: {
         title: '机构角色',
@@ -1572,7 +1689,17 @@ const businessWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       required: {
         title: '必填',
@@ -1657,7 +1784,17 @@ const businessWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       accountName: {
         title: '台账名称',
@@ -1791,7 +1928,17 @@ const dateWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       calculateRule: {
         title: '计算规则',
@@ -1886,7 +2033,17 @@ const dateWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       calculateRule: {
         title: '计算规则',
@@ -1984,7 +2141,17 @@ const fileWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       fileType: {
         title: '文件类型',
@@ -2116,7 +2283,17 @@ const mapWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       currentAddress: {
         title: '自动获取',
@@ -2210,7 +2387,17 @@ const mapWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       fieldshine: {
         title: '映射字段',
@@ -2293,7 +2480,19 @@ const mapWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        disabled: disabled,
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['tableTypeParent', 'IsSystemField', 'isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        disabled: disabled,
+        displayType: 'row',
+        labelWidth: 80,
       },
       screenShot: {
         title: '是否显示缩略图',
@@ -2369,7 +2568,17 @@ const mapWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       screenShot: {
         title: '是否显示缩略图',
@@ -2452,7 +2661,17 @@ const mapWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       areaTaskShine: {
         title: '巡检对象',
@@ -2564,20 +2783,21 @@ const advancedWidgets = [
         dependencies: ['accountName', '$id'],
         description: '默认获取前端台账字段',
       },
-      // sql: {
-      //   title: 'SQL过滤',
-      //   name: 'SQL过滤',
-      //   type: 'string',
-      //   widget: 'SqlFilter',
-      //   props: {
-      //     placeholder: '示例：部门="XX部门"'
-      //   }
-      // },
       hiddenCondition: {
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       isEdit: {
         title: '表格可编辑',
@@ -2651,7 +2871,17 @@ const advancedWidgets = [
         title: '隐藏条件',
         type: 'string',
         description: '所有形态默认显示',
-        widget: 'HiddenCondition'
+        widget: 'HiddenCondition',
+        hidden: "{{formData.isHidden}}",
+        dependencies: ['isHidden'],
+      },
+      isHidden: {
+        title: '是否隐藏',
+        type: 'boolean',
+        widget: 'IsHidden',
+        default: false,
+        displayType: 'row',
+        labelWidth: 80,
       },
       description: {
         title: '字段说明',

src/core/widgets/settings/groupBase/IsHidden/index.js

+import React, { useEffect } from 'react'
+import { Switch } from 'antd'
+
+const IsHidden = (props) => {
+
+  const { value, onChange, addons } = props
+
+  const switchChange = (checked) => {
+    if (addons) {
+      onChange(checked)
+      if (checked) {
+        addons.setValue('hiddenCondition', '1=1')
+        addons.setValue('hiddenRules', [])
+      } else {
+        addons.setValue('hiddenCondition', '')
+        addons.setValue('hiddenRules', [])
+      }
+    }
+  }
+
+  return (
+    <Switch
+      checked={value}
+      checkedChildren={'隐藏'}
+      unCheckedChildren={'显示'}
+      onChange={switchChange}
+    >
+    </Switch>
+  )
+
+}
+
+export default IsHidden
\ No newline at end of file

src/core/widgets/settings/groupBase/index.js

@@ -9,6 +9,7 @@ import WidgetType from './WidgetType'
 import HiddenCondition from './HiddenCondition'
 import SwitchDefault from './SwitchDefault'
 import RichTextDefault from './RichTextDefault'
+import IsHidden from './IsHidden'
 
 const groupBase = {
   FieldNames,
@@ -22,6 +23,7 @@ const groupBase = {
   HiddenCondition,
   SwitchDefault,
   RichTextDefault,
+  IsHidden,
 }
 
 export default groupBase
\ No newline at end of file