Merge branch 'master' into positec

king

2024-07-02 db942b44e0755ee1ce4bc8912be2cb1ca5f89c95

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

@@ -461,6 +461,7 @@
          extra = <span className="add-resource-empty" onClick={this.handleEmpty}>空</span>
        }
        if (item.placeholder) {
          className = 'show-public-var'
          extra = <><span className="resource-public-var">{item.placeholder}</span>{extra}</>
        }

@@ -701,7 +702,7 @@
          title="显示列编辑"
          wrapClassName="mk-scroll-modal"
          visible={visible}
          width={900}
          width={950}
          maskClosable={false}
          onOk={this.handleSubmit}
          onCancel={this.editModalCancel}