Merge branch 'master' into positec

king

2023-06-14 7cfd25aebe5869244e40dbbcd6384f115f35e66e

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

@@ -373,6 +373,9 @@
        className = 'text-area'

        extra = <span className="add-resource-empty" onClick={this.handleEmpty}>空</span>
        if (item.placeholder) {
          extra = <><span className="resource-public-var">{item.placeholder}</span>{extra}</>
        }

        content = <CodeMirror />
      } else if (item.type === 'options') {