Merge branch '2.x-beta-theme' into 2.x-beta

src/views/base/test-modal.vue

@@ -1,7 +1,7 @@
 <!--------------------------------
  - @Author: Ronnie Zhang
  - @LastEditor: Ronnie Zhang
- - @LastEditTime: 2023/12/05 21:27:43
+ - @LastEditTime: 2023/12/16 18:51:56
  - @Email: zclzone@outlook.com
  - Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  --------------------------------->
@@ -32,6 +32,10 @@ function openModal1() {
     okText: '再弹个窗',
     cancelText: '关闭',
     async onOk() {
+      if (!text.value) {
+        $message.warning('请输入内容')
+        return false // 阻止弹窗关闭
+      }
       okLoading1.value = true
       $message.loading('正在提交...', { key: 'modal1' })
       await sleep(1000)
@@ -48,16 +52,10 @@ function openModal1() {
 
 const [$modal2, okLoading2] = useModal()
 function openModal2() {
-  // modal的options都是可变的
-  if ($modal1.value) {
-    $modal1.value.options.style.top = '-100px'
-    $modal1.value.options.title = '我走了'
-  }
-
   $modal2.value?.open({
     cancelText: '关闭当前',
     okText: '关闭所有弹窗',
-    style: { width: '320px', padding: '12px', top: '100px' },
+    modalStyle: { width: '320px', padding: '12px', top: '100px' },
     async onOk() {
       okLoading2.value = true
       $message.loading('正在关闭...', { key: 'modal2' })
@@ -68,12 +66,6 @@ function openModal2() {
       $modal1.value?.close()
       $message.success('已关闭', { key: 'modal2' })
     },
-    onCancel() {
-      if ($modal1.value) {
-        $modal1.value.options.style.top = '0'
-        $modal1.value.options.title = '我又回来了'
-      }
-    },
   })
 }
 </script>

src/views/pms/resource/components/ResAddOrEdit.vue

@@ -155,7 +155,10 @@ const iconOptions = icons.map((item) => ({
   value: item,
 }))
 const layoutOptions = [
-  { label: '默认-default', value: 'default' },
+  { label: '跟随系统', value: '' },
+  { label: '简约-simple', value: 'simple' },
+  { label: '通用-normal', value: 'normal' },
+  { label: '全面-full', value: 'full' },
   { label: '空白-empty', value: 'empty' },
 ]
 const required = {

src/views/pms/resource/index.vue

@@ -49,7 +49,7 @@
               <span v-else>无</span>
             </n-descriptions-item>
             <n-descriptions-item label="layout">
-              {{ currentMenu.layout ?? 'default' }}
+              {{ currentMenu.layout || '跟随系统' }}
             </n-descriptions-item>
             <n-descriptions-item label="是否显示">
               {{ currentMenu.show ? '是' : '否' }}