Merge remote-tracking branch 'origin/main'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "global-highlights-hub",
   "private": true,
-  "version": "2.0.0-rc.9",
+  "version": "2.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

patch-version.bat

@@ -0,0 +1 @@
+npm version patch

src/main.jsx

@@ -1,5 +1,4 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
+import { createRoot } from 'react-dom/client'
 import {
   createBrowserRouter,
   RouterProvider,
@@ -42,8 +41,6 @@ import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA, PERM_AIR_TICKET,
 
 import './i18n'
 
-const { createRoot } = ReactDOM
-
 const initRouter = async () => {
   return createBrowserRouter([
     {
@@ -100,8 +97,11 @@ const initAppliction = async () => {
   }
 
   const router = await initRouter()
+  const root = document.getElementById('root')
+
+  if (!root) throw new Error('No root element found')
 
-  createRoot(document.getElementById('root')).render(
+  createRoot(root).render(
     //<React.StrictMode>
     <ThemeContext.Provider value={{ colorPrimary: '#00b96b', borderRadius: 4 }}>
       <RouterProvider

src/views/App.jsx

@@ -82,7 +82,15 @@ function App() {
 				algorithm: theme.defaultAlgorithm,
 			}}>
 			<AntApp>
-      <FloatButton icon={<BugOutlined />} onClick={() => uploadLog()} />
+      <FloatButton.Group
+        shape='square'
+        style={{
+          insetInlineEnd: 94,
+        }}
+      >
+        <FloatButton icon={<BugOutlined />} onClick={() => uploadLog()} />
+        <FloatButton.BackTop />
+      </FloatButton.Group>
       {contextHolder}
       <ErrorBoundary>
 				<Layout className='min-h-screen'>

src/views/airticket/Plan.jsx

@@ -616,7 +616,7 @@ const AirticketPlan = props => {
 				<Divider orientation="left">计划变更</Divider>
 				<Col md={24} lg={12} xxl={12}>
 					<Space direction="vertical" style={{ width: "90%" }}>
-						<Input.TextArea rows={4} readOnly value={veiPlanChangeTxt && veiPlanChangeTxt.ChangeText} />
+						<Input.TextArea rows={16} readOnly value={veiPlanChangeTxt && veiPlanChangeTxt.ChangeText} />
 						<Button
 							type="primary"
 							onClick={() => {

src/views/products/Detail/ContractRemarksModal.jsx

@@ -22,6 +22,7 @@ export const ContractRemarksModal = () => {
     const remarkList = remarksForm.getFieldsValue().remarkList
     saveOrUpdateRemark(remarkList)
       .then(() => {
+        setRemarksModalOpen(false)
         notification.info({
           message: 'Notification',
           description: '合同备注保存成功',