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

CHANGELOG.md

@@ -20,6 +20,15 @@
  - | 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)
+ - | 时间基准线，默认插件 | [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)
+ - | 添加时间轴上下滚动 | [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)
 
 
 ### 🎨 代码样式
@@ -28,6 +37,7 @@
  - | 任务快捷方式图标增加 | [4aba872](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/4aba872)
  - | 图标修改 | [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)
@@ -36,7 +46,12 @@
 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
+ - | 上下滚动时间轴 | [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)
+ - | 角色栏修改 | [19228d6](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/19228d6)
 
 
 ### 📝 文档
@@ -68,3 +83,8 @@
  - | 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
+--|--|--
+ - | !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)

src/components/Globals/Globals.vue

@@ -1,27 +1,36 @@
 <template>
   <view class="m-2">
-    <u-card margin="0" :show-head="false" :show-foot="false" border-radius="25" :style="{ height: isShrink ? '96rpx' : '300rpx' }">
+    <u-card
+      class="u-skeleton"
+      margin="0"
+      :show-head="false"
+      :show-foot="false"
+      border-radius="25"
+      :style="{ height: isShrink ? '96rpx' : '300rpx' }"
+    >
       <!-- <u-card margin="0" :show-head="false" :show-foot="false" border-radius="25" style="height: 300rpx"> -->
       <view slot="body">
         <scroll-view :scrollY="true" :style="{ height: isShrink ? '40rpx' : '240rpx' }">
-          <view class="u-col-between p-0 u-skeleton">
+          <view class="p-0 u-col-between u-skeleton">
             <view class="u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆</view>
-            <view class="u-line-2 u-skeleton-rect mt-2"> 瓶身描绘的牡丹一如你初妆222</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
+            <view class="mt-2 u-line-2 u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆222</view>
           </view>
         </scroll-view>
       </view>
     </u-card>
-    <!-- <u-skeleton :animation="true" :loading="true" bgcolor="#fff"></u-skeleton> -->
+
+    <!-- 骨架屏 -->
+    <u-skeleton :animation="true" :loading="loading" bg-color="#fff"></u-skeleton>
   </view>
 </template>
 
@@ -30,7 +39,11 @@ import { mapState } from 'vuex';
 export default {
   name: 'Global',
   data() {
-    return {};
+    return { loading: true };
+  },
+
+  mounted() {
+    setTimeout(() => (this.loading = false), 5000);
   },
   computed: mapState('home', ['isShrink']),
 };

src/components/Roles/component/RoleList.vue

@@ -1,15 +1,17 @@
 <template>
-  <view class="wrap">
-    <view class="homeBox">
+  <view>
+    <view class="home-box u-skeleton">
       <scroll-view :enable-flex="true" :scroll-left="scrollLeft" :throttle="false" scroll-with-animation scroll-x>
-        <view class="tabBox">
+        <view class="tab-box">
           <view :key="index" @click="changeIndex(index)" class="tab-item" v-for="(item, index) in roles">
-            <view :class="setColor(item.mine, tabIndex, index)" class="tab-children u-skeleton-rect">{{ item.name }}</view>
+            <view :class="setColor(item.mine, tabIndex, index)" class="tab-children u-skeleton-fillet">{{ item.name }}</view>
           </view>
         </view>
-        <u-skeleton :animation="true" :loading="loading" bgcolor="#fff"></u-skeleton>
       </scroll-view>
     </view>
+
+    <!-- 骨架屏 -->
+    <u-skeleton :animation="true" :loading="loading" bg-color="#fff"></u-skeleton>
   </view>
 </template>
 
@@ -41,7 +43,6 @@ export default {
     this.init();
     setTimeout(() => {
       this.loading = false;
-      console.log('this.loading: ', this.loading);
     }, 5000);
   },
 
