Merge branch 'main' into dev-ft

@@ -14,11 +14,14 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
+# VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
+VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
+# VITE_PROXY = [["/api","http://192.168.10.106:8080/api"],["/thingskit-drawio","http://192.168.10.106:8080/api"]]
 
 # 实时数据的ws地址
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
-VITE_WEB_SOCKET = ws://44.99.141.212:8080/api/ws/plugins/telemetry?token=
+# VITE_WEB_SOCKET = ws://44.99.141.212:8080/api/ws/plugins/telemetry?token=
+VITE_WEB_SOCKET = ws://121.37.251.8:8080/api/ws/plugins/telemetry?token=
 
 # Delete console
 VITE_DROP_CONSOLE = true
@@ -36,5 +39,5 @@ VITE_GLOB_API_URL_PREFIX=/yt
 VITE_GLOB_CONFIGURATION = /thingskit-drawio
 
 # Content Security Policy
-VITE_CONTENT_SECURITY_POLICY = true
+VITE_CONTENT_SECURITY_POLICY = false
 

@@ -6,6 +6,7 @@
   ],
   "commentTranslate.targetLanguage": "en",
   "cSpell.words": [
+    "Cmds",
     "unref"
   ]
 }

+import { join, resolve } from 'path';
+import inquirer from 'inquirer';
+import fs from 'fs-extra';
+import chalk from 'chalk';
+
+async function genreateIcon() {
+  const answers = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'entry',
+      message: 'Set Iconfont.js File Entry Location!',
+      default: 'src/assets/iconfont/iconfont.js',
+    },
+    {
+      type: 'input',
+      name: 'output',
+      message: 'Set The Location For Storing Generated File!',
+      default: 'src/components/Icon/data',
+    },
+    {
+      type: 'outputFileName',
+      name: 'outputFileName',
+      message: 'Set Generate File Name!',
+      default: 'iconfont.data.ts',
+    },
+  ]);
+
+  const { entry, output, outputFileName } = answers;
+  if (![entry, output, outputFileName].every(Boolean)) {
+    global.console.log(
+      `${chalk.yellow('Generate:Icon: ')}${chalk.red(
+        'There is a problem with the file path you set!'
+      )}`
+    );
+    process.exit(1);
+  }
+
+  const groupReg = /<symbol[^]*?<\/symbol>/g;
+  const getIdReg = /id=(["'])(.*?)\1/;
+
+  const string = await fs.readFileSync(resolve(process.cwd(), entry), { encoding: 'utf-8' });
+
+  const iconNameList = Array.from(string.matchAll(groupReg)).map(([string]) => {
+    const [, , name] = string.match(getIdReg) || [];
+    return name.replace('iconfont-', '');
+  });
+
+  await fs.writeFileSync(
+    join(output, outputFileName),
+    `export default ${JSON.stringify({ prefix: 'iconfont', icons: iconNameList }, null, 2)}`
+  );
+
+  global.console.log(
+    `${chalk.yellow('Generate:Icon: ')}${chalk.cyan(
+      'ICon generated successfully, Store Address: '
+    )}${chalk.cyan(join(resolve(process.cwd()), output, outputFileName))}`
+  );
+}
+
+genreateIcon();