Merge branch 'feat' of ssh://101.201.226.163:50022/TALL/TALL-MUI-4 into feat

CHANGELOG.md

@@ -1,49 +1,56 @@
 # 1.0.0 (2022-01-10)
 
 ### 🌟 新功能
-范围|描述|commitId
---|--|--
- - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
- - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
- - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
- - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
- - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
- - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
- - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005)
- - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75)
- - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
- - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
- - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
- - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
 
+| 范围 | 描述                     | commitId                                                                 |
+| ---- | ------------------------ | ------------------------------------------------------------------------ |
+| -    | 更新代码                 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) |
+| -    | 日历页首页               | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) |
+| -    | 日历页添加               | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) |
+| -    | 时间轴接口               | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) |
+| -    | 时间轴页面               | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) |
+| -    | 更新代码                 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) |
+| -    | 添加 timeline            | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) |
+| -    | 项目列表                 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) |
+| -    | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) |
+| -    | 添加 timeline            | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) |
+| -    | 项目操作面板             | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) |
+| -    | 项目列表                 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) |
+| -    | app.vue                  | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) |
+| -    | first commit             | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) |
+| -    | vue3                     | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) |
 
 ### 🎨 代码样式
-范围|描述|commitId
---|--|--
- - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
- - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
 
+| 范围 | 描述                    | commitId                                                                 |
+| ---- | ----------------------- | ------------------------------------------------------------------------ |
+| -    | calender 格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) |
+| -    | 细节调整                | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) |
+
+### 🐛 Bug 修复
+
+| 范围 | 描述         | commitId                                                                 |
+| ---- | ------------ | ------------------------------------------------------------------------ |
+| -    | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) |
 
 ### 🔨 代码重构
-范围|描述|commitId
---|--|--
- - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
- - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
 
+| 范围 | 描述                   | commitId                                                                 |
+| ---- | ---------------------- | ------------------------------------------------------------------------ |
+| -    | 重构 project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) |
 
 ### 🚀 性能优化
-范围|描述|commitId
---|--|--
- - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b)
 
+| 范围 | 描述     | commitId                                                                 |
+| ---- | -------- | ------------------------------------------------------------------------ |
+| -    | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) |
 
 ### chore
-范围|描述|commitId
---|--|--
- - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089)
-
 
-范围|描述|commitId
---|--|--
- - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49)
+| 范围 | 描述                | commitId                                                                 |
+| ---- | ------------------- | ------------------------------------------------------------------------ |
+| -    | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) |
 
+| 范围 | 描述           | commitId                                                                 |
+| ---- | -------------- | ------------------------------------------------------------------------ |
+| -    | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) |

components/Calendar/Calendar.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script setup>
-import { reactive, computed, watchEffect, defineProps, defineEmits } from 'vue';
+import { reactive, computed, watchEffect } from 'vue';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
 import { generateDates, formatDate } from './generateDates.js';

components/Globals/Globals.vue

@@ -39,7 +39,8 @@
 
 <script setup>
 import { computed } from 'vue';
-import { useStore } from 'vuex';
+import { useStore } from 'vuex';
+import Skeleton from '@/components/Skeleton/Skeleton.vue';
 
 const sysHeight = uni.getSystemInfoSync().screenHeight; // 屏幕的高度
 const globalsHeight = Math.floor(((sysHeight - 44 - 30 - 10) / 5) * 4); // 全局任务的最大高度

