id 支持字符串格式 #3

steedos · Jul 26, 2023 · 6c03f36 · 6c03f36
1 parent c8434ed
commit 6c03f36
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.jsx b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.jsx
@@ -54,7 +54,7 @@ class Dashboard extends Component {
     isAdditionalInfoVisible: PropTypes.bool,
 
     dashboard: PropTypes.object,
-    dashboardId: PropTypes.number,
+    dashboardId: PropTypes.string, //PropTypes.number
     parameters: PropTypes.array,
     parameterValues: PropTypes.object,
     editingParameter: PropTypes.object,

diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp.jsx b/frontend/src/metabase/dashboard/containers/DashboardApp.jsx
@@ -114,7 +114,7 @@ const DashboardApp = props => {
   const { isRunning, isLoadingComplete, dashboard } = props;
 
   const [editingOnLoad] = useState(options.edit);
-  const [addCardOnLoad] = useState(options.add && parseInt(options.add));
+  const [addCardOnLoad] = useState(options.add && options.add); //@steedos useState(options.add && parseInt(options.add));
 
   const [isShowingToaster, setIsShowingToaster] = useState(false);
 

diff --git a/frontend/src/metabase/lib/urls/utils.ts b/frontend/src/metabase/lib/urls/utils.ts
@@ -1,8 +1,10 @@
 export function appendSlug(path: string | number, slug?: string) {
-  return slug ? `${path}-${slug}` : String(path);
+  return String(path);
+  // return slug ? `${path}-${slug}` : String(path);
 }
 
 export function extractEntityId(slug = "") {
+  return slug;
   const id = parseInt(slug, 10);
   return Number.isSafeInteger(id) ? id : undefined;
 }