Merge branch 'master' into positec

king

2024-02-20 c0e017668d780c40f85230f227ea0160b5d22d4d

 src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx

@@ -441,6 +441,15 @@
    },
    {
      type: 'select',
      key: 'showField',
      label: '显示字段',
      initVal: card.showField || '',
      tooltip: '用于控制单元格中的显示内容。',
      required: false,
      options: 'columns'
    },
    {
      type: 'select',
      key: 'controlField',
      label: '禁用字段',
      initVal: card.controlField || '',