Merge pull request 'temp' (#16) from temp into develop

Reviewed-on: https://dd.tall.wiki/gitea/wally/TALL-MUI-3/pulls/16
4 years ago · e56798c44c
8 changed files with 146 additions and 90 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,91 +1,92 @@
-# 0.1.0 (2021-07-21)
+# 0.1.0 (2021-07-22)

 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
- - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0fcd9d)
- - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0500cb4)
- - | 存token | [b8a178d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/b8a178d)
- - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/94cd671)
- - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/69e7931)
- - | 时间基准线，默认插件 | [a33ba1e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a33ba1e)
- - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/33927e9)
- - | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e841392)
- - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9cbe411)
- - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2b81bbc)
- - | db store | [6414c4f](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/6414c4f)
- - | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e)
- - | post 封装 | [da52e94](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/da52e94)
- - | tall插件封装 | [1bcb920](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1bcb920)
- 富文本插件 | 富文本插件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)
+ - | 配置默认插件接口 | [f0c177d](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f0c177d)
+ 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)
- - | 删除插件携带的多余文件 | [0f392bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0f392bb)
- - | 添加插件数据 | [2f11b42](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2f11b42)
- - | 图标修改 | [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)
+ - | 删除插件携带的多余文件 | [0f392bb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0f392bb)
+ - | 图标修改 | [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)
+ - | 添加插件数据 | [2f11b42](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/2f11b42)
+ - | 组件新建 | [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)


 ### 📝 文档
 范围|描述|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)


 ### 🔨 代码重构
 范围|描述|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)
- - | 解决警告 | [c932b09](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c932b09)
- - | 组件文件夹新建 | [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)
+ - | 解决警告 | [c932b09](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c932b09)


 ### chore
 范围|描述|commitId
 --|--|--
- - | api 封装 | [8dcb8a2](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/8dcb8a2)
- - | env host修改 | [a79a4a5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a79a4a5)
- - | 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)

