Merge branch 'wang' into test

.env.development

@@ -1,12 +1,12 @@
 # ignore
 # 本地环境
-ENV = 'development'
+ENV='development'
 
 # 本地环境接口地址
 # VITE_API_URL = 'http://127.0.0.1:8000'
-VITE_API_URL = 'http://192.168.1.225/'
+VITE_API_URL='http://192.168.1.225/'
 # VITE_API_URL = 'http://192.168.1.25:8080/'
 # VITE_API_URL = 'http://amzads.zositechc.cn'
 
 # 是否启用按钮权限
-VITE_PM_ENABLED = true
+VITE_PM_ENABLED=true

components.d.ts

@@ -34,6 +34,7 @@ declare module 'vue' {
     ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
@@ -61,8 +62,10 @@ declare module 'vue' {
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElProgress: typeof import('element-plus/es')['ElProgress']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']

package-lock.json

@@ -9507,6 +9507,7 @@
 			"resolved": "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.16.7.tgz",
 			"integrity": "sha512-w7XmnRlchq6YUFJVFGSvG1T/6j8GrdYN6Em9Wf0Ye+HXgD/22kont+WnuCAA0UaUoxtuvRR1u/mXKy63g/hfqQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@antfu/utils": "^0.7.6",
 				"@rollup/pluginutils": "^5.0.5",
@@ -9520,6 +9521,9 @@
 			"engines": {
 				"node": ">=14"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
 			"peerDependencies": {
 				"@nuxt/kit": "^3.2.2",
 				"@vueuse/core": "*"
@@ -9571,6 +9575,7 @@
 			"resolved": "https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.25.2.tgz",
 			"integrity": "sha512-OVmLFqILH6w+eM8fyt/d/eoJT9A6WO51NZLf1vC5c1FZ4rmq2bbGxTy8WP2Jm7xwFdukaIdv819+UI7RClPyCA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@antfu/utils": "^0.7.5",
 				"@rollup/pluginutils": "^5.0.2",
@@ -9586,6 +9591,9 @@
 			"engines": {
 				"node": ">=14"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
 			"peerDependencies": {
 				"@babel/parser": "^7.15.8",
 				"@nuxt/kit": "^3.2.2",

src/main.ts

@@ -70,6 +70,7 @@ app.use(permission)
 // @ts-ignore
 app.use(pinia)
     .use(router)
+    // @ts-ignore
     .use(ElementPlus, { i18n: i18n.global.t })
     .use(i18n).use(VueGridLayout).use(fastCrud).mount('#app')
 

src/views/adManage/sp/campaigns/index.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { inject, onMounted, ref, watch } from 'vue';
+// import { inject, onMounted, ref, watch } from 'vue';
 import { FsPage, useFs } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
 import { useShopInfo } from '/@/stores/shopInfo';

src/views/searchTerm/rootWordManage/components/root-word-manage-table.vue

@@ -5,7 +5,7 @@
  * @Author: Cheney
  */
 
-import { nextTick, onMounted, reactive, ref } from 'vue';
+// import { nextTick, onMounted, reactive, ref } from 'vue';
 import { Plus, Search, Upload } from '@element-plus/icons-vue';
 import * as api from '../api';
 import type { UploadInstance, UploadRawFile } from 'element-plus';

vite.config.ts

@@ -25,18 +25,18 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
       vue(),
       vueJsx(),
       // vueSetupExtend(),
-      // AutoImport({
-      //   imports: [
-      //     'vue',
-      //     'vue-router',
-      //     'pinia'
-      //   ],
-      //   resolvers: [ElementPlusResolver()],
-      //   dts: 'src/auto-imports.d.ts', // 生成 TypeScript 声明文件
-      // }),
-      // Components({
-      //   resolvers: [ElementPlusResolver()],
-      // }),
+      AutoImport({
+        imports: [
+          'vue',
+          'vue-router',
+          'pinia'
+        ],
+        resolvers: [ElementPlusResolver()],
+        dts: 'src/auto-imports.d.ts', // 生成 TypeScript 声明文件,
+      }),
+      Components({
+        resolvers: [ElementPlusResolver()],
+      }),
       compression({
         algorithm: 'gzip', // 使用 gzip 压缩
         ext: '.gz', // 输出的文件扩展名