feat: 增加打标签命令；删除不必要角色权限；优化 main asnyc 确保可以 build

1 year ago · 0eef2cee3a
parent 579689f3e0
commit 0eef2cee3a
5 changed files with 95 additions and 103 deletions
--- a/README.md
+++ b/README.md
@ -7,27 +7,29 @@ Global Highlights Hub 海外供应商平台
 2. 运行开发环境：npm run dev 或者 start.bat
 3. 打包代码：npm run build 或者 build.bat

+// "push:tag": "npm version patch && git push origin master",
+

 ## 相关文档
-需求文档 https://www.kdocs.cn/l/csZrIZlpuF2i  
-dayjs https://dayjs.gitee.io/docs/zh-CN/manipulate/start-of  
-antd https://ant-design.antgroup.com/components/upload-cn#uploadfile  
-反馈表案例 https://www.chinahighlights.com/customerservice/feedback/PostTourSurveyFormToWLGH.asp?LGC=1&COLI_SN=988185&MEI_SN=954295&Email=jennroth18@hotmail.com&ToC=0&ShowType=&page_class=4&dei_sn=28&country=30,490  
-国内供应商平台 http://p.mycht.cn/index.aspx  
-文档预览 https://github.com/cyntler/react-doc-viewer  
-wps的文档预览 https://wwo.wps.cn/docs/front-end/introduction/quick-start  
-pdf生成 https://github.com/ivmarcos/react-to-pdf  
-react-pdf https://react-pdf.org  
+需求文档 https://www.kdocs.cn/l/csZrIZlpuF2i
+dayjs https://dayjs.gitee.io/docs/zh-CN/manipulate/start-of
+antd https://ant-design.antgroup.com/components/upload-cn#uploadfile
+反馈表案例 https://www.chinahighlights.com/customerservice/feedback/PostTourSurveyFormToWLGH.asp?LGC=1&COLI_SN=988185&MEI_SN=954295&Email=jennroth18@hotmail.com&ToC=0&ShowType=&page_class=4&dei_sn=28&country=30,490
+国内供应商平台 http://p.mycht.cn/index.aspx
+文档预览 https://github.com/cyntler/react-doc-viewer
+wps的文档预览 https://wwo.wps.cn/docs/front-end/introduction/quick-start
+pdf生成 https://github.com/ivmarcos/react-to-pdf
+react-pdf https://react-pdf.org

 ## 阿里云OSS
-Bucket 名称：global-highlights-hub  
-Endpoint：oss-cn-hongkong.aliyuncs.com  
-global-highlights-hub.oss-cn-hongkong.aliyuncs.com  
+Bucket 名称：global-highlights-hub
+Endpoint：oss-cn-hongkong.aliyuncs.com
+global-highlights-hub.oss-cn-hongkong.aliyuncs.com



-反馈表测试链接  
-http://202.103.68.111:5173/feedback/330948  
+反馈表测试链接
+http://202.103.68.111:5173/feedback/330948

 ---

--- a/权限.sql
+++ b/权限.sql
@ -86,11 +86,3 @@ VALUES ('产品管理(供应商)', 'route=/products?from', 'page')

 INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
 VALUES (1, 1)
-INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
-VALUES (6, 2)
-INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
-VALUES (6, 3)
-INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
-VALUES (6, 4)
-INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
-VALUES (6, 5)
--- a/doc/价格管理平台.bmpr
+++ b/doc/价格管理平台.bmpr
--- a/src/main.jsx
+++ b/src/main.jsx
@ -1,43 +1,80 @@
-import React from "react";
-import ReactDOM from "react-dom/client";
+import React from 'react'
+import ReactDOM from 'react-dom/client'
 import {
  createBrowserRouter,
  RouterProvider,
-} from "react-router-dom";
-import "@/assets/global.css";
-import App from "@/views/App";
-import Standlone from "@/views/Standlone";
-import Login from "@/views/Login";
-import Logout from "@/views/Logout";
-import ErrorPage from "@/components/ErrorPage";
+} from 'react-router-dom'
+import '@/assets/global.css'
+import App from '@/views/App'
+import Standlone from '@/views/Standlone'
+import Login from '@/views/Login'
+import Logout from '@/views/Logout'
+import ErrorPage from '@/components/ErrorPage'
 import RequireAuth from '@/components/RequireAuth'
