Merge branch 'master' into positec

king

2024-05-21 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5

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

@@ -566,7 +566,8 @@
                      <Select.Option value="line" disabled={config.wrap.commit !== 'change'}>刷新行</Select.Option>
                      <Select.Option value="grid">刷新组件</Select.Option>
                      <Select.Option value="line_grid" disabled={config.wrap.commit !== 'change'}>刷新行 / 组件</Select.Option>
                      <Select.Option value="mainline">上级（行）</Select.Option>
                      <Select.Option value="mainline">刷新上级组件 - 行</Select.Option>
                      <Select.Option value="maingrid">刷新上级组件</Select.Option>
                    </Select>
                  </Form.Item>
                </Col>
@@ -577,7 +578,8 @@
                      <Select.Option value="line" disabled={config.wrap.commit !== 'change'}>刷新行</Select.Option>
                      <Select.Option value="grid">刷新组件</Select.Option>
                      <Select.Option value="line_grid" disabled={config.wrap.commit !== 'change'}>刷新行 / 组件</Select.Option>
                      <Select.Option value="mainline">上级（行）</Select.Option>
                      <Select.Option value="mainline">刷新上级组件 - 行</Select.Option>
                      <Select.Option value="maingrid">刷新上级组件</Select.Option>
                    </Select>
                  </Form.Item>
                </Col>