Merge branch 'release/1.3.1'

lerna.json

@@ -1,10 +1,12 @@
 {
   "packages": [
-    "packages/code",
-    "packages/v4_page"
+    "packages/qjkankan-components",
+    "packages/qjkankan-editor",
+    "packages/qjkankan-kankan-view",
+    "packages/qjkankan-view"
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
   "useNx": false,
-  "version": "0.0.0"
+  "version": "1.2.0"
 }

package.json

@@ -5,19 +5,35 @@
     "packages/*"
   ],
   "devDependencies": {
-    "lerna": "^5.1.6"
+    "lerna": "^5.1.6",
+    "lint-staged": "^10.5.4"
   },
   "scripts": {
-    "main:serve": "yarn workspace qjkankan run serve",
-    "main:serve-testprod": "yarn workspace qjkankan run serve-testprod",
-    "main:build": "yarn workspace qjkankan run build",
-    "main:build-testprod": "yarn workspace qjkankan run build-testprod",
-    "v4_page:build": "yarn workspace v4_page run build",
-    "v4_page:serve": "yarn workspace v4_page run serve",
-    "build": "npm-run-all -s main:build v4_page:build",
-    "build-testprod": "npm-run-all -s main:build-testprod v4_page:build"
+    "edit:serve": "yarn workspace  @qjkankan/editor run serve-testdev",
+    "edit:serve-testprod": "yarn workspace  @qjkankan/editor run serve-testprod",
+    "edit:build": "yarn workspace  @qjkankan/editor run build",
+    "edit:build-testprod": "yarn workspace  @qjkankan/editor run build-testprod",
+    "kankan-view:run": "yarn workspace @qjkankan/kankan-view run serve",
+    "kankan-view:dev": "yarn workspace @qjkankan/kankan-view run serve",
+    "kankan-view:build": "yarn workspace @qjkankan/kankan-view run build",
+    "view:run": "yarn workspace @qjkankan/view run serve",
+    "view:dev": "yarn workspace @qjkankan/view run serve",
+    "view:build": "yarn workspace @qjkankan/view run build",
+    "build": "npm-run-all -s edit:build kankan-view:build",
+    "build-testprod": "npm-run-all -s edit:build-testprod view:build"
   },
   "dependencies": {
     "npm-run-all": "^4.1.5"
+  },
+  "lint-staged": {
+    "*.js": [
+      "prettier --write"
+    ],
+    "*.ts": [
+      "prettier --write"
+    ],
+    "*.vue": [
+      "prettier --write"
+    ]
   }
 }

packages/code/.env

@@ -1,7 +0,0 @@
-VUE_APP_MAIN_COLOR=''
-VUE_APP_STATIC_DIR=static
-VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
-VUE_APP_CDN=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com
-VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
-VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
-VUE_APP_URL_FILL=

packages/code/.env.bendi

@@ -1,6 +0,0 @@
-VUE_APP_MAIN_COLOR=''
-VUE_APP_STATIC_DIR=static
-VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
-VUE_APP_CDN=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com
-VUE_APP_PROXY_URL='http://192.168.0.135:8001/'
-VUE_APP_URL_FILL='/'

packages/code/.env.prod

@@ -1,6 +0,0 @@
-VUE_APP_MAIN_COLOR=''
-VUE_APP_STATIC_DIR=static
-VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
-VUE_APP_CDN=https://4dkk.4dage.com
-VUE_APP_PROXY_URL='http://www.4dkankan.com/qjkankan/'
-VUE_APP_URL_FILL=/qjkankan

packages/code/.env.testprod

@@ -1,8 +0,0 @@
-NODE_ENV=production
-VUE_APP_MAIN_COLOR=''
-VUE_APP_STATIC_DIR=static
-VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
-VUE_APP_CDN=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com
-VUE_APP_PROXY_URL='http://test.4dkankan.com/qjkankan/'
-VUE_APP_PROXY_4DKANKAN_URL=''
-VUE_APP_URL_FILL=/qjkankan

packages/code/.eslintrc.js

@@ -1,22 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true,
-    browser: true,
-    es6: true,
-    commonjs: true,
-    jquery: true,
-  },
-  'extends': [
-    'plugin:vue/essential',
-    'eslint:recommended'
-  ],
-  parserOptions: {
-    parser: 'babel-eslint'
-  },
-  rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-unused-vars': 'off',
-  },
-}

packages/code/README.md

