diff --git a/.eslintrc.js b/.eslintrc.js
index 2824b10..067c1dd 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -19,6 +19,13 @@ module.exports = {
'vue/max-attributes-per-line': 'off',
'vue/multiline-html-element-content-newline': 'off',
'vue/html-indent': 'off',
+ 'vue/html-closing-bracket-newline': [
+ 'error',
+ {
+ singleline: 'never',
+ multiline: 'always',
+ },
+ ],
},
parserOptions: { parser: 'babel-eslint' },
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f5523e..11a4466 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-07-30)
+# 0.1.0 (2021-08-03)
### 🌟 新功能
范围|描述|commitId
@@ -6,6 +6,7 @@
- | db store | 6414c4f
- | indexedDB | 687394e
pinch | alloy finger实现图片的pinch放大缩小 | de01343
+ plugin | 插件添加了token及param参数 | aeb0292
- | post 封装 | da52e94
- | tall插件封装 | 1bcb920
- | ws storage | 21b3a06
@@ -56,6 +57,7 @@
ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | 940603a, closes #ID1000343
plugin | 插件解析机制完善 | 0f5a27d
project title | 项目标题修改; 切换角色移除script | 5c20017
+ roles | 修复默认显示不是我的角色的问题 | b69f94f
role | 切换角色的逻辑修正完善 | 4ae534f
task任务逻辑完善 | 减少初始global及regular的不必要请求 | bd4bd38
- | 上下滑动加载定期任务 | 4090d89
@@ -95,6 +97,7 @@
task beginTime | 格式化任务开始时间 | fbc0301
template | eslint prettier sass uview tailwindcss | 9c966a1
- | 下滑时间轴添加备注 | 4fd20e3
+ - | 任务状态重构 | 4693655
- | 删除多余的技术验证界面 | 542ae5b
- | 界面样式调整 | 4367249
- | 重构store分层 | 5f6fff8
diff --git a/package.json b/package.json
index 6d80665..432ebdd 100644
--- a/package.json
+++ b/package.json
@@ -63,36 +63,38 @@
"@dcloudio/webpack-uni-pages-loader": "^2.0.0-31920210709003",
"@tailwindcss/postcss7-compat": "^2.2.7",
"@vue/cli-plugin-babel": "~4.5.0",
- "@vue/cli-service": "~4.5.0",
- "autoprefixer": "^9.8.6",
- "babel-plugin-import": "^1.11.0",
- "core-js": "^3.15.2",
- "cross-env": "^7.0.2",
- "jest": "^25.4.0",
- "mini-types": "*",
- "miniprogram-api-typings": "*",
- "sass-loader": "^8.0.2",
- "node-sass": "^4.14.1",
- "postcss": "^7.0.36",
- "postcss-comment": "^2.0.0",
- "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.7",
- "vue-template-compiler": "^2.6.11",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0",
+ "@vue/cli-service": "~4.5.0",
"@vue/eslint-config-prettier": "^6.0.0",
+ "autoprefixer": "^9.8.6",
"babel-eslint": "^10.1.0",
+ "babel-plugin-import": "^1.11.0",
"commitizen": "^4.0.3",
"commitlint": "^8.2.0",
+ "compression-webpack-plugin": "^5.0.1",
"conventional-changelog-cli": "^2.0.28",
+ "core-js": "^3.15.2",
+ "cross-env": "^7.0.2",
"eslint": "^6.7.2",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-vue": "^6.2.2",
"husky": "^3.0.9",
+ "jest": "^25.4.0",
"lint-staged": "^11.0.0",
- "right-pad": "^1.0.1",
+ "mini-types": "*",
+ "miniprogram-api-typings": "*",
+ "node-sass": "^4.14.1",
+ "postcss": "^7.0.36",
"postcss-class-rename": "^1.0.1",
+ "postcss-comment": "^2.0.0",
"prettier": "^2.2.1",
- "vue-cli-plugin-commitlint": "~1.0.12"
+ "right-pad": "^1.0.1",
+ "sass-loader": "^8.0.2",
+ "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.7",
+ "vue-cli-plugin-commitlint": "~1.0.12",
+ "vue-cli-plugin-eruda": "^1.3.0",
+ "vue-template-compiler": "^2.6.11"
},
"browserslist": [
"Android >= 4",
diff --git a/src/components/Plugin/Plugin.vue b/src/components/Plugin/Plugin.vue
index 328cb98..a1fa2d1 100644
--- a/src/components/Plugin/Plugin.vue
+++ b/src/components/Plugin/Plugin.vue
@@ -4,6 +4,7 @@
@@ -41,6 +43,7 @@ export default {
pluginId: { default: '1', type: String },
styleType: { default: 0, type: Number },
pluginTaskId: { default: '', type: String },
+ param: { type: String, default: '' },
},
data() {
@@ -48,9 +51,10 @@ export default {
},
computed: {
+ ...mapState('role', ['roleId']),
+ ...mapState('user', ['token']),
...mapGetters('user', ['userId']),
...mapGetters('project', ['projectId']),
- ...mapState('role', ['roleId']),
},
created() {
@@ -69,7 +73,7 @@ export default {
const reg = /data-root=["|']?(\w+)["|']?/gi;
// console.log(data.html);
let uuid = '';
- // FIXME: 没有兼容只有js 没有html的情况
+ // FIXME: 没有兼容 只有js, 没有html的情况
if (data.html) {
// 查有没有data-root=“xxx” 有的话 将xxx替换为 pluginTaskId
@@ -77,13 +81,13 @@ export default {
uuid = RegExp.$1;
// console.log('uuid: ', uuid, `p${this.pluginTaskId}`);
- const str = data.html.replaceAll(uuid, `p${this.pluginTaskId}`);
+ const str = data.html.replace(new RegExp(uuid, 'g'), `p${this.pluginTaskId}`);
this.pluginContent = str;
} else {
this.pluginContent = data.html;
}
- const str = data.js.replaceAll(uuid, `p${this.pluginTaskId}`);
+ const str = data.js.replace(new RegExp(uuid, 'g'), `p${this.pluginTaskId}`);
this.handleDom(str);
}
// console.log(this.pluginContent);
@@ -91,7 +95,7 @@ export default {
// if (data.js) {
// if (reg.test(data.js)) {
// const uuid = RegExp.$1;
- // const str = data.js.replaceAll(uuid, `p${this.pluginTaskId}`);
+ // const str = data.js.replace(new RegExp(uuid, 'g'), `p${this.pluginTaskId}`);
// this.handleDom(str);
// } else {
// this.handleDom(data.js);
diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue
index 92c593f..8abf9d8 100644
--- a/src/components/TimeLine/TimeLine.vue
+++ b/src/components/TimeLine/TimeLine.vue
@@ -29,6 +29,7 @@ import TimeBox from './component/TimeBox.vue';
export default {
name: 'TimeLine',
components: { TimeBox },
+
data() {
return { top: 0 };
},
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index 47b27eb..e630361 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -2,12 +2,10 @@
-
+
-
- {{ $moment(+task.planStart).format(startTimeFormat) }}
-
+ {{ $moment(+task.planStart).format(startTimeFormat) }}
@@ -39,8 +37,9 @@
:task="task"
:key="plugin.pluginTaskId"
:plugin-task-id="plugin.pluginTaskId"
- :pluginId="plugin.pluginId"
- :styleType="styleType || 0"
+ :plugin-id="plugin.pluginId"
+ :param="plugin.param"
+ :style-type="styleType || 0"
v-for="plugin in row"
/>
@@ -65,6 +64,7 @@ import TaskTools from './TaskTools.vue';
export default {
name: 'TimeBox',
components: { TimeStatus, Skeleton, TaskTools },
+
data() {
return { currentComponent: '', styleType: 0 };
},
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index 70c0ed8..7b5a6a0 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -1,70 +1,33 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
- {{ time }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{ time }}
+