Merge remote-tracking branch 'origin/develop' into song

4 years ago · 07d7aa4ce2
14 changed files with 94 additions and 48 deletions
--- a/.env.development
+++ b/.env.development
@ -1,2 +1,5 @@
+VUE_APP_NODE_ENV=development
 VUE_APP_BASE_URL=https://test.tall.wiki
 VUE_APP_API_URL=https://test.tall.wiki/gateway
+VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
+VUE_APP_PUBLIC_PATH=/pt-dev/
--- a/.env.production
+++ b/.env.production
@ -1,2 +1,5 @@
+VUE_APP_NODE_ENV=production
 VUE_APP_BASE_URL=https://www.tall.wiki
 VUE_APP_API_URL=https://www.tall.wiki/gateway
+VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
+VUE_APP_PUBLIC_PATH=/pt-dev/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -17,69 +17,86 @@
 - | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e)
 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ed3d644)
 pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/de01343)
+ - | db store | [6414c4f](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/6414c4f)
+ - | indexedDB | [687394e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/687394e)
+ - | post 封装 | [da52e94](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/da52e94)
+ - | tall插件封装 | [1bcb920](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1bcb920)
+ - | 存token | [b8a178d](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/b8a178d)
+ - | 提交到本地 | [9cbe411](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/9cbe411)
+ - | 时间基准线，默认插件 | [a33ba1e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a33ba1e)
+ - | 时间轴修改状态时提示框增加 | [e841392](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/e841392)
+ - | 时间轴界面 | [33927e9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/33927e9)
+ - | 标题栏变化 | [c0fcd9d](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c0fcd9d)
+ - | 标题栏角色栏全局任务组件新建 | [0500cb4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0500cb4)
+ - | 模拟接口测试 | [69e7931](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/69e7931)
+ - | 添加时间轴上下滚动 | [2b81bbc](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/2b81bbc)
+ - | 角色栏实现 | [94cd671](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/94cd671)
+ pinch | alloy finger实现图片的pinch放大缩小 | [de01343](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/de01343)
+ 富文本插件 | 富文本插件demo测试 | [ed3d644](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ed3d644)


 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
- - | 代码格式细节调整 | [cb2532b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/cb2532b)
- - | 更新代码 | [8c27e68](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/8c27e68)
- - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1f40a76)
- - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4aba872)
- - | 日常任务修改 | [dfa7ee2](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/dfa7ee2)
- - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/54bca09)
- - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/21ac4bb)
- - | 修改角色样式 | [73e268e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/73e268e)
- - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/89c0035)
+ - | 代码格式细节调整 | [cb2532b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/cb2532b)
+ - | 任务快捷方式图标增加 | [4aba872](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/4aba872)
+ - | 修改角色样式 | [73e268e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/73e268e)
+ - | 图标修改 | [54bca09](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/54bca09)
+ - | 无基本变化 | [21ac4bb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/21ac4bb)
+ - | 日常任务修改 | [dfa7ee2](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/dfa7ee2)
+ - | 更新代码 | [8c27e68](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/8c27e68)
+ - | 更新代码 | [1f40a76](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1f40a76)
+ - | 组件新建 | [89c0035](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/89c0035)


 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
- - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e9fdd71)
- - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/19228d6)
- - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/d533a01)
- - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e82ede4)
- - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4d0ae46)
- - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f2f06c5)
- - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a54c601)
- - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/749ae9a)
+ - | 上下滚动时间轴 | [d533a01](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/d533a01)
+ - | 修改main | [749ae9a](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/749ae9a)
+ - | 修改角色栏组件 | [a54c601](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a54c601)
+ - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f2f06c5)
+ - | 时间轴上下滑动 | [4d0ae46](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/4d0ae46)
+ - | 时间轴上下滚动数据加载bug修改 | [e82ede4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/e82ede4)
+ - | 角色栏修改 | [19228d6](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/19228d6)
+ - | 骨架屏替换 | [e9fdd71](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/e9fdd71)
+ - | 角色栏修改 | [19228d6](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/19228d6)


 ### 📝 文档
 范围|描述|commitId
 --|--|--
- - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ab0eb05)
+ - | README.md | [ab0eb05](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ab0eb05)


 ### chore
 范围|描述|commitId
 --|--|--
- - | api 封装 | [8dcb8a2](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/8dcb8a2)
- - | mock | [51c24a5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/51c24a5)
- pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | [875fab4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/875fab4)
- - | uview-ui | [a9ea34b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a9ea34b)
- 信息配置 | 配置eslint等配置 | [7421443](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/7421443)
+ - | api 封装 | [8dcb8a2](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/8dcb8a2)
+ - | env host修改 | [a79a4a5](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a79a4a5)
+ - | mock | [51c24a5](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/51c24a5)
+ pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | [875fab4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/875fab4)
+ - | uview-ui | [a9ea34b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a9ea34b)
+ 信息配置 | 配置eslint等配置 | [7421443](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/7421443)


 范围|描述|commitId
 --|--|--
