diff --git a/package.json b/package.json index e5bb41613..06526ac9c 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@logicflow/core": "^1.2.18", "@logicflow/extension": "^1.2.19", "@pureadmin/descriptions": "^1.2.0", - "@pureadmin/table": "^3.0.1", + "@pureadmin/table": "^3.0.2", "@pureadmin/utils": "^2.4.4", "@vueuse/core": "^10.7.2", "@vueuse/motion": "^2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f054613f..0998bae56 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ dependencies: specifier: ^1.2.0 version: 1.2.0(element-plus@2.5.3)(typescript@5.3.3) '@pureadmin/table': - specifier: ^3.0.1 - version: 3.0.1(element-plus@2.5.3)(typescript@5.3.3) + specifier: ^3.0.2 + version: 3.0.2(element-plus@2.5.3)(typescript@5.3.3) '@pureadmin/utils': specifier: ^2.4.4 version: 2.4.4(echarts@5.4.3)(vue@3.4.14) @@ -1744,8 +1744,8 @@ packages: - typescript dev: false - /@pureadmin/table@3.0.1(element-plus@2.5.3)(typescript@5.3.3): - resolution: {integrity: sha512-DBIv0YRZogSIEtsBPNjm6tYuImaE8ZJXwAu/gutEyaH9wATN09doKDmAisyBj+XEydfM5R9hlvhQ8SzJkbtarA==} + /@pureadmin/table@3.0.2(element-plus@2.5.3)(typescript@5.3.3): + resolution: {integrity: sha512-VrtpuzKm4t2KS81MWBy2G1xayjvYIM5s3EUs91mZxmA+qLb8FdF2k4QdCufVA8ZZG85AeM2HA7Z0SvqMAwy0dA==} peerDependencies: element-plus: ^2.0.0 dependencies: diff --git a/src/components/RePureTableBar/src/bar.tsx b/src/components/RePureTableBar/src/bar.tsx index 913c0a2b5..6a33aa72c 100644 --- a/src/components/RePureTableBar/src/bar.tsx +++ b/src/components/RePureTableBar/src/bar.tsx @@ -37,7 +37,6 @@ export default defineComponent({ props, emits: ["refresh"], setup(props, { emit, slots, attrs }) { - const buttonRef = ref(); const size = ref("default"); const isExpandAll = ref(true); const loading = ref(false); @@ -200,11 +199,22 @@ export default defineComponent({ : false; }; + const rendTippyProps = (content: string) => { + // https://vue-tippy.netlify.app/props + return { + content, + offset: [0, 18], + duration: [300, 0], + followCursor: true, + hideOnClick: "toggle" + }; + }; + const reference = { reference: () => ( (buttonRef.value = e.currentTarget)} + v-tippy={rendTippyProps("列设置")} /> ) }; @@ -224,38 +234,36 @@ export default defineComponent({ ) : null} {props.tableRef?.size ? ( <> - - onExpand()} - /> - + onExpand()} + /> ) : null} - - onReFresh()} - /> - + onReFresh()} + /> - - - - - + + + - - {slots.default({ size: size.value, diff --git a/src/views/system/dept/form.vue b/src/views/system/dept/form.vue index 3acf5dfdb..2cec5fcbf 100644 --- a/src/views/system/dept/form.vue +++ b/src/views/system/dept/form.vue @@ -104,6 +104,7 @@ defineExpose({ getRef });