components/Plugin/Plugin.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script setup>
-import { reactive, defineProps, nextTick, computed } from 'vue';
+import { reactive, nextTick, computed } from 'vue';
 import { useStore } from 'vuex';
 
 const props = defineProps({

components/Projects/ProjectItem.vue

@@ -63,7 +63,7 @@
 </template>
 
 <script setup>
-import { ref, computed, defineProps, defineEmits } from 'vue';
+import { ref, computed } from 'vue';
 import dayjs from 'dayjs';
 import { useStore } from 'vuex';
 import config from '@/common/js/config.js';

components/Roles/Roles.vue

@@ -65,10 +65,10 @@ onMounted(() => {
     const query = uni.createSelectorQuery().in(this);
     query
       .selectAll('.tab-children')
-      .boundingClientRect(data => {
-        console.log('data', data);
-        if (data.length) {
-          data.roleLeft = data[0].left;
+      .boundingClientRect(res => {
+        console.log('data', res);
+        if (res.length) {
+          data.roleLeft = res[0].left;
         }
       })
       .exec();
@@ -84,8 +84,8 @@ function setCurrentRole(index) {
   const query = uni.createSelectorQuery().in(this);
   query
     .selectAll('.tab-children')
-    .boundingClientRect(data => {
-      data.forEach(item => {
+    .boundingClientRect(res => {
+      res.forEach(item => {
         data.tabList.push({ width: item.width });
       });
     })

components/Skeleton/READ_ME.md

@@ -1,84 +0,0 @@
-# skeleton组件
-
-### 1.描述
-> 此组件用于加载数据时占位图显示，跟vant-ui骨架屏用法相似，但比vant-ui更灵活
-
-
-
-### 2.用法
-
-- 基本用法
-
-代码：
-```vue
-//基本用法
-<skeleton :row="3" animate :loading="loading" >
-  <view>
-    content
-  </view>
-</skeleton>
-```
-
-
-- **显示 title ——通过 **title 属性显示title占位图
-
-代码：
-```vue
-//显示 title——通过 title 属性显示title占位图
-<skeleton :row="3" title animate :loading="loading">
-  <view>
-    content
-  </view>
-</skeleton>
-```
-
-
-- 显示头像（上面)——通过avatar=‘top’让头像的占位图上面显示
-
-代码：
-```vue
-<skeleton  :avatar="top"  avatarAlign="left" :row="3" animate :loading="loading" style="margin-top:24rpx;">
-  <view>
-    content
-  </view>
-</skeleton>
-```
-
-
-- 显示头像（左边)——通过avatar=‘left’让头像的占位图左边显示
-
-代码：
-```vue
-<skeleton title :avatar="left" :row="3" animate :loading="loading" style="margin-top:24rpx;">
-  <view>
-    content
-  </view>
-</skeleton>
-```
-
-
-- 显示banner**——通过 **banner属性显示banner占位图（只显示banner，不显示内容占位图时设置row="0"）
-
-代码：
-```vue
-<skeleton banner :row="0" animate :loading="loading" style="margin-top:24rpx;">
-  <view>
-    content
-  </view>
-</skeleton>
-```
-### 
-### 3. API
-### Props
-| **属性名** | **说明** | **类型** | **默认值** | 可取值 |
-| --- | --- | --- | --- | --- |
-| loading | 是否显示骨架屏 | Boolean | true | true/false |
-| row | 段落行数 | Number | String | 3 | 0表示不展现 |
-| rowWidth | 段落行宽度 | Boolean &#124; Number | '100%' |  |
-| title | 是否显示标题 | Boolean &#124; String | false |  |
-| banner | 是否显示banner | Boolean &#124; String | false |  |
-| animate | 是否开启动画 | Boolean &#124; String | false |  |
-| avatar | 头像位置 | Boolean &#124; String | ''空 | left/top |
-| avatarSize | 头像大小 | String | - |  |
-| avatarShape | 头像形状 | String | circle | circle/round |
-

components/Skeleton/Skeleton.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script setup>
-import { computed, defineProps } from 'vue';
+import { computed } from 'vue';
 /**
  * skeleton 骨架屏
  * @description 用于加载数据时占位图显示，跟Vant-UI用法相似，但比Vant-UI更灵活

components/TimeLine/TimeLine.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script setup>
-import { reactive, computed, defineEmits } from 'vue';
+import { reactive, computed } from 'vue';
 import { useStore } from 'vuex';
 // import Barrier from './component/Barrier.vue';
 import dayjs from 'dayjs';

components/TimeLine/component/TaskTools.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script setup>
-import { defineProps, reactive } from 'vue';
+import { reactive } from 'vue';
 import CreateTask from '@/components/Title/components/CreateTask.vue';
 
 defineProps({ task: { type: Object, default: () => {} } });

components/TimeLine/component/TimeStatus.vue

@@ -57,7 +57,7 @@
 </template>
 
 <script setup>
-import { reactive, onMounted, defineProps, computed } from 'vue';
+import { reactive, onMounted, computed } from 'vue';
 import { useStore } from 'vuex';
 import CreateTask from '../../Title/components/CreateTask.vue';
 

components/Tips/Tips.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script setup>
-import { useStore, defineProps, onMounted, computed, reactive } from 'vuex';
+import { useStore, onMounted, computed, reactive } from 'vuex';
 
 defineProps({ title: { default: '提示', type: String } });
 

pages/index/index.vue

@@ -1,19 +1,19 @@
 <template>
-  <!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
-  <view class="flex flex-col h-full bg-gray-50">
-    <view class="relative" @touchmove="onMove">
-      <!-- 日历 -->
-      <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
-      <!-- 上传 导入wbs -->
-      <Upload @success="onUploadSuccess" @error="onUploadError" />
-    </view>
-
-    <!-- 项目列表 -->
-    <Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
-
-    <!-- 全局提示框 -->
-    <u-top-tips ref="uTips"></u-top-tips>
-  </view>
+	<!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
+	<view class="flex flex-col h-full bg-gray-50">
+		<view class="relative" @touchmove="onMove">
+			<!-- 日历 -->
+			<Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
+			<!-- 上传 导入wbs -->
+			<Upload @success="onUploadSuccess" @error="onUploadError" />
+		</view>
+
+		<!-- 项目列表 -->
+		<Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
+
+		<!-- 全局提示框 -->
+		<u-top-tips ref="uTips"></u-top-tips>
+	</view>
 </template>
 
 <script setup>

pages/project/project.vue

@@ -11,13 +11,14 @@
       <Globals />
 
       <!-- 定期任务面板 -->
-      <TimeLine @getTasks="getTasks" class="flex-1 overflow-hidden" ref="timeLine" />
+      <!-- <TimeLine @getTasks="getTasks" class="flex-1 overflow-hidden" ref="timeLine" /> -->
+      <TimeLine class="flex-1 overflow-hidden" ref="timeLine" />
     </view>
   </view>
 </template>
 
 <script setup>
-import { computed, watch } from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 import { useStore } from 'vuex';
 import useInit from '@/hooks/project/useInit';
 import useGetTasks from '@/hooks/project/useGetTasks';
@@ -31,6 +32,12 @@ const timeUnit = computed(() => store.state.task.timeUnit);
 const projectId = computed(() => store.getters['project/projectId']);
 const userId = computed(() => store.getters['user/userId']);
 const newProjectInfo = computed(() => store.state.task.newProjectInfo);
+const height = ref(null);
+
+onMounted(() => {
+  const system = uni.getSystemInfoSync();
+  height.value = `${system.windowHeight}px`;
+});
 
 // 获取可变全局任务
 function getGlobalData() {