diff --git a/.commitlintrc.cjs b/.commitlintrc.cjs new file mode 100644 index 00000000..34fee141 --- /dev/null +++ b/.commitlintrc.cjs @@ -0,0 +1,28 @@ +module.exports = { + extends: ['@commitlint/config-conventional'], + rules: { + 'type-enum': [ + 2, + 'always', + [ + 'build', // 编译相关修改（新版本发布） + 'feat', // 新功能 + 'fix', // 修复bug + 'update', // 更新某功能 + 'refactor', // 重构 + 'docs', // 文档 + 'chore', // 增加依赖或库 + 'style', // 格式（不影响代码变动） + 'revert', // 撤销commit 回滚上一版本 + 'perf', // 性能优化 + ] + ], + 'type-case': [0], + 'type-empty': [0], + 'scope-empty': [0], + 'scope-case': [0], + 'subject-full-stop': [0, 'never'], + 'subject-case': [0, 'never'], + 'header-max-length': [0, 'always', 72] + } +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1b4684cb..21c8f822 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ node_modules dist dist-ssr *.local -yarn.lock components.d.ts # Editor directories and files diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100644 index 00000000..c160a771 --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" + +npx --no -- commitlint --edit ${1} diff --git a/components.d.ts b/components.d.ts deleted file mode 100644 index 41eef524..00000000 --- a/components.d.ts +++ /dev/null @@ -1,40 +0,0 @@ -// generated by unplugin-vue-components -// We suggest you to commit this file into source control -// Read more: https://github.com/vuejs/core/pull/3399 -import '@vue/runtime-core' - -export {} - -declare module '@vue/runtime-core' { - export interface GlobalComponents { - ABadge: typeof import('ant-design-vue/es')['Badge'] - AButton: typeof import('ant-design-vue/es')['Button'] - ACard: typeof import('ant-design-vue/es')['Card'] - ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] - ACol: typeof import('ant-design-vue/es')['Col'] - ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] - ADivider: typeof import('ant-design-vue/es')['Divider'] - AForm: typeof import('ant-design-vue/es')['Form'] - AFormItem: typeof import('ant-design-vue/es')['FormItem'] - AInput: typeof import('ant-design-vue/es')['Input'] - AInputNumber: typeof import('ant-design-vue/es')['InputNumber'] - AInputPassword: typeof import('ant-design-vue/es')['InputPassword'] - AModal: typeof import('ant-design-vue/es')['Modal'] - APopconfirm: typeof import('ant-design-vue/es')['Popconfirm'] - ARow: typeof import('ant-design-vue/es')['Row'] - ASelect: typeof import('ant-design-vue/es')['Select'] - ASpin: typeof import('ant-design-vue/es')['Spin'] - ATooltip: typeof import('ant-design-vue/es')['Tooltip'] - ATree: typeof import('ant-design-vue/es')['Tree'] - AUpload: typeof import('ant-design-vue/es')['Upload'] - BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default'] - CardBox: typeof import('./src/components/CardBox/index.vue')['default'] - GeoComponent: typeof import('./src/components/GeoComponent/index.vue')['default'] - MonacoEditor: typeof import('./src/components/MonacoEditor/index.vue')['default'] - PermissionButton: typeof import('./src/components/PermissionButton/index.vue')['default'] - RouterLink: typeof import('vue-router')['RouterLink'] - RouterView: typeof import('vue-router')['RouterView'] - TitleComponent: typeof import('./src/components/TitleComponent/index.vue')['default'] - ValueItem: typeof import('./src/components/ValueItem/index.vue')['default'] - } -} diff --git a/package.json b/package.json index 155d61f0..896ac93a 100644 --- a/package.json +++ b/package.json @@ -8,15 +8,18 @@ "build": "vite build --mode production", "preview": "vite preview", "eslint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src", - "prettier": "prettier --write" + "lint": "eslint src --fix --ext .ts,.tsx,.vue,.js,.jsx", + "prettier": "prettier --write", + "prepare": "husky install" }, "dependencies": { "@vitejs/plugin-vue-jsx": "^3.0.0", "@vuemap/vue-amap": "^1.1.20", "ant-design-vue": "^3.2.15", "axios": "^1.2.1", - "js-cookie": "^3.0.1", "echarts": "^5.4.1", + "jetlinks-store": "^0.0.3", + "js-cookie": "^3.0.1", "less": "^4.1.3", "less-loader": "^11.1.0", "lodash-es": "^4.17.21", @@ -26,20 +29,35 @@ "unplugin-auto-import": "^0.12.1", "unplugin-vue-components": "^0.22.12", "vue": "^3.2.45", - "vue-router": "^4.1.6", - "jetlinks-store": "^0.0.3" + "vue-router": "^4.1.6" }, "devDependencies": { + "@commitlint/cli": "^17.4.1", + "@commitlint/config-conventional": "^17.4.0", "@types/lodash-es": "^4.17.6", "@types/moment": "^2.13.0", "@types/node": "^18.11.17", "@vitejs/plugin-vue": "^4.0.0", "@vuemap/unplugin-resolver": "^1.0.4", "autoprefixer": "^10.4.13", + "commitlint": "^17.4.1", + "husky": "^8.0.0", + "lint-staged": "^13.1.0", + "mrm": "^4.1.13", "prettier": "^2.8.1", "typescript": "^4.9.3", "vite": "^4.0.0", "vite-plugin-html": "^3.2.0", + "vite-plugin-vue-setup-extend": "^0.4.0", "vue-tsc": "^1.0.11" + }, + "lint-staged": { + "**/*.{vue,js,jsx,ts,tsx}": [ + "npm run lint", + "prettier --write" + ], + "**/*.{html,css,less,md}": [ + "prettier --write" + ] } } diff --git a/src/api/device.ts b/src/api/device.ts new file mode 100644 index 00000000..2399ab2c --- /dev/null +++ b/src/api/device.ts @@ -0,0 +1,3 @@ +import server from '@/utils/request' + +export const deleteMetadata = (deviceId: string) => server.remove(`/device-instance/${deviceId}/metadata`) \ No newline at end of file diff --git a/src/api/link/certificate.js b/src/api/link/certificate.js new file mode 100644 index 00000000..24fe25f9 --- /dev/null +++ b/src/api/link/certificate.js @@ -0,0 +1,3 @@ +import server from '@/utils/request' + +export const save = (data) => server.post(`/network/certificate`, data) \ No newline at end of file diff --git a/src/components/Form/FormBuilder.vue b/src/components/Form/FormBuilder.vue new file mode 100644 index 00000000..d1a74645 --- /dev/null +++ b/src/components/Form/FormBuilder.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/components/Form/index.ts b/src/components/Form/index.ts new file mode 100644 index 00000000..1ae62176 --- /dev/null +++ b/src/components/Form/index.ts @@ -0,0 +1,3 @@ +import FormBuilder from './FormBuilder.vue' + +export default FormBuilder \ No newline at end of file diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue new file mode 100644 index 00000000..9b21c30c --- /dev/null +++ b/src/components/Table/index.vue @@ -0,0 +1,168 @@ + + + + + \ No newline at end of file diff --git a/src/components/Table/index.module.less b/src/components/Table/old/index.module.less similarity index 100% rename from src/components/Table/index.module.less rename to src/components/Table/old/index.module.less diff --git a/src/components/Table/index.tsx b/src/components/Table/old/index.tsx similarity index 93% rename from src/components/Table/index.tsx rename to src/components/Table/old/index.tsx index 8e774af4..39ac9e9c 100644 --- a/src/components/Table/index.tsx +++ b/src/components/Table/old/index.tsx @@ -1,7 +1,8 @@ import { UnorderedListOutlined, AppstoreOutlined } from '@ant-design/icons-vue' import styles from './index.module.less' -import { Space, Pagination, Table, Empty } from 'ant-design-vue' +import { Pagination, Table, Empty } from 'ant-design-vue' import type { TableProps } from 'ant-design-vue/es/table' + enum ModelEnum { TABLE = 'TABLE', CARD = 'CARD', @@ -17,18 +18,15 @@ export declare type RequestData = { }; status: number; } & Record; -// interface ColumnType extends interface JTableProps extends TableProps{ - // columns?: ColumnsType; request: (params: Record & { - pageSize?: number; - pageIndex?: number; + pageSize: number; + pageIndex: number; }) => Promise>; - cardBodyClass?: string; + cardBodyClass: string; } - const JTable = defineComponent({ name: 'JTable', slots: [ @@ -38,10 +36,15 @@ const JTable = defineComponent({ emits: [ 'modelChange', // 切换卡片和表格 ], - setup(props: JTableProps, { slots, emit }){ + props: { + cardBodyClass: '', + request: undefined, + columns: [] + } as any, + setup(props ,{ slots, emit }){ const model = ref(ModelEnum.CARD); // 模式切换 const column = ref(3); - console.log(props) + console.log(props.columns, props.request) const dataSource = ref([ { key: '1', @@ -81,6 +84,8 @@ const JTable = defineComponent({ }, ]) + // 请求数据 + onMounted(() => { }) diff --git a/src/components/index.ts b/src/components/index.ts index fcfbcedc..7bcdd04e 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,14 +1,16 @@ import type { App } from 'vue' import AIcon from './AIcon' import PermissionButton from './PermissionButton/index.vue' -import JTable from './Table/index' +import JTable from './Table/index.vue' import TitleComponent from "./TitleComponent/index.vue"; +import Form from './Form' export default { install(app: App) { app.component('AIcon', AIcon) - app.component('PermissionButton', PermissionButton) - app.component('JTable', JTable) - app.component('TitleComponent', TitleComponent) + .component('PermissionButton', PermissionButton) + .component('JTable', JTable) + .component('TitleComponent', TitleComponent) + .component('Form', Form) } } diff --git a/src/router/index.ts b/src/router/index.ts index cac0740a..2da56030 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -10,7 +10,6 @@ const router = createRouter({ router.beforeEach((to, from, next) => { const token = LocalStore.get(TOKEN_KEY) - next() // 测试用, 可删除 if (token) { next() } else { diff --git a/src/router/menu.ts b/src/router/menu.ts index 95aaf990..525ac2e8 100644 --- a/src/router/menu.ts +++ b/src/router/menu.ts @@ -29,7 +29,7 @@ export default [ component: () => import('@/views/demo/index.vue') }, { - path: '/bind', + path: '/account/center/bind', component: () => import('@/views/account/Center/bind/index.vue') }, { @@ -38,7 +38,11 @@ export default [ }, { path: '/table', - component: () => import('@/views/table/index.vue') + component: () => import('@/views/demo/table/index.vue') + }, + { + path: '/form', + component: () => import('@/views/demo/Form.vue') }, // end: 测试用, 可删除 diff --git a/src/router/router.ts b/src/router/router.ts deleted file mode 100644 index bc22c28f..00000000 --- a/src/router/router.ts +++ /dev/null @@ -1,240 +0,0 @@ -/** 路由Code */ -export enum MENUS_CODE { - 'home' = 'home', - 'Analysis/CPU' = 'Analysis/CPU', - 'Analysis/DeviceChart' = 'Analysis/DeviceChart', - 'Analysis/DeviceMessage' = 'Analysis/DeviceMessage', - 'Analysis/Jvm' = 'Analysis/Jvm', - 'Analysis/MessageChart' = 'Analysis/MessageChart', - 'Analysis' = 'Analysis', - 'cloud/Aliyun' = 'cloud/Aliyun', - 'cloud/Ctwing' = 'cloud/Ctwing', - 'cloud/DuerOS' = 'cloud/DuerOS', - 'cloud/Onenet' = 'cloud/Onenet', - 'device/Alarm' = 'device/Alarm', - 'device/Category/Save' = 'device/Category/Save', - 'device/Category' = 'device/Category', - 'device/Command' = 'device/Command', - 'device/DataSource' = 'device/DataSource', - 'device/Instance' = 'device/Instance', - 'device/Location' = 'device/Location', - 'device/Product/Save' = 'device/Product/Save', - 'device/Product' = 'device/Product', - 'device/DashBoard' = 'device/DashBoard', - 'device/components/Alarm/Edit' = 'device/components/Alarm/Edit', - 'device/components/Alarm/Record' = 'device/components/Alarm/Record', - 'device/components/Alarm/Setting' = 'device/components/Alarm/Setting', - 'device/components/Alarm' = 'device/components/Alarm', - 'device/components/Metadata/Base/Edit' = 'device/components/Metadata/Base/Edit', - 'device/components/Metadata/Base' = 'device/components/Metadata/Base', - 'device/components/Metadata/Cat' = 'device/components/Metadata/Cat', - 'device/components/Metadata/Import' = 'device/components/Metadata/Import', - 'device/components/Metadata' = 'device/components/Metadata', - 'link/Certificate' = 'link/Certificate', - 'link/Certificate/Detail' = 'link/Certificate/Detail', - 'link/Gateway' = 'link/Gateway', - 'link/Protocol/Debug' = 'link/Protocol/Debug', - 'link/Protocol' = 'link/Protocol', - 'link/Type' = 'link/Type', - 'link/AccessConfig' = 'link/AccessConfig', - 'link/DataCollect/Dashboard' = 'link/DataCollect/Dashboard', - 'link/DataCollect/DataGathering' = 'link/DataCollect/DataGathering', - 'link/DataCollect/IntegratedQuery' = 'link/DataCollect/IntegratedQuery', - 'edge/Device' = 'edge/Device', - 'edge/Resource' = 'edge/Resource', - 'Log' = 'Log', - 'media/Cascade' = 'media/Cascade', - 'media/Cascade/Save' = 'media/Cascade/Save', - 'media/Cascade/Channel' = 'media/Cascade/Channel', - 'media/Config' = 'media/Config', - 'media/Device' = 'media/Device', - 'media/Device/Save' = 'media/Device/Save', - 'media/Device/Channel' = 'media/Device/Channel', - 'media/Device/Playback' = 'media/Device/Playback', - 'media/Reveal' = 'media/Reveal', - 'media/Stream' = 'media/Stream', - 'media/Stream/Detail' = 'media/Stream/Detail', - 'media/DashBoard' = 'media/DashBoard', - 'notice/Type' = 'notice/Type', - 'notice/Config' = 'notice/Config', - 'media/SplitScreen' = 'media/SplitScreen', - 'notice/Type/Config' = 'notice/Config', - 'notice/Config/Detail' = 'notice/Config/Detail', - 'notice/Template' = 'notice/Template', - 'notice/Template/Detail' = 'notice/Template/Detail', - 'rule-engine/DashBoard' = 'rule-engine/DashBoard', - 'rule-engine/Instance' = 'rule-engine/Instance', - 'rule-engine/SQLRule' = 'rule-engine/SQLRule', - 'rule-engine/Scene' = 'rule-engine/Scene', - 'rule-engine/Alarm/Log' = 'rule-engine/Alarm/Log', - 'rule-engine/Alarm/Log/Detail' = 'rule-engine/Alarm/Log/Detail', - 'rule-engine/Alarm/Config' = 'rule-engine/Alarm/Config', - 'rule-engine/Scene/Save' = 'rule-engine/Scene/Save', - 'rule-engine/Scene/Save2' = 'rule-engine/Scene/Save2', - 'rule-engine/Alarm/Configuration' = 'rule-engine/Alarm/Configuration', - 'rule-engine/Alarm/Configuration/Save' = 'rule-engine/Alarm/Configuration/Save', - 'simulator/Device' = 'simulator/Device', - 'system/DataSource' = 'system/DataSource', - 'system/DataSource/Management' = 'system/DataSource/Management', - 'system/Department/Assets' = 'system/Department/Assets', - 'system/Department/Member' = 'system/Department/Member', - 'system/Department' = 'system/Department', - 'system/Menu' = 'system/Menu', - 'system/Menu/Setting' = 'system/Menu/Setting', - 'system/OpenAPI' = 'system/OpenAPI', - 'system/Permission' = 'system/Permission', - 'system/Role/Detail' = 'system/Role/Detail', - 'system/Role' = 'system/Role', - 'system/Tenant/Detail/Assets' = 'system/Tenant/Detail/Assets', - 'system/Tenant/Detail/Info' = 'system/Tenant/Detail/Info', - 'system/Tenant/Detail/Member' = 'system/Tenant/Detail/Member', - 'system/Tenant/Detail/Permission' = 'system/Tenant/Detail/Permission', - 'system/Tenant/Detail' = 'system/Tenant/Detail', - 'system/Tenant' = 'system/Tenant', - 'system/User' = 'system/User', - 'system/Relationship' = 'system/Relationship', - 'system/Basis' = 'system/Basis', - 'user/Login' = 'user/Login', - 'visualization/Category' = 'visualization/Category', - 'visualization/Configuration' = 'visualization/Configuration', - 'visualization/Screen' = 'visualization/Screen', - 'device/Firmware' = 'device/Firmware', - 'device/Firmware/Task' = 'device/Firmware/Task', - 'device/Firmware/Task/Detail' = 'device/Firmware/Task/Detail', - 'device/Instance/Detail/Config/Tags' = 'device/Instance/Detail/Config/Tags', - 'device/Instance/Detail/Config' = 'device/Instance/Detail/Config', - 'device/Instance/Detail/Functions' = 'device/Instance/Detail/Functions', - 'device/Instance/Detail/Info' = 'device/Instance/Detail/Info', - 'device/Instance/Detail/Log' = 'device/Instance/Detail/Log', - 'device/Instance/Detail/MetadataLog/Event' = 'device/Instance/Detail/MetadataLog/Event', - 'device/Instance/Detail/MetadataLog/Property' = 'device/Instance/Detail/MetadataLog/Property', - 'device/Instance/Detail/Running' = 'device/Instance/Detail/Running', - 'device/Instance/Detail' = 'device/Instance/Detail', - 'device/Product/Detail/BaseInfo' = 'device/Product/Detail/BaseInfo', - 'device/Product/Detail' = 'device/Product/Detail', - 'link/AccessConfig/Detail' = 'link/AccessConfig/Detail', - 'link/DashBoard' = 'link/DashBoard', - 'system/Menu/Detail' = 'system/Menu/Detail', - 'system/Department/Detail' = 'system/Department/Detail', - 'link/Type/Detail' = 'link/Type/Detail', - 'account/Center' = 'account/Center', - 'account/NotificationSubscription' = 'account/NotificationSubscription', - 'account/NotificationRecord' = 'account/NotificationRecord', - 'account/Center/bind' = 'account/Center/bind', - 'Northbound/DuerOS' = 'Northbound/DuerOS', - 'Northbound/DuerOS/Detail' = 'Northbound/DuerOS/Detail', - 'Northbound/AliCloud' = 'Northbound/AliCloud', - 'Northbound/AliCloud/Detail' = 'Northbound/AliCloud/Detail', - 'system/Platforms' = 'system/Platforms', - 'system/Platforms/Api' = 'system/Platforms/Api', - 'system/Platforms/View' = 'system/Platforms/View', - 'system/Platforms/Setting' = 'system/Platforms/Setting', - 'system/Apply' = 'system/Apply', - 'system/Apply/Api' = 'system/Apply/Api', - 'system/Apply/View' = 'system/Apply/View', - 'system/License' = 'system/License', - 'iot-card/Home' = 'iot-card/Home', - 'iot-card/Platform' = 'iot-card/Platform', - 'iot-card/Platform/Detail' = 'iot-card/Platform/Detail', - 'iot-card/Recharge' = 'iot-card/Recharge', - 'iot-card/Dashboard' = 'iot-card/Dashboard', - 'iot-card/CardManagement' = 'iot-card/CardManagement', - 'iot-card/Record' = 'iot-card/Record', -} - -export type MENUS_CODE_TYPE = keyof typeof MENUS_CODE | string; - -export enum BUTTON_PERMISSION_ENUM { - 'add' = 'add', - 'delete' = 'delete', - 'import' = 'import', - 'view' = 'view', - 'export' = 'export', - 'update' = 'update', - 'action' = 'action', - 'push' = 'push', - 'assert' = 'assert', - 'bind-user' = 'bind-user', - 'active' = 'active', - 'sync' = 'sync', - 'channel' = 'channel', - 'debug' = 'debug', - 'log' = 'log', - 'tigger' = 'tigger', - 'empowerment' = 'empowerment', - 'bind' = 'bind', - 'edit' = 'edit', //资产权限编辑 - 'setting' = 'setting', //菜单配置 - 'password' = 'password', //重置密码 - 'api' = 'api', //查看api - 'manage' = 'manage', //数据源-管理 - 'stop' = 'stop', - 'restart' = 'restart', - 'pay' = 'pay', //充值 -} - -// 调试按钮、通知记录、批量导出、批量导入、选择通道、推送、分配资产、绑定用户对应的ID是啥 -export type CUSTOM_BUTTON = 'debug' | 'log' | 'channel' | 'assert' | 'bind-user'; - -export type BUTTON_PERMISSION = keyof typeof BUTTON_PERMISSION_ENUM | string | CUSTOM_BUTTON; - -export const getDetailNameByCode = { - 'system/Menu/Detail': '菜单详情', - 'device/Product/Detail': '产品详情', - 'device/Instance/Detail': '设备详情', - 'device/Firmware/Task/Detail': '详情', - 'system/Department/Detail': '组织详情', - 'system/Role/Detail': '权限配置', - 'link/Type/Detail': '网络组件详情', - 'link/AccessConfig/Detail': '配置详情', - 'media/Stream/Detail': '流媒体详情', - 'rule-engine/Alarm/Log/Detail': '告警日志', - 'Northbound/AliCloud/Detail': '阿里云详情', - 'link/Certificate/Detail': '证书详情', - 'iot-card/Platform/Detail': '平台对接详情', -}; - -// 开源版路由 -export const CommunityCodeList = [ - 'account/Center', - 'account/NotificationSubscription', - 'account/NotificationRecord', - 'system/Basis', - 'system/User', - 'system/Department', - 'system/Department/Detail', - 'system/Role', - 'system/Role/Detail', - 'system/Menu', - 'system/Menu/Detail', - 'system/Menu/Setting', - 'system/Permission', - 'system/Relationship', - 'home', - 'rule-engine/DashBoard', - 'rule-engine/Alarm/Configuration', - 'rule-engine/Alarm/Configuration/Save', - 'rule-engine/Alarm/Log', - 'rule-engine/Alarm/Log/Detail', - 'device/DashBoard', - 'device/Category', - 'device/Instance', - 'device/Instance/Detail', - 'device/Product', - 'device/Product/Detail', - 'link/AccessConfig', - 'link/AccessConfig/Detail', - 'link/Protocol', - 'link/DashBoard', - 'Log', - 'link/Type', - 'link/Type/Detail', - 'link/Certificate', - 'link/Certificate/Detail', - 'rule-engine/Scene', - 'rule-engine/Scene/Save', - 'notice/Config', - 'notice/Config/Detail', - 'notice/Template', - 'notice/Template/Detail', -]; diff --git a/src/store/permission.ts b/src/store/permission.ts index 075bced2..289d16a9 100644 --- a/src/store/permission.ts +++ b/src/store/permission.ts @@ -1,10 +1,9 @@ import { defineStore } from "pinia"; -import type { MENUS_CODE_TYPE, BUTTON_PERMISSION } from '@/router/router' export const usePermissionStore = defineStore({ id: 'permission', state: () => ({ - permissions: {} as {[key: MENUS_CODE_TYPE]: BUTTON_PERMISSION}, + permissions: {} as {[key: string]: string}, }), getters: { check(state) { diff --git a/src/utils/variable.ts b/src/utils/variable.ts index 591acb68..66af2141 100644 --- a/src/utils/variable.ts +++ b/src/utils/variable.ts @@ -2,4 +2,6 @@ export const BASE_API_PATH = import.meta.env.VITE_APP_BASE_API export const TOKEN_KEY = 'X-Access-Token' -export const Version_Code = 'version_code' \ No newline at end of file +export const Version_Code = 'version_code' + +export const NETWORK_CERTIFICATE_UPLOAD = '/network/certificate/upload' \ No newline at end of file diff --git a/src/views/account/Center/bind/index.vue b/src/views/account/Center/bind/index.vue index 459e9ebc..2f134ab1 100644 --- a/src/views/account/Center/bind/index.vue +++ b/src/views/account/Center/bind/index.vue @@ -171,6 +171,21 @@ const handleSubmit = () => { console.log('error', err); }); }; + +/** + * 绑定成功跳转至页面url的: redirect + */ +const goRedirect = () => { + const urlParams = new URLSearchParams(window.location.hash); + const redirectUrl = + urlParams.get('redirect') || + window.location.href.split('redirect=')?.[1]; + console.log('redirectUrl: ', redirectUrl); + //内部集成需要跳回它们页面 + if (redirectUrl && redirectUrl.indexOf('account/center/bind') === -1) { + window.location.href = decodeURIComponent(redirectUrl); + } +}; \ No newline at end of file diff --git a/src/views/table/index.vue b/src/views/demo/table/index.vue similarity index 70% rename from src/views/table/index.vue rename to src/views/demo/table/index.vue index 0684d3d0..89887a55 100644 --- a/src/views/table/index.vue +++ b/src/views/demo/table/index.vue @@ -18,20 +18,27 @@ key: 'address', } ]" + :request="request" > diff --git a/src/views/link/Certificate/Detail/CertificateFile.vue b/src/views/link/Certificate/Detail/CertificateFile.vue index 8fe1c399..b6ffb26c 100644 --- a/src/views/link/Certificate/Detail/CertificateFile.vue +++ b/src/views/link/Certificate/Detail/CertificateFile.vue @@ -1,88 +1,91 @@ - - + diff --git a/src/views/link/Certificate/Detail/index.vue b/src/views/link/Certificate/Detail/index.vue index 8e13d335..ec301a57 100644 --- a/src/views/link/Certificate/Detail/index.vue +++ b/src/views/link/Certificate/Detail/index.vue @@ -11,18 +11,9 @@ :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish" - @finishFailed="onFinishFailed" + :rules="formRules" > - + - + - + - + @@ -117,46 +87,73 @@ - -