-import ReservationNewest from "@/views/reservation/Newest";
-import ReservationDetail from "@/views/reservation/Detail";
-import ChangePassword from "@/views/account/ChangePassword";
-import AccountProfile from "@/views/account/Profile";
-import AccountManagement from "@/views/account/Management";
-import RoleList from "@/views/account/RoleList";
-import FeedbackIndex from "@/views/feedback/Index";
-import FeedbackDetail from "@/views/feedback/Detail";
-import FeedbackCustomerDetail from "@/views/feedback/CustomerDetail";
-import ReportIndex from "@/views/report/Index";
-import NoticeIndex from "@/views/notice/Index";
-import NoticeDetail from "@/views/notice/Detail";
-import InvoiceIndex from "@/views/invoice/Index";
-import InvoiceDetail from "@/views/invoice/Detail";
-import InvoicePaid from "@/views/invoice/Paid";
-import InvoicePaidDetail from "@/views/invoice/PaidDetail";
-import Airticket from "@/views/airticket/Index";
-import AirticketPlan from "@/views/airticket/Plan";
+import ReservationNewest from '@/views/reservation/Newest'
+import ReservationDetail from '@/views/reservation/Detail'
+import ChangePassword from '@/views/account/ChangePassword'
+import AccountProfile from '@/views/account/Profile'
+import AccountManagement from '@/views/account/Management'
+import RoleList from '@/views/account/RoleList'
+import FeedbackIndex from '@/views/feedback/Index'
+import FeedbackDetail from '@/views/feedback/Detail'
+import FeedbackCustomerDetail from '@/views/feedback/CustomerDetail'
+import ReportIndex from '@/views/report/Index'
+import NoticeIndex from '@/views/notice/Index'
+import NoticeDetail from '@/views/notice/Detail'
+import InvoiceIndex from '@/views/invoice/Index'
+import InvoiceDetail from '@/views/invoice/Detail'
+import InvoicePaid from '@/views/invoice/Paid'
+import InvoicePaidDetail from '@/views/invoice/PaidDetail'
+import Airticket from '@/views/airticket/Index'
+import AirticketPlan from '@/views/airticket/Plan'
 import { ThemeContext } from '@/stores/ThemeContext'
 import { usingStorage } from '@/hooks/usingStorage'
 import { isNotEmpty } from '@/utils/commons'
-import { notifyAuth } from "./utils/lifecycle"
+import { notifyAuth } from './utils/lifecycle'

 import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA, PERM_AIR_TICKET } from '@/config'

-import './i18n';
+import './i18n'

