Merge branch 'next' into develop

# Conflicts:
#	packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts
This commit is contained in:
chenos 2025-01-11 23:02:17 +08:00
commit f9df480a3a
2 changed files with 11 additions and 2 deletions

View File

@ -62,7 +62,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget gnupg \
RUN sh -c 'echo "deb http://mirrors.ustc.edu.cn/postgresql/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list' RUN sh -c 'echo "deb http://mirrors.ustc.edu.cn/postgresql/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
RUN wget --quiet -O - http://mirrors.ustc.edu.cn/postgresql/repos/apt/ACCC4CF8.asc | apt-key add - RUN wget --quiet -O - http://mirrors.ustc.edu.cn/postgresql/repos/apt/ACCC4CF8.asc | apt-key add -
RUN apt-get update && apt-get -y --no-install-recommends install nginx libaio1 postgresql-client-16 postgresql-client-17 \ RUN apt-get update && apt-get -y --no-install-recommends install \
nginx \
libaio1 \
postgresql-client-16 \
postgresql-client-17 \
libfreetype6 \
fontconfig \
libgssapi-krb5-2 \
ttf-mscorefonts-installer \
fonts-wqy-zenhei \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN rm -rf /etc/nginx/sites-enabled/default RUN rm -rf /etc/nginx/sites-enabled/default

View File

@ -46,7 +46,7 @@ export const PasswordField: React.FC = () => {
}} }}
value={field.value} value={field.value}
onChange={(e: any) => field.setValue(e.target.value)} onChange={(e: any) => field.setValue(e.target.value)}
autoComplete="off" autoComplete="new-password"
/> />
</Col> </Col>
<Col span={4}> <Col span={4}>