From e3977d03a285c696f65d6afe67ff33a7b7630e48 Mon Sep 17 00:00:00 2001
From: * <*>
Date: Mon, 31 Jul 2023 15:56:03 +0800
Subject: [PATCH] Match-id-cca500e53f98c38c092610cfe492c714e170bf7f
---
.../webpack/src/pages/dashboard/index.tsx | 39 -------------------
.../webpack/src/pages/user/components/List.js | 8 ----
.../webpack/src/pages/user/index.tsx | 1 -
.../templates/webpack/src/utils/index.js | 12 +++++-
4 files changed, 11 insertions(+), 49 deletions(-)
diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.tsx b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.tsx
index 0e12f300..6b25445f 100644
--- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.tsx
+++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.tsx
@@ -87,45 +87,6 @@ function Dashboard() {
- {/*
-
-
-
- */}
- {/*
-
-
-
-
-
- */}
- {/*
-
-
-
- */}
- {/*
-
-
-
- */}
- {/*
-
-
-
-
-
- */}
- {/*
-
-
-
- */}
);
diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.js
index d65d55c3..a3a54c9b 100644
--- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.js
+++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.js
@@ -23,14 +23,6 @@ function List({ onDeleteItem, onEditItem, ...tableProps }) {
};
const columns = [
- {
- title: Avatar,
- dataIndex: 'avatar',
- key: 'avatar',
- width: '7%',
- fixed: 'left',
- render: text => ,
- },
{
title: Name,
dataIndex: 'name',
diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/index.tsx b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/index.tsx
index b76db303..66c4c24a 100644
--- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/index.tsx
+++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/index.tsx
@@ -22,7 +22,6 @@ function User({ location, history }) {
const handleRefresh = newQuery => {
const { search, pathname } = location;
-
const params = {
...parseSearch(search),
...newQuery,
diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.js
index d33b9423..6c87d5ec 100644
--- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.js
+++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.js
@@ -163,6 +163,16 @@ export function setLocale(language) {
export function parseSearch(search) {
const searchObj = {};
- search.replace(/([^?&=]+)=([^&]+)/g, (_, k, v) => (searchObj[k] = decodeURI(v)));
+ search.replace(/([^?&=]+)=([^&]+)/g, (_, k, v) => {
+ if (k === "address") {
+ if (searchObj[k]) {
+ searchObj[k].push(decodeURI(v));
+ } else {
+ searchObj[k] = [decodeURI(v)]
+ }
+ } else {
+ searchObj[k] = decodeURI(v)
+ }
+ });
return searchObj;
}