diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a5fd9c..3d22782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,24 +3,25 @@ ### 🌟 新功能 范围|描述|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) + - | 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) - - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) + - | 更新代码 | [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) - - | 项目操作面板 | [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) + - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) ### 🎨 代码样式 范围|描述|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 修复 @@ -32,6 +33,7 @@ ### 🔨 代码重构 范围|描述|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) diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss index d0b2ace..62fc09b 100644 --- a/common/styles/tailwind.scss +++ b/common/styles/tailwind.scss @@ -1,5 +1,5 @@ .container { - width: 100%; + width: 100%; } .fixed { @@ -2207,6 +2207,15 @@ box-sizing: content-box; } +.border-l-2 { + border-left-width: 2px; +} + +.border-gray-300 { + --tw-border-opacity: 1; + border-color: rgba(209, 213, 219, var(--tw-border-opacity)); +} + .block { display: block; } @@ -4310,6 +4319,11 @@ .opacity-100 { opacity: 1; } + +.h-3 { + height: 0.75rem; +} + .h-full { height: 100%; } @@ -4317,6 +4331,10 @@ --tw-bg-opacity: 1; background-color: rgba(249, 250, 251, var(--tw-bg-opacity)); } +.bg-gray-100 { + --tw-bg-opacity: 1; + background-color: rgba(243, 244, 246, var(--tw-bg-opacity)); +} .w-12 { width: 3rem; } diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue index fcc9f9f..6382c31 100644 --- a/components/Plugin/Plugin.vue +++ b/components/Plugin/Plugin.vue @@ -1,6 +1,7 @@ @@ -53,14 +54,14 @@ const props = defineProps({ param: { type: String, default: '' }, }); -const data = reactive({ pluginContent: null }); +// const data = reactive({ pluginContent: null }); const store = useStore(); const roleId = computed(() => store.state.role.roleId); -const token = computed(() => store.state.user.token); -const userId = computed(() => store.getters['user/userId']); +// const token = computed(() => store.state.user.token); +// const userId = computed(() => store.getters['user/userId']); const projectId = computed(() => store.getters['project/projectId']); -const isMine = computed(() => store.getters['role/isMine']); +// const isMine = computed(() => store.getters['role/isMine']); // 插件名称 // pluginComponent() { @@ -70,48 +71,48 @@ const isMine = computed(() => store.getters['role/isMine']); // }, // 创建script dom -function handleDom(js) { - const domList = Array.from(document.getElementsByTagName('script')); - const index = domList.findIndex(item => item.id === `p${props.pluginTaskId}`); - if (index >= 0) { - document.body.removeChild(document.getElementById(`p${props.pluginTaskId}`)); - } - const scriptDom = document.createElement('script'); - scriptDom.id = `p${props.pluginTaskId}`; - scriptDom.setAttribute('data-type', 'plugin'); - scriptDom.innerHTML = js; - nextTick(() => { - document.body.append(scriptDom); - }); -} +// function handleDom(js) { + // const domList = Array.from(document.getElementsByTagName('script')); + // const index = domList.findIndex(item => item.id === `p${props.pluginTaskId}`); + // if (index >= 0) { + // document.body.removeChild(document.getElementById(`p${props.pluginTaskId}`)); + // } + // const scriptDom = document.createElement('script'); + // scriptDom.id = `p${props.pluginTaskId}`; + // scriptDom.setAttribute('data-type', 'plugin'); + // scriptDom.innerHTML = js; + // nextTick(() => { + // document.body.append(scriptDom); + // }); +// } // 获取插件信息 -async function getPlugin() { - const params = { pluginId: props.pluginId, styleType: props.styleType }; - uni.$catchReq.getOtherPlugin(params, (err, data) => { - if (err) { - console.error('err: ', err); - } else { - if (!data || !data.id) return; - const reg = /data-root=["|']?(\w+)["|']?/gi; - let uuid = ''; - // FIXME: 没有兼容 只有js, 没有html的情况 - if (data.html) { - // 查有没有data-root=“xxx” 有的话 将xxx替换为 pluginTaskId +// async function getPlugin() { + // const params = { pluginId: props.pluginId, styleType: props.styleType }; + // uni.$catchReq.getOtherPlugin(params, (err, data) => { + // if (err) { + // console.error('err: ', err); + // } else { + // if (!data || !data.id) return; + // const reg = /data-root=["|']?(\w+)["|']?/gi; + // let uuid = ''; + // // FIXME: 没有兼容 只有js, 没有html的情况 + // if (data.html) { + // // 查有没有data-root=“xxx” 有的话 将xxx替换为 pluginTaskId - if (reg.test(data.html)) { - uuid = RegExp.$1; - const str = data.html.replace(new RegExp(uuid, 'g'), `p${props.pluginTaskId}`); - data.pluginContent = str; - } else { - data.pluginContent = data.html; - } + // if (reg.test(data.html)) { + // uuid = RegExp.$1; + // const str = data.html.replace(new RegExp(uuid, 'g'), `p${props.pluginTaskId}`); + // data.pluginContent = str; + // } else { + // data.pluginContent = data.html; + // } - const str = data.js.replace(new RegExp(uuid, 'g'), `p${props.pluginTaskId}`); - handleDom(str); - } - } - }); + // const str = data.js.replace(new RegExp(uuid, 'g'), `p${props.pluginTaskId}`); + // handleDom(str); + // } + // } + // }); // if (data.js) { // if (reg.test(data.js)) { @@ -122,13 +123,14 @@ async function getPlugin() { // this.handleDom(data.js); // } // } -} +// } +console.log('props.pluginId: ', props.pluginId); if (props.pluginId === '5') { // 根据项目id获取成员列表 store.dispatch('role/getAllMembers', { projectId: projectId.value }); } -getPlugin(); +// getPlugin(); // 点击时存储 storage async function setStorage() { diff --git a/components/Roles/Roles.vue b/components/Roles/Roles.vue index 51dcf27..e2f9416 100644 --- a/components/Roles/Roles.vue +++ b/components/Roles/Roles.vue @@ -66,7 +66,6 @@ onMounted(() => { query .selectAll('.tab-children') .boundingClientRect(res => { - console.log('data', res); if (res.length) { data.roleLeft = res[0].left; } diff --git a/components/TimeLine/TimeLine.vue b/components/TimeLine/TimeLine.vue index 98b699b..2b308d9 100644 --- a/components/TimeLine/TimeLine.vue +++ b/components/TimeLine/TimeLine.vue @@ -15,14 +15,14 @@ - + diff --git a/components/TimeLine/component/TimeBox.vue b/components/TimeLine/component/TimeBox.vue index d1ed8a7..040143d 100644 --- a/components/TimeLine/component/TimeBox.vue +++ b/components/TimeLine/component/TimeBox.vue @@ -1,25 +1,25 @@ @@ -32,7 +31,9 @@ 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 showScrollTo = computed(() => store.state.task.showScrollTo); const height = ref(null); +const timeLine = ref(null); onMounted(() => { const system = uni.getSystemInfoSync(); @@ -74,6 +75,15 @@ watch(timeNode, newValue => { getGlobalData(); // 查可变日常任务 // initPlanTasks(); // 处理定期任务 getTasksHook.initPlanTasks(); // 处理定期任务 + + // 滚动到对应位置 + let timer = null; + timer = setInterval(() => { + if (showScrollTo.value) { + clearInterval(timer); + timeLine.value.setScrollPosition(); + } + }, 500); } }); @@ -116,6 +126,10 @@ watch(newProjectInfo, newValue => { initHook.init(options); } }); + +function getTasks(params) { + getTasksHook.initPlanTasks(params); // 处理定期任务 +}