@@ -84,29 +85,22 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// 这是最外层盒子
-.wrap {
-  position: relative;
-  background: #f7f7f7;
-}
-
-.homeBox {
+.home-box {
   // 对此盒子进行 sticky 粘性定位
   position: sticky;
   top: 0;
   background: #fff; // 设置背景 否则会透明
+
   /* #ifdef H5 */
   //粘性定位 在h5下 加 原生头部高度 44px
   top: 88rpx;
-
   /* #endif */
-  .tabBox {
+
+  .tab-box {
     position: relative;
     white-space: nowrap;
     // height: 88rpx;
 
-    /* #ifdef MP-TOUTIAO */
-    /* #endif */
     .tab-item {
       padding: 20rpx 24rpx;
       position: relative;

src/components/TimeLine/TimeLine.vue

@@ -15,6 +15,7 @@
     @scroll="scroll"
     @scrolltolower="handleScrollBottom"
     @scrolltoupper="handleScrollTop"
+    id="scroll"
   >
     <TimeBox ref="child" />
   </scroll-view>
@@ -28,9 +29,33 @@ export default {
   name: 'TimeLine',
   components: { TimeBox },
   data() {
-    return { top: 0 };
+    return {
+      top: 0,
+      list1: [
+        {
+          state: 0,
+          TaskPanel: { height: '100' },
+        },
+        {
+          state: 1,
+          TaskPanel: { height: '100' },
+        },
+        {
+          state: 2,
+          TaskPanel: { height: '100' },
+        },
+      ],
+    };
   },
   computed: mapState('home', ['scrollTop', 'showTips']),
+  mounted() {
+    let tasksHeight = 0;
+    const scrollHeight = document.getElementById('scroll').clientHeight;
+    for (let i = 0; i < this.list1.length; i++) {
+      tasksHeight += this.list1[i].TaskPanel.height - 0 + 42;
+    }
+    this.top = tasksHeight - scrollHeight / 2;
+  },
   methods: {
     ...mapMutations('home', ['setScrollTop', 'setShrink']),
     // 滚动

src/components/TimeLine/component/TimeBox.vue

@@ -9,7 +9,7 @@
   <view class="px-3 pb-10">
     <view :key="index" v-for="(item, index) in list">
       <view class="flex items-center">
-        <TimeStatus :status="item" :content="JSON.stringify(item)" />
+        <TimeStatus :content="JSON.stringify(item.state)" :status="item.state" />
         <view class="flex-1 ml-2 flex justify-between">
           <view>任务时间栏</view>
           <view>
@@ -23,10 +23,19 @@
       </view>
       <view class="border-l-2 border-gray-300 ml-3.5 my-2">
         <view class="ml-4 shadow-lg task-box overflow-hidden">
-          <u-card :show-foot="false" :show-head="false" class="h-16" margin="0">
+          <u-card :show-foot="false" :show-head="false" :style="{ height: item.TaskPanel.height + 'px' }" class="h-16" margin="0">
             <view slot="body">
-              <view class="u-col-between p-0 u-skeleton">
-                <view class="u-skeleton-rect">瓶身描绘的牡丹一如你初妆</view>
+              <view :key="pluginIndex" class="u-col-between p-0 u-skeleton" v-for="(plugin, pluginIndex) in item.plugins">
+                <!-- <view class="u-skeleton-rect">瓶身描绘的牡丹一如你初妆</view> -->
+                <view :key="p.pluginId" v-for="p in plugin">
+                  <text v-if="p.pluginId === '444'">这是个基准线</text>
+                  <!-- 默认插件：任务名 -->
+                  <task-title v-if="p.pluginId === '111'" />
+                  <!-- 默认插件：任务描述 -->
+                  <task-desc v-if="p.pluginId === '222'" />
+                  <!-- 默认插件：任务时差 -->
+                  <task-time-difference v-if="p.pluginId === '333'" />
+                </view>
               </view>
             </view>
           </u-card>
@@ -38,24 +47,87 @@
 </template>
 
 <script>
+import TaskDesc from '@/plugins/TaskDesc/TaskDesc.vue';
+import TaskTitle from '@/plugins/TaskTitle/TaskTitle.vue';
 import TimeStatus from './TimeStatus.vue';
+import TaskTimeDifference from '@/plugins/TaskTimeDifference/TaskTimeDifference.vue';
+
 export default {
   name: 'TimeBox',
-
-  components: { TimeStatus },
-
+  components: { TimeStatus, TaskTitle, TaskDesc, TaskTimeDifference },
   data() {
-    return { list: [0, 1, 2, 0, 1, 2] };
+    return {
+      list: [
+        {
+          state: 0,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '222' }]],
+          TaskPanel: { height: '100' },
+        },
+        {
+          state: 1,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '222' }]],
+          TaskPanel: { height: '100' },
+        },
+        {
+          state: 2,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '333' }]],
+          TaskPanel: { height: '100' },
+        },
+        {
+          state: 3,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '444' }]],
+          TaskPanel: { height: '100' },
+        },
+        {
+          state: 0,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '555' }]],
+          TaskPanel: { height: '100' },
+        },
+        {
+          state: 1,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '666' }]],
+          TaskPanel: { height: '100' },
+        },
+      ],
+    };
   },
 
   methods: {
     addTopList() {
-      this.list.unshift(0, 0, 0);
+      const item = [
+        {
+          state: 0,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '222' }]],
+        },
+        {
+          state: 0,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '222' }]],
+        },
+        {
+          state: 0,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '333' }]],
+        },
+      ];
+      this.list = item.concat(this.list);
       console.log('this.list: ', this.list);
     },
 
     addBottomList() {
-      this.list.push(1, 1, 1);
+      const item = [
+        {
+          state: 0,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '333' }]],
+        },
+        {
+          state: 0,
+          plugins: [[{ pluginId: '111' }], [{ pluginId: '333' }]],
+        },
+        {
+          state: 0,
+          plugins: [[{ pluginId: '111' }]],
+        },
+      ];
+      this.list = this.list.concat(item);
       console.log('this.list: ', this.list);
     },
   },

