Merge branch 'test' into release-buffer

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.temp
 node_modules
 /build
 

README.md

@@ -1,19 +1,69 @@
 ### 初始化
 
 ```bash
-pnpm install
+yarn
+
+yarn serve
 ```
 
+<br>
+
+### 目录结构
+
+```
+|-build
+|-public // 静态资源
+|-src
+  |- api // 接口文件
+  |- types // 类型声明
+  |- assets // 公用代码资源
+  |- components // 公用组件
+  |- views // 项目页面入口
+  |- utils // 公用工具函数
+  |- router // 路由配置
+  |- store // 全局状态管理
+  |
+  |- env.d.ts // 环境变量声明
+  |- global.d.ts // 全局变量声明
+  |- el.d.ts // element 声明
+```
+
+<br>
+
 ### 多场景模式
 
 通过 `process.env.SCENE` 区分场景
 
-尽量使用 `.tsx` 后缀，因为 `.vue` 为自定义后缀，webpack 暂不能友好支持 `.vue` 后缀，需要明确使用 `demo.vue`，导致无法区分场景
+尽量避免使用 `.vue` 自定义后缀，ide 暂不能友好支持模糊匹配 `.vue`，需要明确使用 `demo.vue`，导致无法区分场景
+
+<br>
+
+### 关于分支
+
+`release` 稳定版本，线上代码稳定一段时间后同步 `release-buffer`
+
+`release-buffer` 发布版本，场景线分支发布生产环境需要合回此分支
+
+<br>
 
 ### 🚀 关于代码格式化
 
-在 ide 扩展中下载 `prettier`
+推荐使用 ide 插件，在 ide 扩展中下载 `prettier`
 
 以 vscode 为例：
 
 > 在 `file -> preferences -> setting` 中搜索 `defaultFormatter`<br> 选择 `Prettier - Code formatter`<br> 接着搜索 `format`<br> 将 `editor: format on save` 勾选
+
+<br>
+
+### 🤖 关于自动化部署
+
+发布地址：http://face3d.4dage.com:29394/deploy/app
+
+新建的分支如果需要自动化部署，需要在 `package.json` 下增加指令
+
+    举例：新增一个demo大场景
+    1. 在 release-buffer 下新增 demo 分支
+    2. 在 scripts 中新增 push:demo 指令，注意 push: 后的参数需要与分支名相同
+
+测试环境项目地址：https://scene.4dage.com/?m=1172

auto-imports.d.ts

@@ -0,0 +1,5 @@
+// Generated by 'unplugin-auto-import'
+export {}
+declare global {
+
+}

components.d.ts

@@ -0,0 +1,13 @@
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
+// Read more: https://github.com/vuejs/core/pull/3399
+import '@vue/runtime-core'
+
+export {}
+
+declare module '@vue/runtime-core' {
+  export interface GlobalComponents {
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+  }
+}

config.js

@@ -5,7 +5,7 @@ const ASSETS_DIR = 'resources/web/';
 /**
  * 主域名
  */
-const DOMAIN = '192.168.20.11';
+const DOMAIN = '4dage.com';
 
 /**
  * 前端版本号
@@ -24,10 +24,6 @@ const BACKEND_DOMAIN = process.env.DOMAIN || `www.${DOMAIN}`;
 
 module.exports = {
   /**
-   * 静态资源部署位置
-   */
-  publicPath: process.env.MUSEUM ? `/${process.env.MUSEUM}/` : `/`,
-  /**
    * 静态资源放置的子目录
    */
   assetsDir: ASSETS_DIR,
@@ -40,7 +36,7 @@ module.exports = {
     PROTOCOL,
     DOMAIN,
     BACKEND_DOMAIN,
-    ASSETS_URL: `/${ASSETS_DIR}`,
+    ASSETS_URL: `//${ASSETS_DIR}`,
     BACKEND_URL: `${PROTOCOL}://${BACKEND_DOMAIN}`,
   },
 };

jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel',
+};

lint-staged.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  "*.{js,jsx,vue,ts,tsx}": "vue-cli-service lint",
+  '*.{js,jsx,vue,ts,tsx}': 'vue-cli-service lint',
 };

package.json

@@ -1,46 +1,62 @@
 {
-  "name": "4dage-web",
+  "name": "vue3-scene-web",
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve:hn": "cross-env SCENE=hn vue-cli-service serve",
-    "build:hn": "cross-env SCENE=hn vue-cli-service build",
+    "serve": "cross-env TITLE=大理洱海科普馆 vue-cli-service serve",
+    "build:test": "cross-env TITLE=大理洱海科普馆 vue-cli-service build",
+    "push:test": "cross-env node ./scripts/publish.js",
     "lint": "vue-cli-service lint",
     "prepare": "husky install"
   },
   "dependencies": {
+    "axios": "^1.4.0",
     "core-js": "^3.8.3",
+    "element-plus": "^2.2.12",
     "lodash": "^4.17.21",
+    "pinia": "^2.0.24",
+    "query-string": "^8.1.0",
     "vue": "^3.2.13",
     "vue-class-component": "^8.0.0-0",
     "vue-router": "^4.0.3"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^17.6.5",
-    "@types/lodash": "^4.14.195",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@types/jest": "^27.0.1",
+    "@types/lodash": "^4.14.185",
+    "@types/webpack-env": "^1.18.0",
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
     "@vue/cli-plugin-babel": "~5.0.0",
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-plugin-router": "~5.0.0",
     "@vue/cli-plugin-typescript": "~5.0.0",
+    "@vue/cli-plugin-unit-jest": "~5.0.0",
+    "@vue/cli-plugin-vuex": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "@vue/eslint-config-typescript": "^9.1.0",
+    "@vue/test-utils": "^2.0.0-0",
+    "@vue/vue3-jest": "^27.0.0-alpha.1",
+    "babel-jest": "^27.0.6",
     "babel-plugin-lodash": "^3.3.4",
-    "commitlint": "^17.6.5",
+    "commitlint": "^17.1.2",
     "cross-env": "^7.0.3",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^8.0.3",
-    "husky": "^8.0.3",
+    "husky": "^8.0.2",
+    "jest": "^27.0.5",
     "json-loader": "^0.5.7",
+    "lint-staged": "^11.1.2",
     "lodash-webpack-plugin": "^0.11.6",
     "node-polyfill-webpack-plugin": "^2.0.1",
     "prettier": "^2.4.1",
     "sass": "^1.32.7",
     "sass-loader": "^12.0.0",
-    "svg-sprite-loader": "^6.0.11",
-    "typescript": "~4.5.5"
+    "ts-jest": "^27.0.4",
+    "typescript": "~4.5.5",
+    "unplugin-auto-import": "^0.11.2",
+    "unplugin-vue-components": "^0.22.7"
   }
 }

public/images/doll_label_corner.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="6px" viewBox="0 0 6 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>map_corner  </title>
+    <g id="页面-1" stroke="none" stroke-width="3" fill="none" fill-rule="evenodd">
+        <g id="展示界面-三维" transform="translate(-56.000000, -270.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="编组-15" transform="translate(31.000000, 270.000000)">
+                <g id="形状结合-+-形状结合-蒙版" transform="translate(25.000000, 0.000000)">
+                    <path d="M6,6 L5,6 L5,2.705 L3.301,1 L0,1 L0,0 L3.71522641,0 L6,2.29344795 L6,6 Z" id="map_corner--" transform="translate(3.000000, 3.000000) scale(-1, 1) translate(-3.000000, -3.000000) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>