twh_eastasia/vue-pure-admin
1
0
Fork 0
mirror of https://github.com/pure-admin/vue-pure-admin.git synced 2025-06-02 10:57:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into refactor/tailwindcss

Browse Source
This commit is contained in:
xiaoxian521 2025-04-08 15:12:56 +08:00
commit ed2a24f1e3
9 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -56,7 +56,7 @@
"@pureadmin/table": "^3.2.1",
"@pureadmin/utils": "^2.6.0",
"@vue-flow/background": "^1.3.2",
"@vue-flow/core": "^1.42.4",
"@vue-flow/core": "^1.42.5",
"@vueuse/core": "^12.8.2",
"@vueuse/motion": "^2.2.6",
"@wangeditor/editor": "^5.1.23",

32
pnpm-lock.yaml generated
View File

@ -34,10 +34,10 @@ importers:
version: 2.6.0(echarts@5.6.0)(vue@3.5.13(typescript@5.8.2))
'@vue-flow/background':
specifier: ^1.3.2
version: 1.3.2(@vue-flow/core@1.42.4(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))
version: 1.3.2(@vue-flow/core@1.42.5(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))
'@vue-flow/core':
specifier: ^1.42.4
version: 1.42.4(vue@3.5.13(typescript@5.8.2))
specifier: ^1.42.5
version: 1.42.5(vue@3.5.13(typescript@5.8.2))
'@vueuse/core':
specifier: ^12.8.2
version: 12.8.2(typescript@5.8.2)
@ -1123,6 +1123,10 @@ packages:
resolution: {integrity: sha512-dF2iMMy8P9uKVHV/20LA1ulFLL+MKSbfMiixSmn6fpwqzvix38OIc7ebgnFbBqElvghZCW9ACtzKTGKsTGTWGA==}
engines: {node: '>= 16'}
'@intlify/shared@11.1.3':
resolution: {integrity: sha512-pTFBgqa/99JRA2H1qfyqv97MKWJrYngXBA/I0elZcYxvJgcCw3mApAoPW3mJ7vx3j+Ti0FyKUFZ4hWxdjKaxvA==}
engines: {node: '>= 16'}
'@intlify/unplugin-vue-i18n@6.0.5':
resolution: {integrity: sha512-0MKaYhLvM46Mtm+OArkK75ztmqaFfhIvnm5mg8XKqCPAKVAK98o+8tB6gUQFkKrF5PMYsNXvyMJCi40cRCDJbA==}
engines: {node: '>= 18'}
@ -1878,8 +1882,8 @@ packages:
'@vue-flow/core': ^1.23.0
vue: ^3.3.0
'@vue-flow/core@1.42.4':
resolution: {integrity: sha512-olaLCXAd/tmcWctQTGv1dLLhHHxMKM4/zqRcQxvmCb/kIJQvEkaXeJ0DGRrfV/VCrkvYRaLUJ0JnVsW8bYFLsQ==}
'@vue-flow/core@1.42.5':
resolution: {integrity: sha512-fNaBzt5i/JYHIzfmR4wtT1TkpfZBgB+Pe/LjCG+aXdNOpeveuegv3AmEcU3GFqf/uYrd1rsma877Lncu1uwz1w==}
peerDependencies:
vue: ^3.3.0
@ -6269,7 +6273,7 @@ snapshots:
'@intlify/bundle-utils@10.0.1(vue-i18n@11.1.2(vue@3.5.13(typescript@5.8.2)))':
dependencies:
'@intlify/message-compiler': 11.1.2
'@intlify/shared': 11.1.2
'@intlify/shared': 11.1.3
acorn: 8.14.1
escodegen: 2.1.0
estree-walker: 2.0.2
@ -6292,12 +6296,14 @@ snapshots:
'@intlify/shared@11.1.2': {}
'@intlify/shared@11.1.3': {}
'@intlify/unplugin-vue-i18n@6.0.5(@vue/compiler-dom@3.5.13)(eslint@9.23.0(jiti@2.4.2))(rollup@4.37.0)(typescript@5.8.2)(vue-i18n@11.1.2(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))':
dependencies:
'@eslint-community/eslint-utils': 4.5.1(eslint@9.23.0(jiti@2.4.2))
'@intlify/bundle-utils': 10.0.1(vue-i18n@11.1.2(vue@3.5.13(typescript@5.8.2)))
'@intlify/shared': 11.1.2
'@intlify/vue-i18n-extensions': 8.0.0(@intlify/shared@11.1.2)(@vue/compiler-dom@3.5.13)(vue-i18n@11.1.2(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))
'@intlify/shared': 11.1.3
'@intlify/vue-i18n-extensions': 8.0.0(@intlify/shared@11.1.3)(@vue/compiler-dom@3.5.13)(vue-i18n@11.1.2(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))
'@rollup/pluginutils': 5.1.4(rollup@4.37.0)
'@typescript-eslint/scope-manager': 8.28.0
'@typescript-eslint/typescript-estree': 8.28.0(typescript@5.8.2)
@ -6319,11 +6325,11 @@ snapshots:
- supports-color
- typescript
'@intlify/vue-i18n-extensions@8.0.0(@intlify/shared@11.1.2)(@vue/compiler-dom@3.5.13)(vue-i18n@11.1.2(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))':
'@intlify/vue-i18n-extensions@8.0.0(@intlify/shared@11.1.3)(@vue/compiler-dom@3.5.13)(vue-i18n@11.1.2(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))':
dependencies:
'@babel/parser': 7.27.0
optionalDependencies:
'@intlify/shared': 11.1.2
'@intlify/shared': 11.1.3
'@vue/compiler-dom': 3.5.13
vue: 3.5.13(typescript@5.8.2)
vue-i18n: 11.1.2(vue@3.5.13(typescript@5.8.2))
@ -7095,12 +7101,12 @@ snapshots:
path-browserify: 1.0.1
vscode-uri: 3.1.0
'@vue-flow/background@1.3.2(@vue-flow/core@1.42.4(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))':
'@vue-flow/background@1.3.2(@vue-flow/core@1.42.5(vue@3.5.13(typescript@5.8.2)))(vue@3.5.13(typescript@5.8.2))':
dependencies:
'@vue-flow/core': 1.42.4(vue@3.5.13(typescript@5.8.2))
'@vue-flow/core': 1.42.5(vue@3.5.13(typescript@5.8.2))
vue: 3.5.13(typescript@5.8.2)
'@vue-flow/core@1.42.4(vue@3.5.13(typescript@5.8.2))':
'@vue-flow/core@1.42.5(vue@3.5.13(typescript@5.8.2))':
dependencies:
'@vueuse/core': 10.11.1(vue@3.5.13(typescript@5.8.2))
d3-drag: 3.0.0

