diff --git a/package.json b/package.json index c40d498..b33bad6 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@better-scroll/core": "2.5.1", "@elysiajs/eden": "^1.4.5", "@iconify/vue": "5.0.0", - "@riwa/api-types": "http://192.168.1.7:9528/api/riwa-eden-0.0.144.tgz", + "@riwa/api-types": "http://192.168.1.7:9528/api/riwa-eden-0.0.145.tgz", "@sa/axios": "workspace:*", "@sa/color": "workspace:*", "@sa/hooks": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bc99015..064fef7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: 5.0.0 version: 5.0.0(vue@3.5.25(typescript@5.9.3)) '@riwa/api-types': - specifier: http://192.168.1.7:9528/api/riwa-eden-0.0.144.tgz - version: '@riwa/eden@http://192.168.1.7:9528/api/riwa-eden-0.0.144.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))' + specifier: http://192.168.1.7:9528/api/riwa-eden-0.0.145.tgz + version: '@riwa/eden@http://192.168.1.7:9528/api/riwa-eden-0.0.145.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))' '@sa/axios': specifier: workspace:* version: link:packages/axios @@ -1230,9 +1230,9 @@ packages: '@quansync/fs@0.1.6': resolution: {integrity: sha512-zoA8SqQO11qH9H8FCBR7NIbowYARIPmBz3nKjgAaOUDi/xPAAu1uAgebtV7KXHTc6CDZJVRZ1u4wIGvY5CWYaw==} - '@riwa/eden@http://192.168.1.7:9528/api/riwa-eden-0.0.144.tgz': - resolution: {tarball: http://192.168.1.7:9528/api/riwa-eden-0.0.144.tgz} - version: 0.0.144 + '@riwa/eden@http://192.168.1.7:9528/api/riwa-eden-0.0.145.tgz': + resolution: {tarball: http://192.168.1.7:9528/api/riwa-eden-0.0.145.tgz} + version: 0.0.145 peerDependencies: '@elysiajs/eden': ^1.4.5 @@ -5651,7 +5651,7 @@ snapshots: dependencies: quansync: 0.3.0 - '@riwa/eden@http://192.168.1.7:9528/api/riwa-eden-0.0.144.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))': + '@riwa/eden@http://192.168.1.7:9528/api/riwa-eden-0.0.145.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))': dependencies: '@elysiajs/eden': 1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)) diff --git a/src/views/rwa/product/components/add.vue b/src/views/rwa/product/components/add.vue index 08537ff..246a0d4 100644 --- a/src/views/rwa/product/components/add.vue +++ b/src/views/rwa/product/components/add.vue @@ -21,7 +21,7 @@ const { data } = safeClient( ); const form = ref({ - icon: '', + iconifyIcon: '', name: '', code: '', categoryId: '', @@ -32,7 +32,7 @@ const form = ref({ }); const rules: FormRules = { - icon: [{ required: true, message: '请选择产品图标', trigger: ['blur', 'input'] }], + iconifyIcon: [{ required: true, message: '请选择产品图标', trigger: ['blur', 'input'] }], name: [{ required: true, message: '请输入产品名称', trigger: ['blur', 'input'] }], code: [ { required: true, message: '请输入产品编号', trigger: ['blur', 'input'] }, @@ -95,8 +95,8 @@ function handleCreateDraftAndSubmit() { :rules="rules" require-mark-placement="left" > - - + + diff --git a/src/views/rwa/product/components/edit.vue b/src/views/rwa/product/components/edit.vue index e11ffd4..7f74997 100644 --- a/src/views/rwa/product/components/edit.vue +++ b/src/views/rwa/product/components/edit.vue @@ -27,7 +27,7 @@ const { data: categories } = safeClient( const form = ref({ id: props.data.id, - icon: props.data.icon, + iconifyIcon: props.data.iconifyIcon, name: props.data.name, code: props.data.code, categoryId: props.data.categoryId, @@ -38,7 +38,7 @@ const form = ref({ }); const rules: FormRules = { - icon: [{ required: true, message: '请选择产品图标', trigger: ['blur', 'input'] }], + iconifyIcon: [{ required: true, message: '请选择产品图标', trigger: ['blur', 'input'] }], name: [{ required: true, message: '请输入产品名称', trigger: ['blur', 'input'] }], code: [ { required: true, message: '请输入产品编号', trigger: ['blur', 'input'] }, @@ -90,8 +90,8 @@ function handleSubmit() { :rules="rules" require-mark-placement="left" > - - + + diff --git a/src/views/rwa/product/index.vue b/src/views/rwa/product/index.vue index d9d3c3c..9a3d789 100644 --- a/src/views/rwa/product/index.vue +++ b/src/views/rwa/product/index.vue @@ -5,6 +5,7 @@ import { NDatePicker, useDialog, useMessage } from 'naive-ui'; import { client, safeClient } from '@/service/api'; import type { TableBaseColumns, TableFetchData, TableFilterColumns, TableInst } from '@/components/table'; import { RwaStatusEnum } from '@/enum'; +import SvgIcon from '@/components/custom/svg-icon.vue'; import Add from './components/add.vue'; import Edit from './components/edit.vue'; import Editions from './components/editions.vue'; @@ -32,6 +33,13 @@ const columns: TableBaseColumns = [ type: 'selection', width: 60 }, + { + title: '产品图标', + key: 'iconifyIcon', + render: (row: any) => { + return h(SvgIcon, { icon: row.iconifyIcon }); + } + }, { title: '产品代码', key: 'code'