mirror of
				https://github.com/pure-admin/vue-pure-admin.git
				synced 2025-11-03 13:44:47 +08:00 
			
		
		
		
	Merge branch 'main' of github.com:pure-admin/vue-pure-admin into gitee
This commit is contained in:
		
						commit
						43cd5d9321
					
				@ -46,7 +46,7 @@
 | 
				
			|||||||
    "dayjs": "^1.11.8",
 | 
					    "dayjs": "^1.11.8",
 | 
				
			||||||
    "echarts": "^5.4.2",
 | 
					    "echarts": "^5.4.2",
 | 
				
			||||||
    "el-table-infinite-scroll": "^3.0.1",
 | 
					    "el-table-infinite-scroll": "^3.0.1",
 | 
				
			||||||
    "element-plus": "^2.3.7",
 | 
					    "element-plus": "2.3.6",
 | 
				
			||||||
    "intro.js": "^7.0.1",
 | 
					    "intro.js": "^7.0.1",
 | 
				
			||||||
    "js-cookie": "^3.0.5",
 | 
					    "js-cookie": "^3.0.5",
 | 
				
			||||||
    "jsbarcode": "^3.11.5",
 | 
					    "jsbarcode": "^3.11.5",
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										26
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										26
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							@ -43,7 +43,7 @@ specifiers:
 | 
				
			|||||||
  dayjs: ^1.11.8
 | 
					  dayjs: ^1.11.8
 | 
				
			||||||
  echarts: ^5.4.2
 | 
					  echarts: ^5.4.2
 | 
				
			||||||
  el-table-infinite-scroll: ^3.0.1
 | 
					  el-table-infinite-scroll: ^3.0.1
 | 
				
			||||||
  element-plus: ^2.3.7
 | 
					  element-plus: 2.3.6
 | 
				
			||||||
  eslint: ^8.43.0
 | 
					  eslint: ^8.43.0
 | 
				
			||||||
  eslint-plugin-prettier: ^4.2.1
 | 
					  eslint-plugin-prettier: ^4.2.1
 | 
				
			||||||
  eslint-plugin-vue: ^9.15.1
 | 
					  eslint-plugin-vue: ^9.15.1
 | 
				
			||||||
@ -122,8 +122,8 @@ dependencies:
 | 
				
			|||||||
  "@howdyjs/mouse-menu": 2.0.7_vue@3.3.4
 | 
					  "@howdyjs/mouse-menu": 2.0.7_vue@3.3.4
 | 
				
			||||||
  "@logicflow/core": 1.2.9
 | 
					  "@logicflow/core": 1.2.9
 | 
				
			||||||
  "@logicflow/extension": 1.2.9
 | 
					  "@logicflow/extension": 1.2.9
 | 
				
			||||||
  "@pureadmin/descriptions": 1.1.1_element-plus@2.3.7
 | 
					  "@pureadmin/descriptions": 1.1.1_element-plus@2.3.6
 | 
				
			||||||
  "@pureadmin/table": 2.3.2_element-plus@2.3.7
 | 
					  "@pureadmin/table": 2.3.2_element-plus@2.3.6
 | 
				
			||||||
  "@pureadmin/utils": 1.9.6_echarts@5.4.2+vue@3.3.4
 | 
					  "@pureadmin/utils": 1.9.6_echarts@5.4.2+vue@3.3.4
 | 
				
			||||||
  "@vueuse/core": 10.2.0_vue@3.3.4
 | 
					  "@vueuse/core": 10.2.0_vue@3.3.4
 | 
				
			||||||
  "@vueuse/motion": 2.0.0_vue@3.3.4
 | 
					  "@vueuse/motion": 2.0.0_vue@3.3.4
 | 
				
			||||||
@ -136,7 +136,7 @@ dependencies:
 | 
				
			|||||||
  dayjs: 1.11.8
 | 
					  dayjs: 1.11.8
 | 
				
			||||||
  echarts: 5.4.2
 | 
					  echarts: 5.4.2
 | 
				
			||||||
  el-table-infinite-scroll: 3.0.1
 | 
					  el-table-infinite-scroll: 3.0.1
 | 
				
			||||||
  element-plus: 2.3.7_vue@3.3.4
 | 
					  element-plus: 2.3.6_vue@3.3.4
 | 
				
			||||||
  intro.js: 7.0.1
 | 
					  intro.js: 7.0.1
 | 
				
			||||||
  js-cookie: 3.0.5
 | 
					  js-cookie: 3.0.5
 | 
				
			||||||
  jsbarcode: 3.11.5
 | 
					  jsbarcode: 3.11.5
 | 
				
			||||||
@ -2095,7 +2095,7 @@ packages:
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
    dev: false
 | 
					    dev: false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /@pureadmin/descriptions/1.1.1_element-plus@2.3.7:
 | 
					  /@pureadmin/descriptions/1.1.1_element-plus@2.3.6:
 | 
				
			||||||
    resolution:
 | 
					    resolution:
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        integrity: sha512-4BHLKomLU/LxGs5EUA+h+aKNrJEkhrU6+QE8VoWfJZ8VTU6ddvFLT/Pi4WuO5CWNXM9ZjqvHLFFVwEPlKntqtg==
 | 
					        integrity: sha512-4BHLKomLU/LxGs5EUA+h+aKNrJEkhrU6+QE8VoWfJZ8VTU6ddvFLT/Pi4WuO5CWNXM9ZjqvHLFFVwEPlKntqtg==
 | 
				
			||||||