src/plugins/TaskDesc/TaskDesc.vue

@@ -0,0 +1,23 @@
+<template>
+  <div>{{ plugin.intro }}</div>
+</template>
+
+<script>
+export default {
+  name: 'TaskDesc',
+  props: {},
+  data() {
+    return {
+      plugin: {
+        intro: '任务描述',
+        id: '222',
+      },
+    };
+  },
+  computed: {},
+  methods: {},
+  watch: {},
+};
+</script>
+
+<style></style>

src/plugins/TaskTimeDifference/TaskTimeDifference.vue

@@ -0,0 +1,23 @@
+<template>
+  <div>{{ plugin.timeDifference }}</div>
+</template>
+
+<script>
+export default {
+  name: 'TaskTimeDifference',
+  props: {},
+  data() {
+    return {
+      plugin: {
+        timeDifference: '+30',
+        id: '222',
+      },
+    };
+  },
+  computed: {},
+  methods: {},
+  watch: {},
+};
+</script>
+
+<style></style>

src/plugins/TaskTitle/TaskTitle.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="task-title">{{ plugin.name }}</div>
+</template>
+
+<script>
+export default {
+  name: 'TaskTitle',
+  props: {},
+  data() {
+    return {
+      plugin: {
+        name: '任务名',
+        id: '111',
+      },
+    };
+  },
+  computed: {},
+  methods: {},
+  watch: {},
+};
+</script>
+
+<style></style>

yarn.lock

@@ -1151,11 +1151,6 @@
     pako "^1.0.11"
     safe-area-insets "^1.4.1"
 
-"@dcloudio/uni-helper-json@*":
-  version "1.0.13"
-  resolved "https://registry.npm.taobao.org/@dcloudio/uni-helper-json/download/@dcloudio/uni-helper-json-1.0.13.tgz#4e8aa062daaefb30d98973c035a7b0ab628329c7"
-  integrity sha1-ToqgYtqu+zDZiXPANaewq2KDKcc=
-
 "@dcloudio/uni-i18n@^0.0.3":
   version "0.0.3"
   resolved "https://registry.nlark.com/@dcloudio/uni-i18n/download/@dcloudio/uni-i18n-0.0.3.tgz#c7ff6ea6a4ea5cd5ef8dc3d674afa2e64502c151"
@@ -1306,13 +1301,6 @@
   dependencies:
     purgecss "^3.1.3"
 
