cion

2023-12-29 14:46:20 +08:00
parent d6f3a74ac7
commit 526d541cc2
15 changed files with 372 additions and 111 deletions
--- a/src/components/baInput/components/iconSelector.vue
+++ b/src/components/baInput/components/iconSelector.vue
@@ -1,55 +1,53 @@
 <template>
    <el-popover
-        :placement="placement"
-        trigger="focus"
-        :hide-after="0"
-        :width="state.selectorWidth"
-        :visible="state.popoverVisible"
+        :placement='placement'
+        trigger='focus'
+        :hide-after='0'
+        :width='state.selectorWidth'
+        :visible='state.popoverVisible'
    >
        <div
-            @mouseover.stop="state.iconSelectorMouseover = true"
-            @mouseout.stop="state.iconSelectorMouseover = false"
-            class="icon-selector"
+            @mouseover.stop='state.iconSelectorMouseover = true'
+            @mouseout.stop='state.iconSelectorMouseover = false'
+            class='icon-selector'
        >
-            <transition name="el-zoom-in-center">
-                <div class="icon-selector-box">
-                    <div class="selector-header">
-                        <div class="selector-title">{{ title ? title : '请选择图标' }}</div>
-                        <!-- <div class="selector-tab">
+            <transition name='el-zoom-in-center'>
+                <div class='icon-selector-box'>
+                    <div class='selector-header'>
+                        <div class='selector-title'>{{ title ? title : '请选择图标' }}</div>
+                        <div class='selector-tab'>
                            <span
                                :title="'Element Puls ' + 'utils.Icon'"
                                @click="onChangeTab('ele')"
                                :class="state.iconType == 'ele' ? 'active' : ''"
-                                >ele</span
-                            >
+                            >ele</span>
                            <span
                                :title="'Font Awesome ' + 'utils.Icon'"
                                @click="onChangeTab('awe')"
                                :class="state.iconType == 'awe' ? 'active' : ''"
-                                >awe</span
-                            >
-                            <span :title="'utils.Ali iconcont Icon'" @click="onChangeTab('ali')" :class="state.iconType == 'ali' ? 'active' : ''"
-                                >ali</span
-                            >
-                            <span
-                                :title="'utils.Local icon title'"
-                                @click="onChangeTab('local')"
-                                :class="state.iconType == 'local' ? 'active' : ''"
-                                >local</span
-                            >
-                        </div> -->
+                            >awe</span>
+                            <!--                            <span :title="'utils.Ali iconcont Icon'" @click="onChangeTab('ali')"-->
+                            <!--                                  :class="state.iconType == 'ali' ? 'active' : ''"-->
+                            <!--                            >ali</span>-->
+                            <!--                            <span-->
+                            <!--                                :title="'utils.Local icon title'"-->
+                            <!--                                @click="onChangeTab('local')"-->
+                            <!--                                :class="state.iconType == 'local' ? 'active' : ''"-->
+                            <!--                            >local</span-->
+                            <!--                            >-->
+                        </div>
                    </div>
-                    <div class="selector-body">
-                        <el-scrollbar ref="selectorScrollbarRef">
-                            <div v-if="renderFontIconNames.length > 0">
+                    <div class='selector-body'>
+                        <el-scrollbar ref='selectorScrollbarRef'>
+                            <div v-if='renderFontIconNames.length > 0'>
                                <div
-                                    class="icon-selector-item"
-                                    :title="item"
-                                    @click="onIcon(item)"
-                                    v-for="(item, key) in renderFontIconNames"
-                                    :key="key"
+                                    class='icon-selector-item'
+                                    :title='item'
+                                    @click='onIcon(item)'
+                                    v-for='(item, key) in renderFontIconNames'
+                                    :key='key'
                                >
-                                    <Icon :name="item" />
+                                    <Icon :name='item' />
                                </div>
                            </div>
                        </el-scrollbar>
@@ -59,37 +57,37 @@
        </div>
        <template #reference>
            <el-input
-                v-model="state.inputValue"
-                :size="size"
-                :disabled="disabled"
-                placeholder="搜索图标"
-                ref="selectorInput"
-                @focus="onInputFocus"
-                @blur="onInputBlur"
+                v-model='state.inputValue'
+                :size='size'
+                :disabled='disabled'
+                placeholder='搜索图标'
+                ref='selectorInput'
+                @focus='onInputFocus'
+                @blur='onInputBlur'
                :class="'size-' + size"
            >
                <template #prepend>
-                    <div class="icon-prepend">
+                    <div class='icon-prepend'>
                        <Icon
                            :key="'icon' + state.iconKey"
-                            :name="state.prependIcon ? state.prependIcon : state.defaultModelValue"
+                            :name='state.prependIcon ? state.prependIcon : state.defaultModelValue'
                        />
-                        <div v-if="showIconName" class="name">
+                        <div v-if='showIconName' class='name'>
                            {{ state.prependIcon ? state.prependIcon : state.defaultModelValue }}
                        </div>
                    </div>
                </template>
                <template #append>
-                    <Icon @click="onInputRefresh" name="el-icon-RefreshRight" />
+                    <Icon @click='onInputRefresh' name='el-icon-RefreshRight' />
                </template>
            </el-input>
        </template>
    </el-popover>
 </template>

-<script setup lang="ts">
+<script setup lang='ts'>
 import { reactive, ref, onMounted, nextTick, watch, computed } from 'vue'
