0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update: 搜索组件替换

This commit is contained in:
easy 2023-03-14 10:19:58 +08:00
parent 318a5cecaf
commit 0103cba6f7
16 changed files with 83 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/account/NotificationRecord/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<page-container> <page-container>
<div class="notification-record-container"> <div class="notification-record-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />

3
src/views/account/NotificationSubscription/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<page-container> <page-container>
<div class="notification-subscription-container"> <div class="notification-subscription-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />
<j-pro-table <j-pro-table

3
src/views/system/Apply/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<page-container> <page-container>
<div class="apply-container"> <div class="apply-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />

3
src/views/system/DataSource/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<page-container> <page-container>
<div class="data-source-container"> <div class="data-source-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />

63
src/views/system/Department/components/AddDeviceOrProductDialog.vue
View File

@ -26,13 +26,16 @@
<a-checkbox-group v-model:value="bulkList" :options="options" /> <a-checkbox-group v-model:value="bulkList" :options="options" />
</div> </div>
<Search :columns="props.queryColumns" @search="query.search" /> <pro-search
:columns="props.queryColumns"
target="category"
@search="(params:any)=>queryParams = {...params}"
/>
<j-pro-table <j-pro-table
ref="tableRef" ref="tableRef"
:request="table.requestFun" :request="table.requestFun"
:gridColumn="2" :gridColumn="2"
:params="query.params.value" :params="queryParams"
:rowSelection="{ :rowSelection="{
selectedRowKeys: table._selectedRowKeys.value, selectedRowKeys: table._selectedRowKeys.value,
onChange: selectRow, onChange: selectRow,
@ -189,58 +192,8 @@ const options = computed(() =>
const columns = props.queryColumns.filter( const columns = props.queryColumns.filter(
(item) => item.dataIndex !== 'action', (item) => item.dataIndex !== 'action',
); );
const query = {
columns: [ const queryParams = ref({});
{
title: 'ID',
dataIndex: 'id',
key: 'id',
ellipsis: true,
fixed: 'left',
search: {
type: 'string',
},
},
{
title: '名称',
dataIndex: 'name',
key: 'name',
ellipsis: true,
fixed: 'left',
search: {
type: 'string',
},
},
{
title: '状态',
dataIndex: 'state',
key: 'state',
ellipsis: true,
fixed: 'left',
search: {
type: 'select',
options: [
{
label: '在线',
value: 'online',
},
{
label: '离线',
value: 'offline',
},
{
label: '禁用',
value: 'notActive',
},
],
},
},
],
params: ref({}),
search: (params: any) => {
query.params.value = params;
},
};
const table: any = { const table: any = {
_selectedRowKeys: ref<string[]>([]), // 选中项的id _selectedRowKeys: ref<string[]>([]), // 选中项的id
backRowKeys: [] as string[], // 旧选中项的id backRowKeys: [] as string[], // 旧选中项的id

5
src/views/system/Department/device/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<div class="product-container"> <div class="product-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
@search="(params:any) => (queryParams = params)" target="category"
@search="(params:any)=>queryParams = {...params}"
/> />
<j-pro-table <j-pro-table
ref="tableRef" ref="tableRef"

3
src/views/system/Department/product/index.vue
View File

@ -1,7 +1,8 @@
<template> <template>
<div class="product-container"> <div class="product-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />
<j-pro-table <j-pro-table

67
src/views/system/Department/user/components/AddBindUserDialog.vue
View File

@ -9,13 +9,17 @@
@ok="confirm" @ok="confirm"
@cancel="emits('update:visible', false)" @cancel="emits('update:visible', false)"
> >
<Search :columns="query.columns" @search="query.search" /> <pro-search
:columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}"
/>
<div class="table"> <div class="table">
<j-pro-table <j-pro-table
ref="tableRef" ref="tableRef"
:columns="table.columns" :columns="columns"
:request="table.requestFun" :request="table.requestFun"
:params="query.params" :params="queryParams"
:rowSelection="{ :rowSelection="{
selectedRowKeys: table._selectedRowKeys, selectedRowKeys: table._selectedRowKeys,
onChange: table.onSelectChange, onChange: table.onSelectChange,
@ -57,47 +61,28 @@ const confirm = () => {
} }
}; };
const query = { const columns = [
columns: [ {
{ title: '姓名',
title: '姓名', dataIndex: 'name',
dataIndex: 'name', key: 'name',
key: 'name', ellipsis: true,
ellipsis: true, search: {
fixed: 'left', type: 'string',
search: {
type: 'string',
},
}, },
{
title: '用户名',
dataIndex: 'username',
key: 'username',
ellipsis: true,
fixed: 'left',
search: {
type: 'string',
},
},
],
params: ref({}),
search: (params: any) => {
query.params.value = params;
}, },
}; {
title: '用户名',
dataIndex: 'username',
key: 'username',
ellipsis: true,
search: {
type: 'string',
},
},
];
const queryParams = ref({});
const table = reactive({ const table = reactive({
columns: [
{
title: '姓名',
dataIndex: 'name',
key: 'name',
},
{
title: '用户名',
dataIndex: 'username',
key: 'username',
},
],
_selectedRowKeys: [] as string[], _selectedRowKeys: [] as string[],
requestFun: async (oParams: any) => { requestFun: async (oParams: any) => {

11
src/views/system/Department/user/index.vue
View File

@ -1,12 +1,15 @@
<template> <template>
<div> <div>
<j-advanced-search :columns="columns" @search="(p:any)=>params = p" /> <pro-search
:columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}"
/>
<j-pro-table <j-pro-table
ref="tableRef" ref="tableRef"
:columns="columns" :columns="columns"
:request="table.requestFun" :request="table.requestFun"
:params="params" :params="queryParams"
:rowSelection="{ :rowSelection="{
selectedRowKeys: table._selectedRowKeys, selectedRowKeys: table._selectedRowKeys,
onChange: table.onSelectChange, onChange: table.onSelectChange,
@ -137,7 +140,7 @@ const columns = [
}, },
]; ];
// 搜索参数 // 搜索参数
const params = ref({}); const queryParams = ref({});
// 表格 // 表格
const tableRef = ref<Record<string, any>>({}); // 表格实例 const tableRef = ref<Record<string, any>>({}); // 表格实例

5
src/views/system/Menu/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<page-container> <page-container>
<div class="menu-container"> <div class="menu-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />
@ -202,7 +203,7 @@ const table = reactive({
}, },
addChildren: (row: any) => { addChildren: (row: any) => {
const sortIndex = row?.children?.length || 0; const sortIndex = row?.children?.length || 0;
router.push( router.push(
`/system/Menu/detail/:id?pid=${row.id}&basePath=${ `/system/Menu/detail/:id?pid=${row.id}&basePath=${
row.url || '' row.url || ''

5
src/views/system/Permission/index.vue
View File

@ -1,9 +1,10 @@
<template> <template>
<page-container> <page-container>
<div class="permission-container"> <div class="permission-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
@search="(params:any) => (queryParams = params)" target="category"
@search="(params:any)=>queryParams = {...params}"
/> />
<j-pro-table <j-pro-table

3
src/views/system/Relationship/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<page-container> <page-container>
<div class="relationship-container"> <div class="relationship-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />

3
src/views/system/Role/Detail/User/index.vue
View File

@ -1,7 +1,8 @@
<template> <template>
<div class="role-user-container"> <div class="role-user-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />

25
src/views/system/Role/Detail/components/AddUserDialog.vue
View File

@ -6,10 +6,15 @@
@ok="confirm" @ok="confirm"
@cancel="emits('update:visible', false)" @cancel="emits('update:visible', false)"
> >
<j-advanced-search <!-- <j-advanced-search
:columns="columns" :columns="columns"
type="simple" type="simple"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> -->
<pro-search
:columns="columns"
target="simple"
@search="(params:any)=>queryParams = {...params}"
/> />
<j-pro-table <j-pro-table
@ -35,7 +40,7 @@ import { message } from 'ant-design-vue';
const emits = defineEmits(['refresh', 'update:visible']); const emits = defineEmits(['refresh', 'update:visible']);
const props = defineProps<{ const props = defineProps<{
visible: boolean; visible: boolean;
roleId: string roleId: string;
}>(); }>();
const columns = [ const columns = [
@ -85,15 +90,13 @@ const confirm = () => {
if (selectedRowKeys.value.length < 1) { if (selectedRowKeys.value.length < 1) {
message.error('请至少选择一项'); message.error('请至少选择一项');
} else { } else {
bindUser_api(props.roleId, selectedRowKeys.value).then( bindUser_api(props.roleId, selectedRowKeys.value).then((resp) => {
(resp) => { if (resp.status === 200) {
if (resp.status === 200) { message.success('操作成功');
message.success('操作成功'); emits('refresh');
emits('refresh'); emits('update:visible', false);
emits('update:visible', false); }
} });
},
);
} }
}; };
</script> </script>

5
src/views/system/Role/index.vue
View File

@ -1,9 +1,10 @@
<template> <template>
<page-container> <page-container>
<div class="role-container"> <div class="role-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
@search="(params:any)=>queryParams = params" target="category"
@search="(params:any)=>queryParams = {...params}"
/> />
<j-pro-table <j-pro-table

3
src/views/system/User/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<page-container> <page-container>
<div class="user-container"> <div class="user-container">
<j-advanced-search <pro-search
:columns="columns" :columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}" @search="(params:any)=>queryParams = {...params}"
/> />