Commit3cf0675

authored

Merge branch 'dev' into upgrade-comps-version

2 parents7b9b73b +c270bf8 commit3cf0675Copy full SHA for 3cf0675

File tree

-34

lines changed

client/packages/lowcoder/src
- comps/comps/responsiveLayout
  - responsiveLayout.tsx
- pages/setting/idSource
  - createModal.tsx

-34

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,8 @@ class ResponsiveLayoutImplComp extends ResponsiveLayoutBaseComp implements ICont`
`277`	`277`	`},`
`278`	`278`	`}asCompAction;`
`279`	`279`	`}`
`280`		`-if(value.type==="delete"&&columns.length<=1){`
	`280`	`+const{ path}=action;`
	`281`	`+if(value.type==="delete"&&path[0]==='columns'&&columns.length<=1){`
`281`	`282`	`messageInstance.warning(trans("responsiveLayout.atLeastOneColumnError"));`
`282`	`283`	`// at least one column`
`283`	`284`	`returnthis;`

Lines changed: 0 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,39 +176,6 @@ function CreateModal(props: CreateModalProp) {`
`176`	`176`	`</div>`
`177`	`177`	`);`
`178`	`178`	`})}`
`179`		`-{/* <Form.Item`
`180`		`- name="clientId"`
`181`		`- label="Client ID"`
`182`		`- rules={[{ required: true }]}`
`183`		`- >`
`184`		`- <Input`
`185`		`- placeholder={trans("idSource.formPlaceholder", {`
`186`		`- label: 'Client ID',`
`187`		`- })}`
`188`		`- autoComplete="off"`
`189`		`- />`
`190`		`- </Form.Item>`
`191`		`- <Form.Item`
`192`		`- name="clientSecret"`
`193`		`- label={`
`194`		`- <PasswordLabel>`
`195`		`- <span>{"Client secret"}:</span>`
`196`		`- <CloseEyeIcon />`
`197`		`- </PasswordLabel>`
`198`		`- }`
`199`		`- rules={[{`
`200`		`- required: true,`
`201`		`- message: trans("idSource.formPlaceholder", {`
`202`		`- label: 'Client secret',`
`203`		`- })`
`204`		`- }]}`
`205`		`- >`
`206`		`- <Input`
`207`		`- type="password"`
`208`		`- placeholder={trans("idSource.encryptedServer")}`
`209`		`- autoComplete="off"`
`210`		`- />`
`211`		`- </Form.Item> */}`
`212`	`179`	`</FormStyled>`
`213`	`180`	`</CustomModalStyled>`
`214`	`181`	`);`

Comments

(0)