@@ -1,76 +0,0 @@
-# someData模板
-
-## 位置
-/阿里云-四维时代-官网web测试服务器-120.25.146.52/mnt/720yun_fd_manage_data/baseData
-
-## 含义
-```js
-{
-  "isPassword": 0,
-  "password": "",
-  "ossSomeData": "",
-  "icon": "",
-  "description": "",
-  "updateTime": "",
-  "sceneIndex": "",
-  "catalogRoot": [
-    {
-      "id": 100,
-      "name": "一级分组",
-      "children": [
-        1
-      ]
-    }
-  ],
-  "firstScene": "",
-  "userId": "",
-  "isLogo": 1,
-  "appIcon": "",
-  "qrCode": "",
-  "createTime": "",
-  "catalogs": [
-    {
-      "id": 1,
-      "name": "默认二级分组"
-    }
-  ],
-  "isRemind": 1,
-  "name": "",
-  "pcIcon": "",
-  "scenes": [],
-  "isAuto": 1,
-  "logo": "",
-  "logoChange": false,
-  "share": "",
-  "id": "",
-  "remindTime": 1,
-  "status": 0,
-  "openingAnimationType": "小行星开场", // 开场动画类型
-  "backgroundMusic": { // 背景音乐
-    "id": "",
-    "name": "",
-    "ossPath": ""
-  },
-  "customMask": { // 自定义遮罩
-    "sky": "",
-    "earth": ""
-  },
-  "customButton": [ // 自定义按钮
-    {
-      "type": "电话",
-      "name": "电话",
-      "value": "",
-      "isShow": false
-    },
-    {
-      "type": "链接",
-      "name": "链接",
-      "value": "",
-      "isShow": false
-    }
-  ]
-}
-```
-
-# 会员测试账号
-15915816041  4DAge123456

packages/code/babel.config.js

@@ -1,14 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ],
-  plugins: [
-    [
-      "component",
-      {
-        "libraryName": "element-ui",
-        "styleLibraryName": "theme-chalk"
-      }
-    ]
-  ]
-}

packages/code/package.json

@@ -1,44 +0,0 @@
-{
-  "name": "qjkankan",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "serve-prod": "vue-cli-service serve --mode prod",
-    "serve-local": "vue-cli-service serve --mode bendi",
-    "build": "vue-cli-service build",
-    "build-prod": "vue-cli-service build --mode prod",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@floating-ui/dom": "^0.5.4",
-    "core-js": "^3.8.2",
-    "element-ui": "^2.15.1",
-    "html2canvas": "^1.4.1",
-    "photoswipe": "^4.1.3",
-    "swiper": "^5.3.8",
-    "v-viewer": "^1.5.1",
-    "video.js": "^7.11.8",
-    "vue": "^2.6.12",
-    "vue-awesome-swiper": "^4.1.1",
-    "vue-cropperjs": "^4.2.0",
-    "vue-i18n": "^8.22.3",
-    "vue-photo-preview": "^1.1.3",
-    "vue-router": "^3.4.9",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.9",
-    "@vue/cli-plugin-eslint": "^4.5.9",
-    "@vue/cli-plugin-router": "^4.5.9",
-    "@vue/cli-service": "^4.5.9",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-component": "^1.1.1",
-    "eslint": "^6.8.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "less": "^3.13.1",
-    "less-loader": "^5.0.0",
-    "vue-template-compiler": "^2.6.12"
-  }
-}

packages/code/public/edit.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="./favicon.ico" />
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfont/iconfont.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ1.1.0/iconfont.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontVR/iconfont.css"/>
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2410347_3sp3zd6hsff.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/animate/animate.min.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.min.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>
-    <title>全景看看作品制作工具</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/jquery-2.1.1.min.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/krpano/js/tour.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.concat.min.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.min.js"></script>
-  </body>
-</html>

packages/code/public/material.html

@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="./favicon.ico" />
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfont/iconfont.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ1.1.0/iconfont.css"/>
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2947721_fdnuf7rzr.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/animate/animate.min.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.min.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/tooltipster/tooltipster.bundle.min.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/tooltipster/tooltipster-sideTip-borderless.min.css"/>
-
-    <title>四维·全景看看</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/jquery-2.1.1.min.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/krpano/js/tour.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.concat.min.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.min.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/audio.min.1.0.4.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/tooltipster/tooltipster.bundle.js"></script>
-
-  </body>
-</html>