Merge branch 'ts' into dev

# Conflicts:
#	package.json
#	src/layout/components/TagsView/index.vue

src/components/DictTag/index.vue

@@ -2,13 +2,9 @@
   <div>
     <template v-for="(item, index) in options">
       <template v-if="values.includes(item.value)">
-        <span
-          v-if="item.elTagType == 'default' || item.elTagType == ''"
-          :key="item.value"
-          :index="index"
-          :class="item.elTagClass"
-          >{{ item.label }}</span
-        >
+        <span v-if="item.elTagType == 'default' || item.elTagType == ''" :key="item.value" :index="index" :class="item.elTagClass">
+          {{ item.label + " " }}
+        </span>
         <el-tag
           v-else
           :disable-transitions="true"
@@ -16,33 +12,85 @@
           :index="index"
           :type="item.elTagType === 'primary' ? '' : item.elTagType"
           :class="item.elTagClass"
-          >{{ item.label }}</el-tag
         >
+          {{ item.label + " " }}
+        </el-tag>
       </template>
     </template>
+    <template v-if="unmatch && showValue">
+      {{ unmatchArray }}
+    </template>
   </div>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue';
 
+
 const props = defineProps({
-    // 数据
-    options: {
-        type: Array as PropType<DictDataOption[]>,
-        default: null,
-    },
-    // 当前的值
-    value: [Number, String, Array],
-})
+  // 数据
+  options: {
+    type: Array as PropType<DictDataOption[]>,
+    default: null,
+  },
+  // 当前的值
+  value: [Number, String, Array] as PropType<number | string | Array<number | string>>,
+  // 当未找到匹配的数据时，显示value
+  showValue: {
+    type: Boolean as PropType<boolean>,
+    default: true,
+  },
+});
 
 const values = computed(() => {
-    if (props.value !== null && typeof props.value !== 'undefined') {
-        return Array.isArray(props.value) ? props.value : [String(props.value)];
-    } else {
-        return [];
+  if (props.value !== null && typeof props.value !== "undefined") {
+    return Array.isArray(props.value) ? props.value : [String(props.value)];
+  } else {
+    return [];
+  }
+});
+
+const unmatch = computed(() => {
+  if (props.value !== null && typeof props.value !== "undefined") {
+    // 传入值为非数组
+    if (!Array.isArray(props.value)) {
+      if (props.options.some((v) => v.value == props.value)) {
+        return false;
+      }
+      return true;
     }
-})
+    return true;
+  }
+  // 没有value不显示
+  return false;
+});
+
+const unmatchArray = computed(() => {
+// 记录未匹配的项
+  const itemUnmatchArray: Array<string | number> = [];
+  if (props.value !== null && typeof props.value !== "undefined") {
+    // 传入值为非数组
+    if (!Array.isArray(props.value)) {
+      itemUnmatchArray.push(props.value);
+    } else {
+      // 传入值为Array
+      props.value.forEach((item) => {
+        if (!props.options.some((v) => v.value == item)) {
+          itemUnmatchArray.push(item);
+        }
+      });
+    }
+  }
+  // 没有value不显示
+  return handleArray(itemUnmatchArray);
+});
+
+const handleArray = (array: Array<string | number>) => {
+  if (array.length === 0) return "";
+  return array.reduce((pre, cur) => {
+    return pre + " " + cur;
+  });
+}
 </script>
 
 <style scoped>

src/components/Editor/index.vue

@@ -68,7 +68,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const upload = reactive<UploadOption>({
     headers: { Authorization: "Bearer " + getToken() },
-    url: import.meta.env.VITE_APP_BASE_API + '/system/oss/upload'
+    url: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload'
 })
 const myQuillEditor = ref();
 

src/components/FileUpload/index.vue

@@ -78,7 +78,7 @@ const number = ref(0);
 const uploadList = ref<any[]>([]);
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadFileUrl = ref(baseUrl + "/system/oss/upload"); // 上传文件服务器地址
+const uploadFileUrl = ref(baseUrl + "/resource/oss/upload"); // 上传文件服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
 
 const fileList = ref<any[]>([]);

