Merge branch 'master' into positec

king

2022-12-06 0245e64a9dff794903e546c3bdf9fef7efeefdf1

 src/menu/components/share/actioncomponent/formconfig.jsx

@@ -933,7 +933,10 @@
      initVal: card.controlField || '',
      required: true,
      allowClear: true,
      options: columns
      options: columns.map(item => ({
        value: item.field,
        text: `${item.label}（${item.field}）`
      }))
    },
    {
      type: 'text',
@@ -1718,7 +1721,10 @@
      initVal: card.controlField || '',
      required: true,
      allowClear: true,
      options: columns
      options: columns.map(item => ({
        value: item.field,
        text: `${item.label}（${item.field}）`
      }))
    },
    {
      type: 'text',