From 7459327f57b9f13fe4ac0475ef6f17529ba0e0d2 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Fri, 26 Apr 2024 20:12:45 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E7=8A=B6=E6=80=81=E5=BA=94=E8=AF=A5=E6=98=AF=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/role.data.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/system/role/role.data.ts b/src/views/system/role/role.data.ts
index 6714fb26..3ecda8e7 100644
--- a/src/views/system/role/role.data.ts
+++ b/src/views/system/role/role.data.ts
@@ -5,7 +5,8 @@ const { t } = useI18n()
 export const rules = reactive({
   name: [required],
   code: [required],
-  sort: [required]
+  sort: [required],
+  status: [required]
 })
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({

From d24555c10f0b0c3b59e2fdd74746cd5fd604aada Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 22 May 2024 14:19:03 +0800
Subject: [PATCH 2/7] BUG

---
 src/views/infra/dbDoc/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/infra/dbDoc/index.vue b/src/views/infra/dbDoc/index.vue
index 85eff615..c60dbb3b 100644
--- a/src/views/infra/dbDoc/index.vue
+++ b/src/views/infra/dbDoc/index.vue
@@ -1,6 +1,4 @@
 <template>
-  <doc-alert title="数据库文档" url="https://doc.iocoder.cn/db-doc/" />
-
   <ContentWrap title="数据库文档">
     <div class="mb-10px">
       <el-button type="primary" plain @click="handleExport('HTML')">

From aa32579a378afb93ef59735fbe217abae55307d1 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 26 Jun 2024 12:11:09 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54d05bbe..4da57d12 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "vite-plugin-progress": "^0.0.7",
     "vite-plugin-purge-icons": "^0.10.0",
     "vite-plugin-svg-icons": "^2.0.1",
-    "vite-plugin-top-level-await": "^1.3.1",
+    "vite-plugin-top-level-await": "1.3.1",
     "vue-eslint-parser": "^9.3.2",
     "vue-tsc": "^1.8.27"
   },

From e6c10aa306efdac4989acf06a9682fbdb21e391c Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 26 Jun 2024 12:11:30 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/UserInfo/src/components/LockDialog.vue | 3 ++-
 src/layout/components/UserInfo/src/components/LockPage.vue   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/UserInfo/src/components/LockDialog.vue b/src/layout/components/UserInfo/src/components/LockDialog.vue
index f4ab7d4f..037cca17 100644
--- a/src/layout/components/UserInfo/src/components/LockDialog.vue
+++ b/src/layout/components/UserInfo/src/components/LockDialog.vue
@@ -21,7 +21,8 @@ const props = defineProps({
 })
 
 const userStore = useUserStore()
-const avatar = computed(() => userStore.user.avatar ?? avatarImg)
+const avatar = computed(() => (userStore.user?.avatar != null && userStore.user?.avatar != '') ?
+  userStore.user?.avatar : avatarImg)
 const userName = computed(() => userStore.user.nickname ?? 'Admin')
 
 const emit = defineEmits(['update:modelValue'])
diff --git a/src/layout/components/UserInfo/src/components/LockPage.vue b/src/layout/components/UserInfo/src/components/LockPage.vue
index 497dd37b..6b9bada5 100644
--- a/src/layout/components/UserInfo/src/components/LockPage.vue
+++ b/src/layout/components/UserInfo/src/components/LockPage.vue
@@ -22,7 +22,8 @@ const showDate = ref(true)
 const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('lock-page')
 
-const avatar = computed(() => userStore.user.avatar ?? avatarImg)
+const avatar = computed(() => (userStore.user?.avatar != null && userStore.user?.avatar != '') ?
+  userStore.user?.avatar : avatarImg)
 const userName = computed(() => userStore.user.nickname ?? 'Admin')
 
 const lockStore = useLockStore()

From fb04a64de85f85c04ee2d4facbd5ee86e8b95d12 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 26 Jun 2024 12:12:20 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=97=A0=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/TagsView/src/helper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/TagsView/src/helper.ts b/src/layout/components/TagsView/src/helper.ts
index 22f6a507..322c8581 100644
--- a/src/layout/components/TagsView/src/helper.ts
+++ b/src/layout/components/TagsView/src/helper.ts
@@ -7,7 +7,7 @@ export const filterAffixTags = (routes: AppRouteRecordRaw[], parentPath = '') =>
     const meta = route.meta as RouteMeta
     const tagPath = pathResolve(parentPath, route.path)
     if (meta?.affix) {
-      tags.push({ ...route, path: tagPath, fullPath: tagPath } as RouteLocationNormalizedLoaded)
+      tags.push({ ...route, path: tagPath, fullPath: tagPath, matched: [ {}, { meta } ] } as RouteLocationNormalizedLoaded)
     }
     if (route.children) {
       const tempTags: RouteLocationNormalizedLoaded[] = filterAffixTags(route.children, tagPath)

From cf67d08bfd02262232a0d52b7dfe4a708ec6fe00 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Thu, 27 Jun 2024 14:21:06 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4da57d12..7af6267f 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "vue-router": "^4.3.0",
     "vue-types": "^5.1.1",
     "vuedraggable": "^4.1.0",
-    "vxe-table": "^4.5.21",
+    "vxe-table": "4.5.21",
     "web-storage-cache": "^1.1.1",
     "xe-utils": "^3.5.22",
     "xml-js": "^1.6.11"

From f8d408b6122d23596ad802d027cff6f466c75fd6 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Fri, 5 Jul 2024 20:14:21 +0800
Subject: [PATCH 7/7] console.log

---
 .../package/penal/base/ElementBaseInfo.vue                   | 5 -----
 .../package/penal/properties/ElementProperties.vue           | 1 -
 src/views/system/sms/template/sms.template.data.ts           | 1 -
 src/views/system/tenant/tenant.data.ts                       | 2 +-
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
index 639c1cb2..0c8f1d57 100644
--- a/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
@@ -68,13 +68,11 @@ const resetBaseInfo = () => {
   console.log(bpmnElement.value, 'bpmnElement')
 
   bpmnElement.value = bpmnInstances()?.bpmnElement
-  console.log(bpmnElement.value, 'resetBaseInfo11111111111')
   elementBaseInfo.value = bpmnElement.value.businessObject
   needProps.value['type'] = bpmnElement.value.businessObject.$type
   // elementBaseInfo.value['typess'] = bpmnElement.value.businessObject.$type
 
   // elementBaseInfo.value = JSON.parse(JSON.stringify(bpmnElement.value.businessObject))
-  console.log(elementBaseInfo.value, 'elementBaseInfo22222222222')
 }
 const handleKeyUpdate = (value) => {
   // 校验 value 的值，只有 XML NCName 通过的情况下，才进行赋值。否则，会导致流程图报错，无法绘制的问题
@@ -121,7 +119,6 @@ const updateBaseInfo = (key) => {
   //   id: elementBaseInfo.value[key]
   //   // di: { id: `${elementBaseInfo.value[key]}_di` }
   // }
-  console.log(elementBaseInfo, 'elementBaseInfo11111111111')
   needProps.value = { ...elementBaseInfo.value, ...needProps.value }
 
   if (key === 'id') {
@@ -144,14 +141,12 @@ onMounted(() => {
     console.log(props.model, 'props.model')
     handleKeyUpdate(props.model.key)
     handleNameUpdate(props.model.name)
-    console.log(props, 'propsssssssssssssssssssss')
   }, 1000)
 })
 
 watch(
   () => props.businessObject,
   (val) => {
-    console.log(val, 'val11111111111111111111')
     if (val) {
       // nextTick(() => {
       resetBaseInfo()
diff --git a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
index 06df9a68..75b9e9cc 100644
--- a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
@@ -77,7 +77,6 @@ const attributeFormRef = ref()
 const bpmnInstances = () => (window as any)?.bpmnInstances
 
 const resetAttributesList = () => {
-  console.log(window, 'windowwindowwindowwindowwindowwindowwindow')
   bpmnElement.value = bpmnInstances().bpmnElement
   otherExtensionList.value = [] // 其他扩展配置
   bpmnElementProperties.value =
diff --git a/src/views/system/sms/template/sms.template.data.ts b/src/views/system/sms/template/sms.template.data.ts
index 6178d6c2..e7241237 100644
--- a/src/views/system/sms/template/sms.template.data.ts
+++ b/src/views/system/sms/template/sms.template.data.ts
@@ -4,7 +4,6 @@ const { t } = useI18n() // 国际化
 const tenantPackageOption = []
 const getTenantPackageOptions = async () => {
   const res = await smsApi.getSimpleSmsChannels()
-  console.log(res, 'resresres')
   res.forEach((tenantPackage: TenantPackageVO) => {
     tenantPackageOption.push({
       key: tenantPackage.id,
diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts
index 8e51f5b7..ac6d1ace 100644
--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@@ -29,7 +29,7 @@ const validateName = (rule: any, value: any, callback: any) => {
   if (value === '') {
     callback(new Error('请输入用户名称'))
   } else {
-    console.log(reg.test(rule), 'reg.test(rule)')
+    // console.log(reg.test(rule), 'reg.test(rule)')
     if (!reg.test(value)) {
       callback(new Error('用户名称由 数字、字母 组成'))
     } else {