-import {  getElementPlusIconfontNames  } from '@/utils/iconfont'
+import { getElementPlusIconfontNames,getAwesomeIconfontNames } from '@/utils/iconfont'
 import { useEventListener } from '@vueuse/core'
 import type { Placement } from 'element-plus'

@@ -104,6 +102,7 @@ interface Props {
    modelValue?: string
    showIconName?: boolean
 }
+
 const props = withDefaults(defineProps<Props>(), {
    size: 'default',
    disabled: false,
@@ -111,7 +110,7 @@ const props = withDefaults(defineProps<Props>(), {
    type: 'ele',
    placement: 'bottom',
    modelValue: '',
-    showIconName: false,
+    showIconName: false
 })

 const emits = defineEmits<{
@@ -142,7 +141,7 @@ const state: {
    inputValue: '',
    prependIcon: props.modelValue,
    defaultModelValue: props.modelValue || 'fa fa-circle-o',
-    iconKey: 0, // 给icon标签准备个key，以随时使用 h 函数重新生成元素
+    iconKey: 0 // 给icon标签准备个key，以随时使用 h 函数重新生成元素
 })

 const onInputFocus = () => {
@@ -158,27 +157,27 @@ const onInputRefresh = () => {
    state.inputValue = ''
    emits('update:modelValue', state.defaultModelValue)
    emits('change', state.defaultModelValue)
-// }
-// const onChangeTab = (name: IconType) => {
-//     state.iconType = name
-//     state.fontIconNames = []
-//     if (name == 'ele') {
-//         getElementPlusIconfontNames().then((res) => {
-//             state.fontIconNames = res
-//         })
-//     } else if (name == 'awe') {
-//         getAwesomeIconfontNames().then((res) => {
-//             state.fontIconNames = res.map((name) => `fa ${name}`)
-//         })
-//     } else if (name == 'ali') {
-//         getIconfontNames().then((res) => {
-//             state.fontIconNames = res.map((name) => `iconfont ${name}`)
-//         })
-//     } else if (name == 'local') {
-//         getLocalIconfontNames().then((res) => {
-//             state.fontIconNames = res
-//         })
-//     }
+}
+const onChangeTab = (name: IconType) => {
+    state.iconType = name
+    state.fontIconNames = []
+    if (name == 'ele') {
+        getElementPlusIconfontNames().then((res) => {
+            state.fontIconNames = res
+        })
+    } else if (name == 'awe') {
+        getAwesomeIconfontNames().then((res) => {
+            state.fontIconNames = res.map((name) => `fa ${name}`)
+        })
+    } else if (name == 'ali') {
+        getIconfontNames().then((res) => {
+            state.fontIconNames = res.map((name) => `iconfont ${name}`)
+        })
+    } else if (name == 'local') {
+        getLocalIconfontNames().then((res) => {
+            state.fontIconNames = res
+        })
+    }
 }
 const onIcon = (icon: string) => {
    state.iconSelectorMouseover = state.popoverVisible = false
@@ -232,35 +231,43 @@ onMounted(() => {
 })
 </script>

-<style scoped lang="scss">
+<style scoped lang='scss'>
 .size-small {
    height: 24px;
 }
+
 .size-large {
    height: 40px;
 }
+
 .size-default {
    height: 32px;
 }
+
 .icon-prepend {
    display: flex;
    align-items: center;
    justify-content: center;
+
    .name {
        padding-left: 5px;
    }
 }
+
 .selector-header {
    display: flex;
    align-items: center;
    margin-bottom: 12px;
 }
+
 .selector-tab {
    margin-left: auto;
+
    span {
        padding: 0 5px;
        cursor: pointer;
        user-select: none;
+
        &.active,
        &:hover {
            color: var(--el-color-primary);
@@ -268,9 +275,11 @@ onMounted(() => {
        }
    }
 }
+
 .selector-body {
    height: 250px;
 }
+
 .icon-selector-item {
    display: inline-block;
    padding: 10px 10px 6px 10px;
@@ -279,17 +288,21 @@ onMounted(() => {
    border-radius: var(--el-border-radius-base);
    cursor: pointer;
    font-size: 18px;
+
    .icon {
        height: 18px;
        width: 18px;
    }
+
    &:hover {
        border: 1px solid var(--el-color-primary);
    }
 }
+
 :deep(.el-input-group__prepend) {
    padding: 0 10px;
 }
+
 :deep(.el-input-group__append) {
    padding: 0 10px;
 }
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -15,7 +15,7 @@
        </div>
    </transition>

-    <div class='table-header ba-scroll-style'>
+    <div class='table-header ba-scroll-style' v-if='showOperation'>
        <slot name='operation'></slot>
        <!-- 右侧搜索框和工具按钮 -->
        <div class='table-search' v-if='$slots.select'>
@@ -39,11 +39,14 @@ const date = ref([window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd'), window.
 interface Props {
    // 默认展开
    showSelect?: boolean
+    showOperation?: boolean // 是否显示operation
    datePicker?: boolean
+
 }

 const props = withDefaults(defineProps<Props>(), {
    showSelect: true,
+    showOperation: true,
    datePicker: false
 })
 if (props.datePicker) {
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -12,6 +12,7 @@
        v-bind="$attrs"
        :column-config="{resizable: true}"
        :tree-config="{}"
+        :row-config="{isCurrent: true, isHover: true}"
    >
        <!-- Column 组件内部是 el-table-column -->
        <Column