-"@fullhuman/postcss-purgecss@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-4.0.3.tgz#55d71712ec1c7a88e0d1ba5f10ce7fb6aa05beb4"
-  integrity sha512-/EnQ9UDWGGqHkn1UKAwSgh+gJHPKmD+Z+5dQ4gWT4qq2NUyez3zqAfZNwFH3eSgmgO+wjTXfhlLchx2M9/K+7Q==
-  dependencies:
-    purgecss "^4.0.3"
-
 "@hap-toolkit/aaptjs@^1.0.0":
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/@hap-toolkit/aaptjs/download/@hap-toolkit/aaptjs-1.0.0.tgz#460d45a846c0b786a421c82ce25fcd9fff0928e6"
@@ -1736,17 +1724,17 @@
   resolved "https://registry.npm.taobao.org/@soda/get-current-script/download/@soda/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87"
   integrity sha1-pTUV2yXYA4N0OBtzryC7Ty5QjYc=
 
-"@tailwindcss/postcss7-compat@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@tailwindcss/postcss7-compat/-/postcss7-compat-2.2.0.tgz#adc5c301f5fd5ef0799f1d674999af12e8a5fd40"
-  integrity sha512-0OMFtc0+B+Gccg5DGfcv5aWjPFtGn6yyIpJvqEFdtk3O5t+H6Swe2R1VKN480Iwh6HE9kkvWA5ruFa+6gfJtWQ==
+"@tailwindcss/postcss7-compat@^2.2.4", "tailwindcss@npm:@tailwindcss/postcss7-compat@^2.2.4":
+  version "2.2.4"
+  resolved "https://registry.nlark.com/@tailwindcss/postcss7-compat/download/@tailwindcss/postcss7-compat-2.2.4.tgz#0e5b446e94cfdf892e4f76cecb703c8d698050f3"
+  integrity sha1-DltEbpTP34kuT3bOy3A8jWmAUPM=
   dependencies:
     "@fullhuman/postcss-purgecss" "^3.1.3"
     arg "^5.0.0"
     autoprefixer "^9"
     bytes "^3.0.0"
     chalk "^4.1.1"
-    chokidar "^3.5.1"
+    chokidar "^3.5.2"
     color "^3.1.3"
     cosmiconfig "^7.0.0"
     detective "^5.2.0"
@@ -1766,7 +1754,7 @@
     postcss "^7"
     postcss-functions "^3"
     postcss-js "^2"
-    postcss-load-config "^3.0.1"
+    postcss-load-config "^3.1.0"
     postcss-nested "^4"
     postcss-selector-parser "^6.0.6"
     postcss-value-parser "^4.1.0"
@@ -3635,7 +3623,7 @@ check-types@^8.0.3:
   resolved "https://registry.nlark.com/check-types/download/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552"
   integrity sha1-M1bMoZyIlUTy16le1JzlCKDs9VI=
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.2:
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.2:
   version "3.5.2"
   resolved "https://registry.nlark.com/chokidar/download/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
   integrity sha1-26OXb8rbAW9m/TZQIdkWANAcHnU=
@@ -4762,10 +4750,10 @@ dateformat@^3.0.0:
   resolved "https://registry.npm.taobao.org/dateformat/download/dateformat-3.0.3.tgz?cache=0&sync_timestamp=1612037821692&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdateformat%2Fdownload%2Fdateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha1-puN0maTZqc+F71hyBE1ikByYia4=
 
-dayjs@^1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.5.tgz#5600df4548fc2453b3f163ebb2abbe965ccfb986"
-  integrity sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g==
+dayjs@^1.10.6:
+  version "1.10.6"
+  resolved "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
+  integrity sha1-KIsqqC8thBimydTfWJjAc3rQKmM=
 
 de-indent@^1.0.2:
   version "1.0.2"
@@ -10028,14 +10016,6 @@ postcss-js@^2:
     camelcase-css "^2.0.1"
     postcss "^7.0.18"
 