+const initRouter = async () => {
+  return createBrowserRouter([
+    {
+      path: '/',
+      element: <App />,
+      errorElement: <ErrorPage />,
+      children: [
+        { index: true, element: <NoticeIndex /> },
+        { path: 'account/change-password', element: <ChangePassword />},
+        { path: 'account/profile', element: <AccountProfile />},
+        { path: 'account/management', element: <RequireAuth subject={PERM_ACCOUNT_MANAGEMENT} result={true}><AccountManagement /></RequireAuth>},
+        { path: 'account/role-list', element: <RequireAuth subject={PERM_ROLE_NEW} result={true}><RoleList /></RequireAuth>},
+        { path: 'reservation/newest', element: <RequireAuth subject={PERM_OVERSEA} result={true}><ReservationNewest /></RequireAuth>},
+        { path: 'reservation/:reservationId', element: <RequireAuth subject={PERM_OVERSEA} result={true}><ReservationDetail /></RequireAuth>},
+        { path: 'feedback', element: <RequireAuth subject={PERM_OVERSEA} result={true}><FeedbackIndex /></RequireAuth>},
+        { path: 'feedback/:GRI_SN/:CII_SN/:RefNo', element: <RequireAuth subject={PERM_OVERSEA} result={true}><FeedbackCustomerDetail /></RequireAuth>},
+        { path: 'feedback/:GRI_SN/:RefNo', element: <RequireAuth subject={PERM_OVERSEA} result={true}><FeedbackDetail /></RequireAuth>},
+        { path: 'report', element: <RequireAuth subject={PERM_OVERSEA} result={true}><ReportIndex /></RequireAuth>},
+        { path: 'notice', element: <NoticeIndex />},
+        { path: 'notice/:CCP_BLID', element: <NoticeDetail />},
+        { path: 'invoice',element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoiceIndex /></RequireAuth>},
+        { path: 'invoice/detail/:GMDSN/:GSN',element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoiceDetail /></RequireAuth>},
+        { path: 'invoice/paid',element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoicePaid /></RequireAuth>},
+        { path: 'invoice/paid/detail/:flid', element: <RequireAuth subject={PERM_OVERSEA} result={true}><InvoicePaidDetail /></RequireAuth>},
+        { path: 'airticket',element: <RequireAuth subject={PERM_AIR_TICKET} result={true}><Airticket /></RequireAuth>},
+        { path: 'airticket/plan/:coli_sn',element:<RequireAuth subject={PERM_AIR_TICKET} result={true}><AirticketPlan /></RequireAuth>},
+      ]
+    },
+    {
+      element: <Standlone />,
+      children: [
+        { path: '/login', element: <Login /> },
+        { path: '/logout', element: <Logout /> },
+      ]
+    }
+  ])
+}

 const initAppliction = async () => {

@ -46,54 +83,19 @@ const initAppliction = async () => {
  if (isNotEmpty(userId) && isNotEmpty(loginToken)) {
    await notifyAuth()
  }
-}

-await initAppliction()
-
-const router = createBrowserRouter([
-  {
-    path: "/",
-    element: <App />,
-    errorElement: <ErrorPage />,
-    children: [
-      { index: true, element: <NoticeIndex /> },
-      { path: "account/change-password", element: <ChangePassword />},
-      { path: "account/profile", element: <AccountProfile />},
-      { path: "account/management", element: <RequireAuth subject={PERM_ACCOUNT_MANAGEMENT} result={true}><AccountManagement /></RequireAuth>},
-      { path: "account/role-list", element: <RequireAuth subject={PERM_ROLE_NEW} result={true}><RoleList /></RequireAuth>},
-      { path: "reservation/newest", element: <RequireAuth subject={PERM_OVERSEA} result={true}><ReservationNewest /></RequireAuth>},
-      { path: "reservation/:reservationId", element: <RequireAuth subject={PERM_OVERSEA} result={true}><ReservationDetail /></RequireAuth>},
-      { path: "feedback", element: <RequireAuth subject={PERM_OVERSEA} result={true}><FeedbackIndex /></RequireAuth>},
-      { path: "feedback/:GRI_SN/:CII_SN/:RefNo", element: <RequireAuth subject={PERM_OVERSEA} result={true}><FeedbackCustomerDetail /></RequireAuth>},
-      { path: "feedback/:GRI_SN/:RefNo", element: <RequireAuth subject={PERM_OVERSEA} result={true}><FeedbackDetail /></RequireAuth>},
-      { path: "report", element: <RequireAuth subject={PERM_OVERSEA} result={true}><ReportIndex /></RequireAuth>},
-      { path: "notice", element: <NoticeIndex />},
-      { path: "notice/:CCP_BLID", element: <NoticeDetail />},
-      { path: "invoice",element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoiceIndex /></RequireAuth>},
-      { path: "invoice/detail/:GMDSN/:GSN",element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoiceDetail /></RequireAuth>},
-      { path: "invoice/paid",element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoicePaid /></RequireAuth>},
-      { path: "invoice/paid/detail/:flid", element: <RequireAuth subject={PERM_OVERSEA} result={true}><InvoicePaidDetail /></RequireAuth>},
-      { path: "airticket",element: <RequireAuth subject={PERM_AIR_TICKET} result={true}><Airticket /></RequireAuth>},
-      { path: "airticket/plan/:coli_sn",element:<RequireAuth subject={PERM_AIR_TICKET} result={true}><AirticketPlan /></RequireAuth>},
-    ]
-  },
-  {
-    element: <Standlone />,
-    children: [
-      { path: "/login", element: <Login /> },
-      { path: "/logout", element: <Logout /> },
-    ]
-  }
-])
+  const router = await initRouter()

+  ReactDOM.createRoot(document.getElementById('root')).render(
+    //<React.StrictMode>
+    <ThemeContext.Provider value={{ colorPrimary: '#00b96b', borderRadius: 4 }}>
+      <RouterProvider
+        router={router}
+        fallbackElement={() => <div>Loading...</div>}
+      />
+    </ThemeContext.Provider>
+    //</React.StrictMode>
+  )
+}

-ReactDOM.createRoot(document.getElementById("root")).render(
-  //<React.StrictMode>
-  <ThemeContext.Provider value={{ colorPrimary: '#00b96b', borderRadius: 4 }}>
-    <RouterProvider
-      router={router}
-      fallbackElement={() => <div>Loading...</div>}
-    />
-  </ThemeContext.Provider>
-  //</React.StrictMode>
-)
+initAppliction()
--- a/src/views/reservation/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@ -206,10 +206,6 @@ function Newest() {
      <Space direction='vertical' style={{ width: '100%' }}>
        <Title level={3}></Title>
        <SearchForm
-          // initialValue={
-          //   {
-          //   }
-          // }
          fieldsConfig={{
            shows: ['referenceNo', 'dates'],
            fieldProps: {