From 9abd941eb53fd2329cd6e763ecebe7b48f9a2ae5 Mon Sep 17 00:00:00 2001
From: ahao <liuhaoai545@gmail.com>
Date: Sat, 23 Sep 2023 21:45:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96props=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8propTypes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BuildCode/index.vue            | 15 ++-----
 src/components/BuildCode/render.vue           | 21 ++++------
 src/components/DictTag/index.vue              |  9 ++---
 src/components/ImagePreview/index.vue         | 12 ++----
 src/components/ImageUpload/index.vue          |  5 +--
 src/components/Pagination/index.vue           |  8 ++--
 src/components/RightToolbar/index.vue         |  5 +--
 src/components/TreeSelect/index.vue           | 39 ++++++-------------
 src/layout/components/InnerLink/index.vue     | 13 +++----
 src/layout/components/Sidebar/Link.vue        |  8 ++--
 src/layout/components/Sidebar/Logo.vue        |  6 +--
 src/layout/components/Sidebar/SidebarItem.vue | 11 ++----
 12 files changed, 47 insertions(+), 105 deletions(-)

diff --git a/src/components/BuildCode/index.vue b/src/components/BuildCode/index.vue
index b9e6838..49e084e 100644
--- a/src/components/BuildCode/index.vue
+++ b/src/components/BuildCode/index.vue
@@ -11,15 +11,11 @@
 
 <script setup lang="ts">
 