-postcss-js@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33"
-  integrity sha512-gWnoWQXKFw65Hk/mi2+WTQTHdPD5UJdDXZmX073EY/B3BWnYjO4F4t0VneTCnCGQ5E5GsCdMkzPaTXwl3r5dJw==
-  dependencies:
-    camelcase-css "^2.0.1"
-    postcss "^8.1.6"
-
 postcss-load-config@^2.0.0:
   version "2.1.2"
   resolved "https://registry.nlark.com/postcss-load-config/download/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
@@ -10044,7 +10024,7 @@ postcss-load-config@^2.0.0:
     cosmiconfig "^5.0.0"
     import-cwd "^2.0.0"
 
-postcss-load-config@^3.0.1, postcss-load-config@^3.1.0:
+postcss-load-config@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.0.tgz#d39c47091c4aec37f50272373a6a648ef5e97829"
   integrity sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==
@@ -10184,13 +10164,6 @@ postcss-modules-values@^3.0.0:
     icss-utils "^4.0.0"
     postcss "^7.0.6"
 
-postcss-nested@5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.5.tgz#f0a107d33a9fab11d7637205f5321e27223e3603"
-  integrity sha512-GSRXYz5bccobpTzLQZXOnSOfKl6TwVr5CyAQJUPub4nuRJSOECK5AqurxVgmtxP48p0Kc/ndY/YyS1yqldX0Ew==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
 postcss-nested@^4:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6"
@@ -10327,7 +10300,7 @@ postcss-selector-parser@^5.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.6:
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.6:
   version "6.0.6"
   resolved "https://registry.nlark.com/postcss-selector-parser/download/postcss-selector-parser-6.0.6.tgz?cache=0&sync_timestamp=1620752924836&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
   integrity sha1-LFu6gXSsL2mBq2MaQqsO5UrzMuo=
@@ -10388,7 +10361,7 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.18, po
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^8.1.6, postcss@^8.2.1, postcss@^8.3.5:
+postcss@^8.2.1:
   version "8.3.5"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
   integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==
@@ -10560,16 +10533,6 @@ purgecss@^3.1.3:
     postcss "^8.2.1"
     postcss-selector-parser "^6.0.2"
 
-purgecss@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.0.3.tgz#8147b429f9c09db719e05d64908ea8b672913742"
-  integrity sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw==
-  dependencies:
-    commander "^6.0.0"
-    glob "^7.0.0"
-    postcss "^8.2.1"
-    postcss-selector-parser "^6.0.2"
-
 q@^1.1.2, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.nlark.com/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -12239,43 +12202,6 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-tailwindcss@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.2.4.tgz#6a2e259b1e26125aeaa7cdc479963fd217c308b0"
-  integrity sha512-OdBCPgazNNsknSP+JfrPzkay9aqKjhKtFhbhgxHgvEFdHy/GuRPo2SCJ4w1SFTN8H6FPI4m6qD/Jj20NWY1GkA==
-  dependencies:
-    "@fullhuman/postcss-purgecss" "^4.0.3"
-    arg "^5.0.0"
-    bytes "^3.0.0"
-    chalk "^4.1.1"
-    chokidar "^3.5.2"
-    color "^3.1.3"
-    cosmiconfig "^7.0.0"
-    detective "^5.2.0"
-    didyoumean "^1.2.1"
-    dlv "^1.1.3"
-    fast-glob "^3.2.5"
-    fs-extra "^10.0.0"
-    glob-parent "^6.0.0"
-    html-tags "^3.1.0"
-    is-glob "^4.0.1"
-    lodash "^4.17.21"
-    lodash.topath "^4.5.2"
-    modern-normalize "^1.1.0"
-    node-emoji "^1.8.1"
-    normalize-path "^3.0.0"
-    object-hash "^2.2.0"
-    postcss-js "^3.0.3"
-    postcss-load-config "^3.1.0"
-    postcss-nested "5.0.5"
-    postcss-selector-parser "^6.0.6"
-    postcss-value-parser "^4.1.0"
-    pretty-hrtime "^1.0.3"
-    quick-lru "^5.1.1"
-    reduce-css-calc "^2.1.8"
-    resolve "^1.20.0"
-    tmp "^0.2.1"
-
 tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.npm.taobao.org/tapable/download/tapable-1.1.3.tgz?cache=0&sync_timestamp=1607088891056&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"