diff --git a/package.json b/package.json
index c4dd493a..0af59923 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
"file-saver": "^2.0.5",
"intro.js": "^5.1.0",
"lodash-es": "^4.17.21",
+ "mitt": "^3.0.1",
"mockjs": "^1.1.0",
"moment": "^2.30.1",
"nprogress": "^0.2.0",
diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue
index 42f0b4c5..b1a997d1 100644
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -35,6 +35,7 @@
{{ t('common.resetText') }}
+
{{ t('common.editText') }}
@@ -128,8 +129,11 @@
import { cloneDeep, omit } from 'lodash-es'
import Sortablejs from 'sortablejs'
import type Sortable from 'sortablejs'
- import { UpdateUserFieldSet, GetUserFieldSet } from './ColumnSettingApi'
+ import { UpdateUserFieldSet, GetUserFieldSet, editColumnSet } from './ColumnSettingApi'
import { usePermissionStore } from '/@/store/modules/permission'
+ // 引入提升信息
+ import { useMessage } from '/@/hooks/web/useMessage'
+ const { createMessage } = useMessage()
interface State {
checkAll: boolean
isInit?: boolean
@@ -217,16 +221,18 @@
/**
* @description: 根据路由path获取当前表格的id
*/
- const getPermissionId = () => {
- var pid: string = ''
- usePermissionStore().getWrouteList.forEach((item: any) => {
- item.children[0].children?.forEach((item2) => {
- if (fullPath.value.indexOf(item2.path) != -1) {
- pid = item2.id
+ const getPermissionInfo = () => {
+ var permissionId: string = ''
+ var permissionName: string = ''
+ usePermissionStore().getWrouteList.forEach((res: any) => {
+ res.children[0].children?.forEach((row) => {
+ if (fullPath.value.indexOf(row.path) != -1) {
+ permissionId = row.id
+ permissionName = row.name
}
})
})
- return pid
+ return { permissionId, permissionName }
}
async function init() {
const Wcolumns = getColumns()
@@ -243,7 +249,6 @@
})
})
const res: API.DataResult = await GetUserFieldSet(Apidata)
- console.log(res.data)
let firstTime = false
if (res.data == null) {
firstTime = true
@@ -282,10 +287,7 @@
columns2.push(item)
}
})
-
columns = [...columns, ...columns2]
-
- console.log(Wcolumns, columns)
}
table.setProps({
rowSelection: JSON.parse(res.data.content).rowSelection ? defaultRowSelection : undefined,
@@ -364,8 +366,18 @@
let sortableOrder: string[] = []
// 将列表添加到列表设置菜单页面中
const editTable = () => {
- const pid = getPermissionId()
- console.log(pid)
+ const Apidata = {
+ id: 0,
+ templateName: '列表设置',
+ content: JSON.stringify({
+ columns: getColumns()
+ })
+ }
+ editColumnSet(Object.assign(Apidata, getPermissionInfo())).then(res => {
+ if (res.succeeded) {
+ createMessage.success('成功添加报表到列表设置！')
+ }
+ })
}
// reset columns
function reset() {
diff --git a/src/components/Table/src/components/settings/ColumnSettingApi.ts b/src/components/Table/src/components/settings/ColumnSettingApi.ts
index 1c0ea55b..c0574584 100644
--- a/src/components/Table/src/components/settings/ColumnSettingApi.ts
+++ b/src/components/Table/src/components/settings/ColumnSettingApi.ts
@@ -1,9 +1,11 @@
-// @ts-ignore
import { request } from '/@/utils/request'
import { DataResult, PageRequest } from '/@/api/model/baseModel'
-enum Api {
- UpdateUserFieldSet = '/mainApi/Common/UpdateUserFieldSet',
- GetUserFieldSet = '/mainApi/Common/GetUserFieldSet',
+import { EditConfigModel } from '@logicflow/core'
+const Api = {
+ UpdateUserFieldSet: '/mainApi/Common/UpdateUserFieldSet',
+ GetUserFieldSet: '/mainApi/Common/GetUserFieldSet',
+ EditColumnSet: '/mainApi/columnSet/EditColumnSet'
+ // EditColumnSet: '/mainApi/ColumnSet/EditColumnSet',
}
// 更新用户字段设置 (Auth)
export function UpdateUserFieldSet(data: PageRequest) {
@@ -21,3 +23,12 @@ export function GetUserFieldSet(query) {
params: query,
})
}
+
+// 将列表增加到列表设置
+export function editColumnSet(data: PageRequest) {
+ return request({
+ url: Api.EditColumnSet,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts
index c6442210..d628129a 100644
--- a/src/components/registerGlobComp.ts
+++ b/src/components/registerGlobComp.ts
@@ -1,111 +1,111 @@
-import type { App } from 'vue'
-import { Icon } from './Icon'
-import { Button } from './Button'
-import VXETable from 'vxe-table'
-import 'vxe-table/lib/style.css'
-import {
- // Need
- Button as AntButton,
- Select,
- Alert,
- Checkbox,
- DatePicker,
- Radio,
- Switch,
- Card,
- List,
- Tabs,
- Descriptions,
- Tree,
- Table,
- Divider,
- Modal,
- Drawer,
- TreeSelect,
- Dropdown,
- Tag,
- Tooltip,
- Badge,
- Popover,
- Upload,
- Transfer,
- Steps,
- PageHeader,
- Result,
- Empty,
- Avatar,
- Menu,
- Breadcrumb,
- Form,
- Input,
- Row,
- Col,
- Spin,
- Space,
- Layout,
- Collapse,
- Slider,
- InputNumber,
- Carousel,
- Popconfirm,
- Skeleton,
- Cascader,
- Rate,
-} from 'ant-design-vue'
+// import type { App } from 'vue'
+// import { Icon } from './Icon'
+// import { Button } from './Button'
+// import VXETable from 'vxe-table'
+// import 'vxe-table/lib/style.css'
+// import {
+// // Need
+// Button as AntButton,
+// Select,
+// Alert,
+// Checkbox,
+// DatePicker,
+// Radio,
+// Switch,
+// Card,
+// List,
+// Tabs,
+// Descriptions,
+// Tree,
+// Table,
+// Divider,
+// Modal,
+// Drawer,
+// TreeSelect,
+// Dropdown,
+// Tag,
+// Tooltip,
+// Badge,
+// Popover,
+// Upload,
+// Transfer,
+// Steps,
+// PageHeader,
+// Result,
+// Empty,
+// Avatar,
+// Menu,
+// Breadcrumb,
+// Form,
+// Input,
+// Row,
+// Col,
+// Spin,
+// Space,
+// Layout,
+// Collapse,
+// Slider,
+// InputNumber,
+// Carousel,
+// Popconfirm,
+// Skeleton,
+// Cascader,
+// Rate,
+// } from 'ant-design-vue'
-const compList = [AntButton.Group, Icon]
-export function registerGlobComp(app: App) {
- // app.use(Input).use(Button).use(Layout)
- compList.forEach((comp) => {
- app.component(comp.name || comp.displayName, comp)
- })
+// const compList = [AntButton.Group, Icon]
+// export function registerGlobComp(app: App) {
+// // app.use(Input).use(Button).use(Layout)
+// compList.forEach((comp) => {
+// app.component(comp.name || comp.displayName, comp)
+// })
- app
- .use(Select)
- .use(Alert)
- .use(Button)
- .use(Breadcrumb)
- .use(Checkbox)
- .use(DatePicker)
- .use(Radio)
- .use(Switch)
- .use(Card)
- .use(List)
- .use(Descriptions)
- .use(Tree)
- .use(TreeSelect)
- .use(Table)
- .use(Divider)
- .use(Modal)
- .use(Drawer)
- .use(Dropdown)
- .use(Tag)
- .use(Tooltip)
- .use(Badge)
- .use(Popover)
- .use(Upload)
- .use(Transfer)
- .use(Steps)
- .use(PageHeader)
- .use(Result)
- .use(Empty)
- .use(Avatar)
- .use(Menu)
- .use(Tabs)
- .use(Form)
- .use(Input)
- .use(Row)
- .use(Col)
- .use(Spin)
- .use(Space)
- .use(Layout)
- .use(Collapse)
- .use(Slider)
- .use(InputNumber)
- .use(Carousel)
- .use(Popconfirm)
- .use(Skeleton)
- .use(Cascader)
- .use(Rate)
- .use(VXETable)
-}
+// app
+// .use(Select)
+// .use(Alert)
+// .use(Button)
+// .use(Breadcrumb)
+// .use(Checkbox)
+// .use(DatePicker)
+// .use(Radio)
+// .use(Switch)
+// .use(Card)
+// .use(List)
+// .use(Descriptions)
+// .use(Tree)
+// .use(TreeSelect)
+// .use(Table)
+// .use(Divider)
+// .use(Modal)
+// .use(Drawer)
+// .use(Dropdown)
+// .use(Tag)
+// .use(Tooltip)
+// .use(Badge)
+// .use(Popover)
+// .use(Upload)
+// .use(Transfer)
+// .use(Steps)
+// .use(PageHeader)
+// .use(Result)
+// .use(Empty)
+// .use(Avatar)
+// .use(Menu)
+// .use(Tabs)
+// .use(Form)
+// .use(Input)
+// .use(Row)
+// .use(Col)
+// .use(Spin)
+// .use(Space)
+// .use(Layout)
+// .use(Collapse)
+// .use(Slider)
+// .use(InputNumber)
+// .use(Carousel)
+// .use(Popconfirm)
+// .use(Skeleton)
+// .use(Cascader)
+// .use(Rate)
+// .use(VXETable)
+// }
diff --git a/src/layouts/page/index.vue b/src/layouts/page/index.vue
index b1c4c493..9b3f6c49 100644
--- a/src/layouts/page/index.vue
+++ b/src/layouts/page/index.vue
@@ -1,3 +1,8 @@
+
@@ -49,9 +54,9 @@
const openCache = computed(() => unref(getOpenKeepAlive) && unref(getShowMultipleTab))
const getCaches = computed((): string[] => {
- if (!unref(getOpenKeepAlive)) {
- return []
- }
+ // if (!unref(getOpenKeepAlive)) {
+ // return []
+ // }
return tabStore.getCachedTabList
})
diff --git a/src/main.ts b/src/main.ts
index 2ccb36f8..a05ba838 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,3 +1,8 @@
+/*
+ * @Description:
+ * @Author: lijj
+ * @Date: 2024-04-15 17:08:08
+ */
import 'virtual:windi-base.css'
import 'virtual:windi-components.css'
import '/@/design/index.less'
@@ -12,9 +17,11 @@ import { setupRouterGuard } from '/@/router/guard'
import { setupStore } from '/@/store'
import { setupGlobDirectives } from '/@/directives'
import { setupI18n } from '/@/locales/setupI18n'
-import { registerGlobComp } from '/@/components/registerGlobComp'
+// import { registerGlobComp } from '/@/components/registerGlobComp'
import { isDevMode } from './utils/env'
+// 引入全局css 后面吧element归纳进去
+import '/@/styles/index.scss'
import '/@/styles/element/index.scss'
import ElementPlus from 'element-plus'
@@ -39,7 +46,7 @@ async function bootstrap() {
// Register global components
// 注册全局组件
- registerGlobComp(app)
+ // registerGlobComp(app)
// Multilingual configuration
// 多语言配置
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index e8c7fefd..893acac2 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -1,3 +1,8 @@
+/*
+ * @Description:
+ * @Author: lijj
+ * @Date: 2024-04-15 17:08:08
+ */
import type { AppRouteRecordRaw, AppRouteModule } from '/@/router/types'
import { PAGE_NOT_FOUND_ROUTE, REDIRECT_ROUTE } from '/@/router/routes/basic'
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 4f945f7a..e4613a4a 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -204,7 +204,6 @@ export const usePermissionStore = defineStore({
menuList.sort((a, b) => {
return (a.meta?.orderNo || 0) - (b.meta?.orderNo || 0)
})
-
// 设置菜单列表
this.setFrontMenuList(menuList)
diff --git a/src/styles/common.scss b/src/styles/common.scss
new file mode 100644
index 00000000..7b0d452b
--- /dev/null
+++ b/src/styles/common.scss
@@ -0,0 +1,30 @@
+h1, h2, h3, h4, h5, h6 {
+ font-weight: 600;
+ color: #262626;
+ padding: 0;
+ margin: 0;
+}
+// 各级标题 适配UI
+h1 {
+ font-size: 18px;
+}
+
+h2 {
+ font-size: 16px;
+}
+h3 {
+ font-size: 14px;
+ font-weight: bold!important;
+ height: 40px;
+ line-height: 40px;
+ padding-left: 15px;
+ border-bottom: 0.7px solid #D9D9D9;
+}
+h4 {
+ font-size: 12px;
+}
+h5 {
+ font-size: 12px;
+ color: #8C8C8C;
+ margin-bottom: 8px;
+}
\ No newline at end of file
diff --git a/src/styles/index.scss b/src/styles/index.scss
index bfa709ee..247e241e 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1,6 +1,6 @@
// import dark theme
@use "element-plus/theme-chalk/src/dark/css-vars.scss" as *;
-
+@import './common.scss';
:root {
.el-segmented {
--el-segmented-radius: var(--el-border-radius-base);
@@ -68,3 +68,4 @@ code {
background-color: var(--el-color-primary-light-9);
color: var(--el-color-primary);
}
+
diff --git a/src/utils/Bus.ts b/src/utils/Bus.ts
new file mode 100644
index 00000000..0f8830a8
--- /dev/null
+++ b/src/utils/Bus.ts
@@ -0,0 +1,8 @@
+/*
+ * @Description: 兄弟组件传值
+ * @Author: lijj
+ * @Date: 2024-04-18 15:14:02
+ */
+import mitt from 'mitt'
+const emitter = mitt()
+export default emitter
\ No newline at end of file
diff --git a/src/views/baseinfo/columnset/api.ts b/src/views/baseinfo/columnset/api.ts
index c551307f..2283f665 100644
--- a/src/views/baseinfo/columnset/api.ts
+++ b/src/views/baseinfo/columnset/api.ts
@@ -7,6 +7,7 @@ import { request } from '/@/utils/request'
import { DataResult, PageRequest } from '/@/api/model/baseModel'
enum Api {
list = '/mainApi/ColumnSet/GetColumnSetList',
+ edit = '/mainApi/ColumnSet/EditColumnSet',
}
// 列表数据
export function getColumnSetList(data: PageRequest) {
@@ -16,3 +17,12 @@ export function getColumnSetList(data: PageRequest) {
data,
})
}
+
+// 编辑列表
+export function editColumnSet(data: PageRequest) {
+ return request({
+ url: Api.edit,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/baseinfo/columnset/columns.tsx b/src/views/baseinfo/columnset/columns.tsx
index f6a6bbf4..159238bc 100644
--- a/src/views/baseinfo/columnset/columns.tsx
+++ b/src/views/baseinfo/columnset/columns.tsx
@@ -53,8 +53,8 @@ export const columns: BasicColumn[] = [
]
export const searchFormSchema: FormSchema[] = [
{
- field: 'TemplateName',
- label: '模板名称',
+ field: 'permissionName',
+ label: '权限模块名称',
component: 'Input',
colProps: { span: 6 },
},
diff --git a/src/views/baseinfo/columnset/components/tableColDrag.vue b/src/views/baseinfo/columnset/components/tableColDrag.vue
new file mode 100644
index 00000000..3d9303e9
--- /dev/null
+++ b/src/views/baseinfo/columnset/components/tableColDrag.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+ 是
+ 否
+
+
+
+