Skip to content

Commit

Permalink
chore: update
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoxian521 committed Apr 18, 2024
1 parent 29b06c5 commit ed71fe7
Show file tree
Hide file tree
Showing 30 changed files with 53 additions and 43 deletions.
2 changes: 1 addition & 1 deletion locales/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ menus:
pureTimeline: Time Line
pureLineTree: LineTree
pureList: List Page
pureListCard: Card List Page
pureCardList: Card List Page
pureDebounce: Debounce & Throttle
pureFormDesign: Form Design
pureBarcode: Barcode
Expand Down
2 changes: 1 addition & 1 deletion locales/zh-CN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ menus:
pureTimeline: 时间线
pureLineTree: 树形连接线
pureList: 列表页面
pureListCard: 卡片列表页
pureCardList: 卡片列表页
pureDebounce: 防抖节流
pureFormDesign: 表单设计器
pureBarcode: 条形码
Expand Down
4 changes: 2 additions & 2 deletions src/router/modules/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ export default {
children: [
{
path: "/list/card",
name: "ListCard",
name: "CardList",
component: () => import("@/views/list/card/index.vue"),
meta: {
icon: "ri:bank-card-line",
title: $t("menus.pureListCard"),
title: $t("menus.pureCardList"),
showParent: true
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import { ref } from "vue";
import { message } from "@/utils/message";
import { deviceDetection } from "@pureadmin/utils";
defineOptions({
name: "AccountManagement"
});
const list = ref([
{
title: "账户密码",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import { ref } from "vue";
import { message } from "@/utils/message";
import { deviceDetection } from "@pureadmin/utils";
defineOptions({
name: "Preferences"
});
const list = ref([
{
title: "账户密码",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import ReCropperPreview from "@/components/ReCropperPreview";
import { createFormData, deviceDetection } from "@pureadmin/utils";
import uploadLine from "@iconify-icons/ri/upload-line";
defineOptions({
name: "Profile"
});
const imgSrc = ref("");
const cropperInfo = ref();
const cropRef = ref();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import { reactive, ref, onMounted } from "vue";
import { deviceDetection } from "@pureadmin/utils";
import type { PaginationProps } from "@pureadmin/table";
defineOptions({
name: "SecurityLog"
});
const loading = ref(true);
const dataList = ref([]);
const pagination = reactive<PaginationProps>({
Expand Down
8 changes: 4 additions & 4 deletions src/views/account-settings/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { getMine } from "@/api/user";
import { useRouter } from "vue-router";
import { ref, onBeforeMount } from "vue";
import { ReText } from "@/components/ReText";
import Profile from "./components/profile.vue";
import Preferences from "./components/preferences.vue";
import SecurityLog from "./components/securityLog.vue";
import Profile from "./components/Profile.vue";
import Preferences from "./components/Preferences.vue";
import SecurityLog from "./components/SecurityLog.vue";
import { useGlobal, deviceDetection } from "@pureadmin/utils";
import AccountManagement from "./components/accountManagement.vue";
import AccountManagement from "./components/AccountManagement.vue";
import TopCollapse from "@/layout/components/sidebar/topCollapse.vue";
import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 3 additions & 9 deletions src/views/editor/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import base from "./base.vue";
import multi from "./multi.vue";
import picUpload from "./picUpload.vue";

const Base = base;
const Multi = multi;
const PicUpload = picUpload;

export { Base, Multi, PicUpload };
export { default as EditorBase } from "./EditorBase.vue";
export { default as EditorMulti } from "./EditorMulti.vue";
export { default as EditorUpload } from "./EditorUpload.vue";
8 changes: 4 additions & 4 deletions src/views/editor/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { ref } from "vue";
import { Base, Multi, PicUpload } from "./components";
import { EditorBase, EditorMulti, EditorUpload } from "./components";
defineOptions({
name: "Editor"
Expand Down Expand Up @@ -34,13 +34,13 @@ const activeNames = ref("1");
</template>
<el-collapse v-model="activeNames" accordion>
<el-collapse-item title="基础用法" name="1">
<Base v-if="activeNames === '1'" />
<EditorBase v-if="activeNames === '1'" />
</el-collapse-item>
<el-collapse-item title="多个富文本" name="2">
<Multi v-if="activeNames === '2'" />
<EditorMulti v-if="activeNames === '2'" />
</el-collapse-item>
<el-collapse-item title="自定义图片上传" name="3">
<PicUpload v-if="activeNames === '3'" />
<EditorUpload v-if="activeNames === '3'" />
</el-collapse-item>
</el-collapse>
</el-card>
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions src/views/list/card/index.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<script setup lang="ts">
import Card from "./components/Card.vue";
import { getCardList } from "@/api/list";
import { message } from "@/utils/message";
import { ElMessageBox } from "element-plus";
import { ref, onMounted, nextTick } from "vue";
import dialogForm from "./components/DialogForm.vue";
import ListCard from "./components/ListCard.vue";
import ListDialogForm from "./components/ListDialogForm.vue";
import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import AddFill from "@iconify-icons/ri/add-circle-line";
defineOptions({
name: "ListCard"
name: "CardList"
});
const svg = `
Expand Down Expand Up @@ -152,7 +152,7 @@ const handleManageProduct = product => {
:lg="6"
:xl="4"
>
<Card
<ListCard
:product="product"
@delete-item="handleDeleteItem"
@manage-product="handleManageProduct"
Expand All @@ -172,6 +172,6 @@ const handleManageProduct = product => {
/>
</template>
</div>
<dialogForm v-model:visible="formDialogVisible" :data="formData" />
<ListDialogForm v-model:visible="formDialogVisible" :data="formData" />
</div>
</template>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions src/views/login/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import Motion from "./utils/motion";
import { useRouter } from "vue-router";
import { message } from "@/utils/message";
import { loginRules } from "./utils/rule";
import phone from "./components/phone.vue";
import TypeIt from "@/components/ReTypeit";
import { debounce } from "@pureadmin/utils";
import qrCode from "./components/qrCode.vue";
import regist from "./components/regist.vue";
import update from "./components/update.vue";
import { useNav } from "@/layout/hooks/useNav";
import { useEventListener } from "@vueuse/core";
import type { FormInstance } from "element-plus";
import { $t, transformI18n } from "@/plugins/i18n";
import { operates, thirdParty } from "./utils/enums";
import { useLayout } from "@/layout/hooks/useLayout";
import LoginPhone from "./components/LoginPhone.vue";
import LoginRegist from "./components/LoginRegist.vue";
import LoginUpdate from "./components/LoginUpdate.vue";
import LoginQrCode from "./components/LoginQrCode.vue";
import { useUserStoreHook } from "@/store/modules/user";
import { initRouter, getTopMenu } from "@/router/utils";
import { bg, avatar, illustration } from "./utils/static";
Expand Down Expand Up @@ -318,13 +318,13 @@ watch(loginDay, value => {
</el-form-item>
</Motion>
<!-- 手机号登录 -->
<phone v-if="currentPage === 1" />
<LoginPhone v-if="currentPage === 1" />
<!-- 二维码登录 -->
<qrCode v-if="currentPage === 2" />
<LoginQrCode v-if="currentPage === 2" />
<!-- 注册 -->
<regist v-if="currentPage === 3" />
<LoginRegist v-if="currentPage === 3" />
<!-- 忘记密码 -->
<update v-if="currentPage === 4" />
<LoginUpdate v-if="currentPage === 4" />
</div>
</div>
</div>
Expand Down
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions src/views/welcome/components/WelcomeCharts/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export { default as ChartBar } from "./ChartBar.vue";
export { default as ChartLine } from "./ChartLine.vue";
export { default as ChartRound } from "./ChartRound.vue";
3 changes: 0 additions & 3 deletions src/views/welcome/components/chart/index.ts

This file was deleted.

12 changes: 6 additions & 6 deletions src/views/welcome/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import { ref, markRaw } from "vue";
import ReCol from "@/components/ReCol";
import { useDark, randomGradient } from "./utils";
import PureTable from "./components/table/index.vue";
import { ReNormalCountTo } from "@/components/ReCountTo";
import { useRenderFlicker } from "@/components/ReFlicker";
import { barChart, lineChart, roundChart } from "./components/chart";
import WelcomeTable from "./components/WelcomeTable/index.vue";
import Segmented, { type OptionsType } from "@/components/ReSegmented";
import { ChartBar, ChartLine, ChartRound } from "./components/WelcomeCharts";
import { chartData, barChartData, progressData, latestNewsData } from "./data";
defineOptions({
Expand Down Expand Up @@ -78,13 +78,13 @@ const optionsBasis: Array<OptionsType> = [
/>
<p class="font-medium text-green-500">{{ item.percent }}</p>
</div>
<lineChart
<ChartLine
v-if="item.data.length > 1"
class="!w-1/2"
:color="item.color"
:data="item.data"
/>
<roundChart v-else class="!w-1/2" />
<ChartRound v-else class="!w-1/2" />
</div>
</el-card>
</re-col>
Expand Down Expand Up @@ -112,7 +112,7 @@ const optionsBasis: Array<OptionsType> = [
<Segmented v-model="curWeek" :options="optionsBasis" />
</div>
<div class="flex justify-between items-start mt-3">
<barChart
<ChartBar
:requireData="barChartData[curWeek].requireData"
:questionData="barChartData[curWeek].questionData"
/>
Expand Down Expand Up @@ -188,7 +188,7 @@ const optionsBasis: Array<OptionsType> = [
<div class="flex justify-between">
<span class="text-md font-medium">数据统计</span>
</div>
<PureTable class="mt-3" />
<WelcomeTable class="mt-3" />
</el-card>
</re-col>

Expand Down

0 comments on commit ed71fe7

Please sign in to comment.