src/components/IconSelect/index.vue

@@ -2,7 +2,7 @@
   <div class="relative" :style="{ width: width }">
     <el-input v-model="modelValue" readonly @click="visible = !visible" placeholder="点击选择图标">
       <template #prepend>
-        <svg-icon :icon-class="modelValue as string"></svg-icon>
+        <svg-icon :icon-class="modelValue as string" />
       </template>
     </el-input>
 
@@ -19,7 +19,7 @@
       <el-scrollbar height="w-[200px]">
         <ul class="icon-list">
           <el-tooltip v-for="(iconName, index) in iconNames" :key="index" :content="iconName" placement="bottom" effect="light">
-            <li class="icon-item" @click="selectedIcon(iconName)">
+            <li :class="['icon-item', {active: modelValue == iconName}]" @click="selectedIcon(iconName)">
               <svg-icon color="var(--el-text-color-regular)" :icon-class="iconName" />
             </li>
           </el-tooltip>
@@ -33,15 +33,15 @@
 import icons from '@/components/IconSelect/requireIcons';
 
 const props = defineProps({
-    modelValue: {
-        type: String,
-        require: true
-    },
-    width: {
-        type: String,
-        require: false,
-        default: '400px'
-    }
+  modelValue: {
+    type: String,
+    require: true
+  },
+  width: {
+    type: String,
+    require: false,
+    default: '400px'
+  }
 });
 
 const emit = defineEmits(['update:modelValue']);
@@ -55,22 +55,21 @@ const filterValue = ref('');
  * 筛选图标
  */
 const filterIcons = () => {
-    if (filterValue.value) {
-        iconNames.value = icons.filter(iconName =>
-            iconName.includes(filterValue.value)
-        );
-    } else {
-        iconNames.value = icons;
-    }
+  if (filterValue.value) {
+    iconNames.value = icons.filter(iconName =>
+      iconName.includes(filterValue.value)
+    );
+  } else {
+    iconNames.value = icons;
+  }
 }
-
 /**
  * 选择图标
  * @param iconName 选择的图标名称
  */
 const selectedIcon = (iconName: string) => {
-    emit('update:modelValue', iconName);
-    visible.value = false;
+  emit('update:modelValue', iconName);
+  visible.value = false;
 }
 </script>
 
@@ -101,5 +100,9 @@ const selectedIcon = (iconName: string) => {
       transform: scaleX(1.1);
     }
   }
+  .active {
+      border-color: var(--el-color-primary);
+      color: var(--el-color-primary);
+    }
 }
 </style>

src/components/ImageUpload/index.vue

@@ -76,7 +76,7 @@ const dialogImageUrl = ref("");
 const dialogVisible = ref(false);
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(baseUrl + "/system/oss/upload"); // 上传的图片服务器地址
+const uploadImgUrl = ref(baseUrl + "/resource/oss/upload"); // 上传的图片服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
 
 const fileList = ref<any[]>([]);

src/components/TopNav/index.vue

@@ -104,7 +104,7 @@ const setVisibleNumber = () => {
   visibleNumber.value = parseInt(String(width / 85));
 }
 
-const handleSelect = (key: string, keyPath: string[]) => {
+const handleSelect = (key: string) => {
   currentIndex.value = key;
   const route = routers.value.find(item => item.path === key);
   if (isHttp(key)) {
@@ -112,7 +112,13 @@ const handleSelect = (key: string, keyPath: string[]) => {
     window.open(key, "_blank");
   } else if (!route || !route.children) {
     // 没有子路由路径内部打开
-    router.push({ path: key, fullPath: '' });
+    const routeMenu = childrenMenus.value.find(item => item.path === key);
+    if (routeMenu && routeMenu.query) {
+      let query = JSON.parse(routeMenu.query);
+      router.push({ path: key, query: query });
+    } else {
+      router.push({ path: key });
+    }
     appStore.toggleSideBarHide(true);
   } else {
     // 显示左侧联动菜单