@ -2104,11 +2104,11 @@ packages:
 | 
				
			|||||||
      element-plus: ^2.0.0
 | 
					      element-plus: ^2.0.0
 | 
				
			||||||
    dependencies:
 | 
					    dependencies:
 | 
				
			||||||
      "@element-plus/icons-vue": 2.1.0_vue@3.3.4
 | 
					      "@element-plus/icons-vue": 2.1.0_vue@3.3.4
 | 
				
			||||||
      element-plus: 2.3.7_vue@3.3.4
 | 
					      element-plus: 2.3.6_vue@3.3.4
 | 
				
			||||||
      vue: 3.3.4
 | 
					      vue: 3.3.4
 | 
				
			||||||
    dev: false
 | 
					    dev: false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /@pureadmin/table/2.3.2_element-plus@2.3.7:
 | 
					  /@pureadmin/table/2.3.2_element-plus@2.3.6:
 | 
				
			||||||
    resolution:
 | 
					    resolution:
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        integrity: sha512-oaMf8X4bv5KPcO4li+bO7W28BS5IMy+zxPpPNh/Tdxewc2dykvoqqpRIAiS8prJOHxI42/77xbjoGb+lwQH5aA==
 | 
					        integrity: sha512-oaMf8X4bv5KPcO4li+bO7W28BS5IMy+zxPpPNh/Tdxewc2dykvoqqpRIAiS8prJOHxI42/77xbjoGb+lwQH5aA==
 | 
				
			||||||
@ -2116,7 +2116,7 @@ packages:
 | 
				
			|||||||
    peerDependencies:
 | 
					    peerDependencies:
 | 
				
			||||||
      element-plus: ^2.0.0
 | 
					      element-plus: ^2.0.0
 | 
				
			||||||
    dependencies:
 | 
					    dependencies:
 | 
				
			||||||
      element-plus: 2.3.7_vue@3.3.4
 | 
					      element-plus: 2.3.6_vue@3.3.4
 | 
				
			||||||
      vue: 3.3.4
 | 
					      vue: 3.3.4
 | 
				
			||||||
    dev: false
 | 
					    dev: false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -5161,7 +5161,7 @@ packages:
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
    dependencies:
 | 
					    dependencies:
 | 
				
			||||||
      core-js: 3.31.0
 | 
					      core-js: 3.31.0
 | 
				
			||||||
      element-plus: 2.3.7_vue@3.3.4
 | 
					      element-plus: 2.3.6_vue@3.3.4
 | 
				
			||||||
      vue: 3.3.4
 | 
					      vue: 3.3.4
 | 
				
			||||||
    transitivePeerDependencies:
 | 
					    transitivePeerDependencies:
 | 
				
			||||||
      - "@vue/composition-api"
 | 
					      - "@vue/composition-api"
 | 
				
			||||||
@ -5173,10 +5173,10 @@ packages:
 | 
				
			|||||||
        integrity: sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw==
 | 
					        integrity: sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw==
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /element-plus/2.3.7_vue@3.3.4:
 | 
					  /element-plus/2.3.6_vue@3.3.4:
 | 
				
			||||||
    resolution:
 | 
					    resolution:
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        integrity: sha512-h6TxclbaLUJxg/Bv5j/ZKsK+K5yadQliw5+R30HWyE69pXlqXTX24oYx+yw3pA4Dy+lqEDi5501FQ0CORk3OSA==
 | 
					        integrity: sha512-GLz0pXUYI2zRfIgyI6W7SWmHk6dSEikP9yR++hsQUyy63+WjutoiGpA3SZD4cGPSXUzRFeKfVr8CnYhK5LqXZw==
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    peerDependencies:
 | 
					    peerDependencies:
 | 
				
			||||||
      vue: ^3.2.0
 | 
					      vue: ^3.2.0
 | 
				
			||||||
@ -12297,7 +12297,7 @@ packages:
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
    dependencies:
 | 
					    dependencies:
 | 
				
			||||||
      animate.css: 4.1.1
 | 
					      animate.css: 4.1.1
 | 
				
			||||||
      element-plus: 2.3.7_vue@3.3.4
 | 
					      element-plus: 2.3.6_vue@3.3.4
 | 
				
			||||||
    transitivePeerDependencies:
 | 
					    transitivePeerDependencies:
 | 
				
			||||||
      - "@vue/composition-api"
 | 
					      - "@vue/composition-api"
 | 
				
			||||||
      - vue
 | 
					      - vue
 | 
				
			||||||
@ -12310,7 +12310,7 @@ packages:
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
    dependencies:
 | 
					    dependencies:
 | 
				
			||||||
      animate.css: 4.1.1
 | 
					      animate.css: 4.1.1
 | 
				
			||||||
      element-plus: 2.3.7_vue@3.3.4
 | 
					      element-plus: 2.3.6_vue@3.3.4
 | 
				
			||||||
      vue-waterfall-plugin-next: 2.2.0_vue@3.3.4
 | 
					      vue-waterfall-plugin-next: 2.2.0_vue@3.3.4
 | 
				
			||||||
    transitivePeerDependencies:
 | 
					    transitivePeerDependencies:
 | 
				
			||||||
      - "@vue/composition-api"
 | 
					      - "@vue/composition-api"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user