- - | style:index | [978f272](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/978f272)
- - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f5e61dd)
- - | init | [c0f1deb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0f1deb)
+ - | style:index | [978f272](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/978f272)
+ - | !2 基础模板v1.1.0 | [f5e61dd](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f5e61dd)
+ - | init | [c0f1deb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c0f1deb)


 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
- template | eslint prettier sass uview tailwindcss | [9c966a1](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9c966a1)
+ template | eslint prettier sass uview tailwindcss | [9c966a1](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/9c966a1)


 ### 🚀 性能优化
 范围|描述|commitId
 --|--|--
- - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/215c6b3)
- - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/22bfe7b)
- - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/17bb8c9)
- - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1421504)
-
+ - | 组件文件夹新建 | [22bfe7b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/22bfe7b)
+ - | 组件文件夹新建 | [17bb8c9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/17bb8c9)
+ - | 组件文件夹新建 | [1421504](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1421504)
+ - | 角色栏文字颜色修改 | [215c6b3](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/215c6b3)
--- a/src/__MACOSX/._components
+++ b/src/__MACOSX/._components
--- a/src/__MACOSX/components/._J-skeleton
+++ b/src/__MACOSX/components/._J-skeleton
--- a/src/config/app.js
+++ b/src/config/app.js
@ -0,0 +1,7 @@
+const version = '3.0.0';
+
+export default {
+  V: version,
+  version,
+  theme: [],
+};
--- a/src/config/plugin.js
+++ b/src/config/plugin.js
@ -0,0 +1,5 @@
+// 定义插件相关信息
+/* eslint-disable */
+export default {
+  defaults: [], // 默认插件id列表
+};
--- a/src/config/zIndex.js
+++ b/src/config/zIndex.js
@ -0,0 +1,5 @@
+// 定义项目中定位的元素的层级
+/* eslint-disable */
+export default {
+  roleBar: 999, // 角色栏成绩
+};
--- a/src/main.js
+++ b/src/main.js
@ -1,6 +1,7 @@
 import Vue from 'vue';
-import App from './App';
 import uView from 'uview-ui';
+import Tall from '@/utils/tall';
+import App from './App';
 import './common/styles/index.css';
 import store from './store';

@ -16,6 +17,7 @@ Vue.use(indexedDB);

 Vue.config.productionTip = false;
 Vue.use(uView);
+Vue.use(Tall);

 App.mpType = 'app';

--- a/src/package.json
+++ b/src/package.json
@ -1,12 +0,0 @@
-{
-    "id": "ls-skeleton",
-    "name": "skeleton骨架屏（可随意配置骨架内容结构）",
-    "version": "1.0.0",
-    "description": "可随意配置骨架内容结构的骨架屏插件，自由度高，复用性强，扩展性强",
-    "keywords": [
-        "动画效果",
-        "VUE",
-        "NVUE",
-        "微信小程序"
-    ]
-}
--- a/src/pages/test/test.vue
+++ b/src/pages/test/test.vue
@ -13,5 +13,3 @@ export default {
  },
 };
 </script>
-
-<style></style>
--- a/src/utils/indexedDB.js
+++ b/src/utils/indexedDB.js
@ -178,7 +178,7 @@ const install = Vue => {
  };

  // create
-  console.log(curriedCreate(Vue.prototype.$db.db));
+  // console.log(curriedCreate(Vue.prototype.$db.db));
  Vue.prototype.$db.create = curriedCreate(Vue.prototype.$db.db);
 };

--- a/src/utils/tall.js
+++ b/src/utils/tall.js
@ -0,0 +1,17 @@
+import app from '@/config/app.js';
+import zIndex from '@/config/zIndex.js';
+import plugin from '@/config/plugin.js';
+
+const $t = {
+  zIndex, // 定位元素层级
+  app, // app级别的相关配置
+  plugin, // 插件相关配置信息
+};
+
+uni.$t = $t;
+
+const install = Vue => {
+  Vue.prototype.$t = $t;
+};
+
+export default { install };
--- a/vue.config.js
+++ b/vue.config.js
@ -6,6 +6,7 @@ module.exports = {
  productionSourceMap: false,
  devServer: {
    // open: true,
+    host: '127.0.0.1',
    overlay: { warnings: false, errors: true },
    // proxy: {}
  },