Merge branch 'master' into positec

king

2023-10-19 20c83dab04d53d60b5fcd08aad3d5d9fbfb4fa5c

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

@@ -647,7 +647,7 @@
      type: 'select',
      key: 'popClose',
      label: '关闭后',
      initVal: card.popClose || 'never',
      initVal: card.popClose || 'grid',
      required: true,
      options: [{
        value: 'never',
@@ -1756,7 +1756,7 @@
      type: 'select',
      key: 'popClose',
      label: '关闭后',
      initVal: card.popClose || 'never',
      initVal: card.popClose || 'grid',
      required: true,
      options: [{
        value: 'never',