A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
Revert "refactor: refactor show password logic in init answer app"
dashuaif1c65815daf0
diff --git a/ui/package.json b/ui/package.jsonindex 0e645d2e..da8588e6 100644--- a/ui/package.json+++ b/ui/package.json@@ -39,6 +39,7 @@"qs": "^6.11.0","react": "^18.2.0","react-bootstrap": "^2.10.0",+ "react-bootstrap-icons": "^1.11.5","react-dom": "^18.2.0","react-helmet-async": "^1.3.0","react-i18next": "^11.18.3",diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yamlindex 4d122c58..8aa2dffb 100644--- a/ui/pnpm-lock.yaml+++ b/ui/pnpm-lock.yaml@@ -77,6 +77,9 @@ importers:react-bootstrap:specifier: ^2.10.0+ react-bootstrap-icons:+ specifier: ^1.11.5+ version: 1.11.5([email protected])react-dom:specifier: ^18.2.0version: 18.2.0([email protected])@@ -9913,6 +9916,15 @@ packages:semver: 5.7.1dev: true+ resolution: {integrity: sha512-eOhtFJMUqw98IJcfKJsSMZkFHCeNPTTwXZAe9V9d4mT22ARmbrISxPO9GmtWWuf72zQctLeZMGodX/q6wrbYYg==}+ peerDependencies:+ react: '>=16.8.6'+ dependencies:+ prop-types: 15.8.1+ react: 18.2.0+ dev: false+resolution: {integrity: sha512-87gRP69VAfeU2yKgp8RI3HvzhPNrnYIV2QNranYXataz3ef+k7OhvKGGdxQLQfUsQ2RTmlY66tn4pdFrZ94hNg==}peerDependencies:diff --git a/ui/src/pages/Install/components/FourthStep/index.tsx b/ui/src/pages/Install/components/FourthStep/index.tsxindex ad95c4d3..066cd079 100644--- a/ui/src/pages/Install/components/FourthStep/index.tsx+++ b/ui/src/pages/Install/components/FourthStep/index.tsx@@ -19,12 +19,12 @@import { FC, FormEvent, useState } from 'react';import { Form, Button } from 'react-bootstrap';+import { Eye, EyeSlash } from 'react-bootstrap-icons';import { useTranslation } from 'react-i18next';import type { FormDataType } from '@/common/interface';import Pattern from '@/common/pattern';import Progress from '../Progress';-import { Icon } from '@/components';interface Props {data: FormDataType;@@ -317,18 +317,20 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {/><buttontype="button"- className="position-absolute top-50 translate-middle-y bg-transparent border-0 p-1"+ className="position-absolute top-50 translate-middle-y bg-transparent border-0"style={{+ cursor: 'pointer',right: '12px',+ padding: '4px',}}aria-label={showPassword ? t('hide_password') : t('show_password')}onMouseDown={() => setShowPassword(true)}onMouseUp={() => setShowPassword(false)}onMouseLeave={() => setShowPassword(false)}>{showPassword ? (- <Icon name="eye" className="text-secondary" size="18" />+ <Eye className="text-secondary" size={18} />) : (- <Icon name="eye-slash" className="text-secondary" size="18" />+ <EyeSlash className="text-secondary" size={18} />)}</button></div>