lvkun996 2 лет назад
Родитель
Сommit
f4b508e861

+ 13 - 0
package-lock.json

@@ -4848,6 +4848,11 @@
         "yaml": "^1.7.2"
       }
     },
+    "countup.js": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.8.0.tgz",
+      "integrity": "sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ=="
+    },
     "crelt": {
       "version": "1.0.6",
       "resolved": "https://registry.npmmirror.com/crelt/-/crelt-1.0.6.tgz",
@@ -11345,6 +11350,14 @@
       "resolved": "https://registry.npmmirror.com/vue-class-component/-/vue-class-component-8.0.0-rc.1.tgz",
       "integrity": "sha512-w1nMzsT/UdbDAXKqhwTmSoyuJzUXKrxLE77PCFVuC6syr8acdFDAq116xgvZh9UCuV0h+rlCtxXolr3Hi3HyPQ=="
     },
+    "vue-countup-v3": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/vue-countup-v3/-/vue-countup-v3-1.4.0.tgz",
+      "integrity": "sha512-Tt5c28V/9J8Y34uJeHfyFqbsQfUcMoHgwG3OVJ8Sj1PKMpk0i0zqy0gmHCqvZJE/zp26IUNdEmrS08cKGENHrA==",
+      "requires": {
+        "countup.js": "^2.6.2"
+      }
+    },
     "vue-demi": {
       "version": "0.14.5",
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.5.tgz",

+ 2 - 1
src/components/TableProV2/index.tsx

@@ -258,11 +258,12 @@ const com = defineComponent((props: {
             </Space>
           </Col>
         </Row>
+        {/*       dataSource={dataSource} */}
         <Table
           columns={columnsFilter.value}
           loading={loading.value}
           pagination={typeof props.pagination === 'boolean' ? false : pagination}
-          dataSource={dataSource}
+
         >
           <slot></slot>
           <slot name='action'></slot>

+ 0 - 3
src/components/index.tsx

@@ -1,3 +0,0 @@
-export const AppTsx = () => <a-button type="primary" >vue3.0</a-button>
-
-// export const

+ 1 - 3
src/layout/components/Sidebar/index.vue

@@ -7,7 +7,6 @@
   >
     <right-outlined />
   </a-button>
-
   <a-drawer
       placement="left"
       :closable="false"
@@ -41,7 +40,6 @@
 
   <a-layout-sider
     v-if="!isMobile"
-    :trigger="null"
     v-model:collapsed="collapsed"
     collapsible
     :style="{backgroundColor: bgColor, overflow: 'hidden', overflowY: 'scroll'}"
@@ -89,7 +87,7 @@ const route = useRoute()
 
 const router = useRouter()
 
-const collapsed = ref<boolean>(false)
+const collapsed = ref<boolean>(true)
 
 const sidebarRoute = ref<any>()
 

+ 1 - 0
src/layout/user.vue

@@ -37,5 +37,6 @@ console.log('userStore.userInfo:', userStore)
 .user-name {
   font: 16px 'Italiana', sans-serif;
   text-transform: lowercase;
+  cursor: pointer;
 }
 </style>

+ 27 - 0
src/store/modules/designStore/systemStore.ts

@@ -0,0 +1,27 @@
+import { defineStore } from 'pinia'
+import { ref, computed } from 'vue'
+
+/**
+ * 系统级别的控制
+ * 1. 页面布局控制 竖屏控制与横屏控制
+ * 2. 开启色盲模式
+ * 3.
+ */
+export const useSystemStore = defineStore('systemStore', () => {
+
+  // const
+
+})
+
+// /* 灰度色盲模式 */
+// body {
+//   filter: grayscale(100%);
+// }
+// /* 红-绿色盲模式 */
+// body {
+// filter: url(#protanopia);
+// }
+// /* 蓝-黄色盲模式 */
+// body {
+// filter: url(#tritanopia);
+// }