2
src/views/components/waterfall/api.ts
View File

@ -14,7 +14,7 @@ function randomColor() {
return COLORS[getRandomNum(0, 4)];
}
const website = "https://www.getphotoblanket.com";
const website = "https://wanderprints.com";
export const getList = ({ page = 1, pageSize = 20 }) => {
const url = `${website}/products.json?page=${page}&limit=${pageSize}`;

2
src/views/list/card/index.vue
View File

@ -110,7 +110,7 @@ const handleManageProduct = product => {
<el-icon class="el-input__icon">
<IconifyIconOffline
v-show="searchValue.length === 0"
icon="ri:search-line"
icon="ri/search-line"
/>
</el-icon>
</template>

2
src/views/system/dept/index.vue
View File

@ -63,7 +63,7 @@ function onFullscreen() {
<el-form-item>
<el-button
type="primary"
:icon="useRenderIcon('ri:search-line')"
:icon="useRenderIcon('ri/search-line')"
:loading="loading"
@click="onSearch"
>

2
src/views/system/menu/index.vue
View File

@ -53,7 +53,7 @@ function onFullscreen() {
<el-form-item>
<el-button
type="primary"
:icon="useRenderIcon('ri:search-line')"
:icon="useRenderIcon('ri/search-line')"
:loading="loading"
@click="onSearch"
>

2
src/views/system/role/index.vue
View File

@ -128,7 +128,7 @@ onMounted(() => {
<el-form-item>
<el-button
type="primary"
:icon="useRenderIcon('ri:search-line')"
:icon="useRenderIcon('ri/search-line')"
:loading="loading"
@click="onSearch"
>

2
src/views/system/user/index.vue
View File

@ -98,7 +98,7 @@ const {
<el-form-item>
<el-button
type="primary"
:icon="useRenderIcon('ri:search-line')"
:icon="useRenderIcon('ri/search-line')"
:loading="loading"
@click="onSearch"
>

10
src/views/vue-flow/layouting/processNode.vue
View File

@ -1,6 +1,6 @@
<script setup lang="ts">
import { toRef } from "vue";
import { Handle, useHandleConnections } from "@vue-flow/core";
import { Handle, useNodeConnections } from "@vue-flow/core";
const props = defineProps({
data: {
@ -15,12 +15,12 @@ const props = defineProps({
}
});
const sourceConnections = useHandleConnections({
type: "target"
const sourceConnections = useNodeConnections({
handleType: "target"
});
const targetConnections = useHandleConnections({
type: "source"
const targetConnections = useNodeConnections({
handleType: "source"
});
const isSender = toRef(() => sourceConnections.value.length <= 0);