+import { propTypes } from "@/utils/propTypes";
+
 const props = defineProps({
-  showBtn: {
-    type: Boolean,
-    default: false
-  },
-  formJson: {
-    type: Object,
-    default: undefined
-  }
+  showBtn: propTypes.bool.def(false),
+  formJson: propTypes.object.def({})
 })
 
 const designerConfig = reactive({
@@ -32,12 +28,9 @@ const designerConfig = reactive({
   formTemplates: true
 })
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const buildRef = ref();
 const emits = defineEmits(['reJson', 'saveDesign']);
 
-
-
 //获取表单json
 const getJson = () => {
   const formJson = JSON.stringify(buildRef.value.getFormJson())
diff --git a/src/components/BuildCode/render.vue b/src/components/BuildCode/render.vue
index 62f3d86..9d66b38 100644
--- a/src/components/BuildCode/render.vue
+++ b/src/components/BuildCode/render.vue
@@ -1,22 +1,15 @@
 <!-- 动态表单渲染 -->
 <script setup name="Render">
 
+import { propTypes } from "@/utils/propTypes";
+
 const props = defineProps({
-  formJson: {
-    type: [String, Object],
-    default: ""
-  },
-  formData: {
-    type: [String, Object],
-    default: ""
-  },
-  isView: {
-    type: Boolean,
-    default: false
-  }
+  formJson: propTypes.oneOfType([propTypes.object, propTypes.string]).def(''),
+  formData: propTypes.oneOfType([propTypes.object, propTypes.string]).def(''),
+  isView: propTypes.bool.def(false)
 })
 
-const vFormRef = ref(null)
+const vFormRef = ref()
 // 获取表单数据-异步
 const getFormData = () => {
   return vFormRef.value.getFormData()
@@ -24,7 +17,7 @@ const getFormData = () => {
 
 /**
  * 设置表单内容
- * @param {表单配置} formConf
+ * @param { * } formConf
  * formConfig：{ formTemplate：表单模板，formData：表单数据，hiddenField：需要隐藏的字段字符串集合，disabledField：需要禁用的自读字符串集合}
  */
 const initForm = (formConf) => {
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 08aef21..9c3d768 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -25,16 +25,13 @@
 
 <script setup lang="ts">
 import { propTypes } from '@/utils/propTypes';
-
+import { array } from "vue-types";
 
 const props = defineProps({
   // 数据
-  options: {
-    type: Array as PropType<DictDataOption[]>,
-    default: null,
-  },
+  options: array<DictDataOption>().def([]),
   // 当前的值
-  value: [Number, String, Array] as PropType<number | string | Array<number | string>>,
+  value: propTypes.oneOfType([propTypes.string, propTypes.number, array<number | string>()]),
   // 当未找到匹配的数据时，显示value
   showValue: propTypes.bool.def(true),
 });
diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue
index 723ccdb..6dbbba6 100644
--- a/src/components/ImagePreview/index.vue
+++ b/src/components/ImagePreview/index.vue
@@ -13,14 +13,8 @@ import { propTypes } from '@/utils/propTypes';
 
 const props = defineProps({
   src: propTypes.string.def(''),
-  width: {
-    type: [Number, String],
-    default: ""
-  },
-  height: {
-    type: [Number, String],
-    default: ""
-  }
+  width: propTypes.oneOfType([propTypes.string, propTypes.number]).def(''),
+  height: propTypes.oneOfType([propTypes.string, propTypes.number]).def('')
 });
 
 const realSrc = computed(() => {
@@ -33,7 +27,7 @@ const realSrc = computed(() => {
 
 const realSrcList = computed(() => {
   if (!props.src) {
-    return;
+    return [];
   }
   let real_src_list = props.src.split(",");
   let srcList: string[] = [];
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index d8ed32b..a443415 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -55,10 +55,7 @@ const props = defineProps({
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: propTypes.array.def(["png", "jpg", "jpeg"]),
     // 是否显示提示
-    isShowTip: {
-        type: Boolean,
-        default: true
-    },
+    isShowTip: propTypes.bool.def(true)
 });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index df73ceb..5dab096 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -22,16 +22,14 @@ export default {
 
 <script setup lang="ts">
 import { scrollTo } from '@/utils/scroll-to'
-import { propTypes } from "@/utils/propTypes";
+import { propTypes } from '@/utils/propTypes';
+import { array } from 'vue-types';
 
 const props = defineProps({
     total: propTypes.number,
     page: propTypes.number.def(1),
     limit: propTypes.number.def(20),
-    pageSizes: {
-      type: Array as PropType<number[]>,
-      default: () => [10, 20, 30, 50]
-    },
+    pageSizes: array<number>().def([10, 20, 30, 50]),
     // 移动端页码按钮的数量端默认值5
     pagerCount: propTypes.number.def(document.body.clientWidth < 992 ? 5 : 7),
     layout: propTypes.string.def('total, sizes, prev, pager, next, jumper'),
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 09036b7..96eb92b 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -19,12 +19,11 @@
 
 <script setup lang="ts">
 import { propTypes } from '@/utils/propTypes';
+import { array } from "vue-types";
 
 const props = defineProps({
     showSearch: propTypes.bool.def(true),
-    columns: {
-        type: Array as PropType<FieldOption[]>,
-    },
+    columns: array<FieldOption>(),
     search: propTypes.bool.def(true),
     gutter: propTypes.number.def(10),
 })
diff --git a/src/components/TreeSelect/index.vue b/src/components/TreeSelect/index.vue
index 3076804..b079d40 100644
--- a/src/components/TreeSelect/index.vue
+++ b/src/components/TreeSelect/index.vue
@@ -30,40 +30,23 @@
 
 <script setup lang="ts">
 
+import { propTypes } from "@/utils/propTypes";
+
 const props = defineProps({
   /* 配置项 */
-  objMap: {
-    type: Object,
-    default: () => {
-      return {
-        value: 'id', // ID字段名
-        label: 'label', // 显示名称
-        children: 'children' // 子级字段名
-      }
-    }
-  },
+  objMap: propTypes.object.def({
+    value: 'id', // ID字段名
+    label: 'label', // 显示名称
+    children: 'children' // 子级字段名
+  }),
   /* 自动收起 */
-  accordion: {
-    type: Boolean,
-    default: () => {
-      return false
-    }
-  },
+  accordion: propTypes.bool.def(false),
   /**当前双向数据绑定的值 */
-  value: {
-    type: [String, Number],
-    default: ''
-  },
+  value: propTypes.oneOfType([propTypes.string, propTypes.number]),
   /**当前的数据 */
-  options: {
-    type: Array,
-    default: () => []
-  },
+  options: propTypes.array.def([]),
   /**输入框内部的文字 */
-  placeholder: {
-    type: String,
-    default: ''
-  }
+  placeholder: propTypes.string.def('')
 })
 
 
diff --git a/src/layout/components/InnerLink/index.vue b/src/layout/components/InnerLink/index.vue
index fa2869c..5fa17f5 100644
--- a/src/layout/components/InnerLink/index.vue
+++ b/src/layout/components/InnerLink/index.vue
@@ -5,14 +5,11 @@
 </template>
 
 <script setup lang="ts">
+import { propTypes } from '@/utils/propTypes';
+
 const props = defineProps({
-    src: {
-        type: String,
-        default: "/"
-    },
-    iframeId: {
-        type: String
-    }
+    src: propTypes.string.def('/'),
+    iframeId: propTypes.string
 });
-const height = ref(document.documentElement.clientHeight - 94.5 + "px");
+const height = ref(document.documentElement.clientHeight - 94.5 + 'px');
 </script>
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index 4c6e8b3..37479c3 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -6,12 +6,10 @@
 
 <script setup lang="ts">
 import { isExternal } from '@/utils/validate'
+import { propTypes } from "@/utils/propTypes";
 
 const props = defineProps({
-    to: {
-        type: [String, Object],
-        required: true
-    }
+    to: propTypes.oneOfType([propTypes.string, propTypes.object]).isRequired
 })
 
 const isExt = computed(() => {
@@ -25,7 +23,7 @@ const type = computed(() => {
     return 'router-link'
 })
 
-function linkProps() {
+const linkProps = () => {
     if (isExt.value) {
         return {
             href: props.to,
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index a06158a..d6d2c1c 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -26,13 +26,11 @@ import variables from '@/assets/styles/variables.module.scss'
 import logo from '@/assets/logo/logo.png'
 import useSettingsStore from '@/store/modules/settings'
 import { ComponentInternalInstance } from "vue";
+import { propTypes } from "@/utils/propTypes";
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 defineProps({
-    collapse: {
-        type: Boolean,
-        required: true
-    }
+    collapse: propTypes.bool.def(true)
 })
 
 const title = ref('RuoYi-Vue-Plus');
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index f803f13..e7a6086 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -35,6 +35,7 @@ import AppLink from './Link.vue'
 import { getNormalPath } from '@/utils/ruoyi'
 import { RouteOption } from "vue-router";
 import { PropType } from "vue";
+import { propTypes } from "@/utils/propTypes";
 
 const props = defineProps({
     // route object
@@ -42,14 +43,8 @@ const props = defineProps({
         type: Object as PropType<RouteOption>,
         required: true
     },
-    isNest: {
-        type: Boolean,
-        default: false
-    },
-    basePath: {
-        type: String,
-        default: ''
-    }
+    isNest: propTypes.bool.def(false),
+    basePath: propTypes.string.def('')
 })
 
 const onlyOneChild = ref<any>({});