--- a/src/App.vue
+++ b/src/App.vue
@ -1,10 +1,3 @@
-<!--
- * @Author: aBin
- * @email: binbin0314@126.com
- * @Date: 2021-07-20 09:20:54
- * @LastEditors: aBin
- * @LastEditTime: 2021-07-20 09:40:53
-->
 <script>
 export default {
  onLaunch: function () {
--- a/src/apis/plugin.js
+++ b/src/apis/plugin.js
@ -0,0 +1,9 @@
+const apiUrl = process.env.VUE_APP_API_URL;
+const mock = `${apiUrl}/defaultwbs`;
+
+const install = (Vue, vm) => {
+  vm.$u.api = { ...vm.$u.api } || {};
+  vm.$u.api.getPlugin = param => vm.$u.post(`${mock}/plugin`, { param });
+};
+
+export default { install };
--- a/src/apis/task.js
+++ b/src/apis/task.js
@ -0,0 +1,11 @@
+const apiUrl = process.env.VUE_APP_API_URL;
+const tall = `${apiUrl}/defaultwbs/task`;
+
+const install = (Vue, vm) => {
+  vm.$u.api = { ...vm.$u.api } || {};
+  vm.$u.api.getGlobal = param => vm.$u.post(`${tall}/global`, param);
+  vm.$u.api.getPermanent = param => vm.$u.post(`${tall}/permanent`, param);
+  vm.$u.api.getERegular = param => vm.$u.post(`${tall}/regular`, param);
+};
+
+export default { install };
--- a/src/components/Globals/Globals.vue
+++ b/src/components/Globals/Globals.vue
@ -3,20 +3,16 @@
    <u-card :show-foot="false" :show-head="false" :style="{ height: isShrink ? '96rpx' : '300rpx' }" border-radius="25" margin="0">
      <view slot="body">
        <scroll-view :scrollY="true" :style="{ height: isShrink ? '40rpx' : '240rpx' }">
-          <skeleton :banner="false" :loading="loading" :row="4" animate class="u-line-2 mt-2 skeleton"></skeleton>
-          <view class="u-col-between p-0" v-if="!loading">
-            <view class="u-line-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 mt-2">瓶身描绘的牡丹一如你初妆222</view>
+          <view class="p-0 u-col-between">
+            <view class="grid grid-cols-3 gap-2 h-36" v-if="plugins.length">
+              <Plugin
+                :pluginId="pluginId"
+                :styleType="styleType"
+                v-for="(plugin, pluginIndex) in plugins"
+                :key="pluginIndex"
+                :class="getClass(plugin.col, plugin.row)"
+              />
+            </view>
          </view>
        </scroll-view>
      </view>
@ -26,21 +22,38 @@

 <script>
 import { mapState } from 'vuex';
-import Skeleton from '@/components/Skeleton/Skeleton';
-
 export default {
  name: 'Global',
-  components: { Skeleton },
  data() {
-    return { loading: false };
+    return {
+      loading: true,
+      pluginId: 0,
+      styleType: 0,
+      task: null,
+      plugins: [],
+    };
+  },
+  async created() {
+    const permanent = await this.$u.api.getPermanent({ roleId: 0 });
+    const res = await this.$u.api.getGlobal({
+      roleId: 0,
+      timeNode: new Date().getTime(),
+      timeUnit: 7,
+    });
+    for (let item of res.plugins) {
+      this.plugins.push(...item);
+    }
+    this.task = res;
+    console.log('permanent', permanent);
  },
-  computed: mapState('home', ['isShrink']),
  mounted() {
-    this.loading = true;
-    setTimeout(() => {
-      this.loading = false;
-      console.log('this.loading: ', this.loading);
-    }, 10000);
+    setTimeout(() => (this.loading = false), 5000);
+  },
+  computed: mapState('home', ['isShrink']),
+  methods: {
+    getClass(col, row) {
+      return [`row-span-${row}`, `col-span-${col}`];
+    },
  },
 };
 </script>
@ -64,8 +77,4 @@ export default {
  border-radius: 8rpx;
  margin-left: 12rpx;
 }
-
-.skeleton:first-child {
-  margin-top: 0 !important;
-}
 </style>
--- a/src/components/Plugin/Plugin.vue
+++ b/src/components/Plugin/Plugin.vue
@ -0,0 +1,29 @@
+<template>
+  <view v-if="pluginContent && pluginContent.html" style="height: 100%">
+    <!-- <view> {{ pluginContent.html }} </view> -->
+    <view v-html="pluginContent.html" style="height: 100%"> </view>
+    <!-- <u-parse :html="pluginContent.html" ref="ht-box"></u-parse> -->
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'Plugin',
+  data() {
+    return { pluginContent: null };
+  },
+  async mounted() {
+    await this.getPlugin();
+    console.log(this.pluginContent.js);
+  },
+  methods: {
+    async getPlugin() {
+      const res = await this.$u.api.getPlugin({
+        pluginId: 0,
+        styleType: 0,
+      });
+      this.pluginContent = res;
+    },
+  },
+};
+</script>
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@ -3,7 +3,7 @@
    <view :key="index" v-for="(item, index) in tasks">
      <view class="flex items-center">
        <TimeStatus :content="JSON.stringify(item.state)" :status="item.state" />
-        <view class="flex-1 ml-2 flex justify-between">
+        <view class="flex justify-between flex-1 ml-2">
          <view>任务时间栏</view>
          <view>
            <view class="flex justify-between" style="min-width: 180rpx">
@ -15,7 +15,7 @@
        </view>
      </view>
      <view class="border-l-2 border-gray-300 ml-3.5 my-2">
-        <view class="ml-4 shadow-lg task-box overflow-hidden">
+        <view class="ml-4 overflow-hidden shadow-lg task-box">
          <u-card
            :show-foot="false"
            :show-head="false"
@ -25,7 +25,7 @@
            v-if="item.panel.height"
          >
            <view slot="body">
-              <view :key="pluginIndex" class="u-col-between p-0 u-skeleton" v-for="(plugin, pluginIndex) in item.plugins">
+              <view :key="pluginIndex" class="p-0 u-col-between u-skeleton" v-for="(plugin, pluginIndex) in item.plugins">
                <view :key="p.pluginId" v-for="p in plugin">
                  <component
                    :is="$t.plugin.defaults.find(item => item.id === p.pluginId).component"
--- a/src/main.js
+++ b/src/main.js
@ -26,11 +26,15 @@ const app = new Vue({ ...App, store });
 import request from '@/utils/request.js';
 import user from '@/apis/user.js';
 import project from '@/apis/project.js';
+import task from '@/apis/task.js';
+import plugin from '@/apis/plugin.js';

 window.vm = app;

 Vue.use(request, app);
 Vue.use(user, app);
 Vue.use(project, app);
+Vue.use(task, app);
+Vue.use(plugin, app);

 app.$mount();