From 092faccee6326921e4e4f2f7437944e19b82b4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Thu, 16 Feb 2023 18:27:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?dengjie=20:=20=E5=BE=85=E6=88=91=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=9A=84=E5=AE=A1=E6=89=B9=E8=AF=A6=E6=83=85=E7=9A=84?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=A0=87=E5=BF=97*=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4,=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=8F=B3=E8=BE=B9=E7=9A=84'=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7'=E5=B7=B2=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/common/form/FormRender.vue | 1 - .../common/process/nodes/ConditionNode.vue | 2 +- .../src/views/workspace/DisposalTask.vue | 21 ++++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/flowable-engine-web/src/views/common/form/FormRender.vue b/flowable-engine-web/src/views/common/form/FormRender.vue index e1afb78..e55306b 100644 --- a/flowable-engine-web/src/views/common/form/FormRender.vue +++ b/flowable-engine-web/src/views/common/form/FormRender.vue @@ -78,7 +78,6 @@ export default { if (item.name === 'SpanLayout'){ this.loadFormConfig(item.props.items) }else { - console.log(item,!item.perm) if (!item.perm){ this.$set(item, 'perm', 'E') } diff --git a/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue b/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue index 5b2382b..f761e93 100644 --- a/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue +++ b/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue @@ -7,7 +7,7 @@
- 优先级{{ level }} + diff --git a/flowable-engine-web/src/views/workspace/DisposalTask.vue b/flowable-engine-web/src/views/workspace/DisposalTask.vue index 91527cc..ed49d4d 100644 --- a/flowable-engine-web/src/views/workspace/DisposalTask.vue +++ b/flowable-engine-web/src/views/workspace/DisposalTask.vue @@ -60,9 +60,8 @@
-
-
+
评论 @@ -85,7 +84,7 @@ 同意
-
+
{ @@ -153,6 +153,13 @@ export default { let that = this; this.init(); getTaskInfo(taskId).then(res => { + let data=res.data + data.formItems.map(item=>{ + if(item.props.required){ + item.props.required=!item.props.required + } + return item + }) that.taskData = res.data; that.$store.state.design = that.taskData; that.$store.state.userTaskOption = that.taskData.userTaskOption; @@ -296,15 +303,15 @@ export default { } .footer { + width: 100%; + position: absolute; + bottom: 0; + left: 0; display: flex; justify-content: space-between; align-items: center; height: 30px; padding: 15px 0; - position: absolute; - width: 100%; - bottom: 0; - left: 0; z-index: 99; background: #fff; border-top: 1px solid #dcdfe6; -- 2.40.1 From f0da4f03d3c1ed7ba08101a38169afdb60bfd6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Thu, 16 Feb 2023 19:46:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?dengjie=20:=20=E8=A7=A3=E5=86=B3=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=9B=BE=E7=89=87/=E9=99=84=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E4=BB=B6placeholder=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/common/form/ComponentsConfigExport.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flowable-engine-web/src/views/common/form/ComponentsConfigExport.js b/flowable-engine-web/src/views/common/form/ComponentsConfigExport.js index 94de93a..24e1647 100644 --- a/flowable-engine-web/src/views/common/form/ComponentsConfigExport.js +++ b/flowable-engine-web/src/views/common/form/ComponentsConfigExport.js @@ -134,7 +134,8 @@ export const baseComponents = [ enablePrint: true, maxSize: 5, //图片最大大小MB maxNumber: 10, //最大上传数量 - enableZip: true //图片压缩后再上传 + enableZip: true, //图片压缩后再上传 + placeholder: '请选择图片', } }, { @@ -149,7 +150,8 @@ export const baseComponents = [ onlyRead: false, //是否只读，false只能在线预览，true可以下载 maxSize: 100, //文件最大大小MB maxNumber: 10, //最大上传数量 - fileTypes: [] //限制文件上传类型 + fileTypes: [], //限制文件上传类型, + placeholder: '请选择附件', } }, { -- 2.40.1 From 3c470860a0ad138c8bf85870be122b2579a26d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Fri, 17 Feb 2023 00:53:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?dengjie=20:=20=E8=A7=A3=E5=86=B3=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=80=97=E6=97=B6=E6=97=B6=E9=97=B4,=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=A2=84=E8=A7=88=E6=B8=85=E7=A9=BA=E8=A1=A8=E5=8D=95?= =?UTF-8?q?,=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E6=97=B6tag=E6=94=B9?= =?UTF-8?q?=E5=8F=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flowable-engine-web/src/utils/date.js | 87 +++++++++++++++++++ .../src/views/admin/layout/FormDesign.vue | 9 ++ .../common/form/ComponentsConfigExport.js | 3 +- .../src/views/common/form/FormRenderView.vue | 1 - .../common/form/components/DateTimeRange.vue | 13 ++- .../src/views/workspace/InitiatedInstance.vue | 11 ++- 6 files changed, 114 insertions(+), 10 deletions(-) create mode 100644 flowable-engine-web/src/utils/date.js diff --git a/flowable-engine-web/src/utils/date.js b/flowable-engine-web/src/utils/date.js new file mode 100644 index 0000000..43be1e3 --- /dev/null +++ b/flowable-engine-web/src/utils/date.js @@ -0,0 +1,87 @@ +//时间转换为String类型 +function simpleDateFormat(pattern) { + var fmt = new Object(); + fmt.pattern = pattern; + + fmt.parse = function (source) { + try { + return new Date(source); + } catch (e) { + console.log("字符串 " + source + " 转时间格式失败！"); + return null; + } + }; + + fmt.format = function (date) { + if (typeof (date) == "undefined" || date == null || date == "") { + return ""; + } + + try { + date = new Date(date); + } catch (e) { + console.log("时间 " + date + " 格式化失败！"); + return ""; + } + + var strTime = this.pattern;//时间表达式的正则 + + var o = { + "M+": date.getMonth() + 1, //月份 + "d+": date.getDate(), //日 + "H+": date.getHours(), //小时 + "m+": date.getMinutes(), //分 + "s+": date.getSeconds(), //秒 + "q+": Math.floor((date.getMonth() + 3) / 3), //季度 + "S": date.getMilliseconds() //毫秒 + }; + + if (/(y+)/.test(strTime)) { + strTime = strTime + .replace(RegExp.$1, (date.getFullYear() + "") + .substr(4 - RegExp.$1.length)); + } + for (var k in o) { + if (new RegExp("(" + k + ")").test(strTime)) { + strTime = strTime.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length))); + } + } + + return strTime; + }; + return fmt; +} + +//时间格式化为yyyy-MM-dd +function simpleDateFormatByMoreLine(date) { + var fmt = simpleDateFormat("yyyy-MM-dd"); + date = fmt.parse(date) + return fmt.format(date) +} + +/** + * @param dateBegin 开始时间 + * @param dateEnd 结束时间 + * @returns {string} 时间差 + */ +function consumingTime(dateBegin,dateEnd) { + // //如果时间格式是正确的，那下面这一步转化时间格式就可以不用了 + let submitTime = new Date(dateBegin) + let endTime = new Date(dateEnd) + var dateDiff = endTime - submitTime;//时间差的毫秒数 + var dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000));//计算出相差天数 + var leave1 = dateDiff % (24 * 3600 * 1000) //计算天数后剩余的毫秒数 + var hours = Math.floor(leave1 / (3600 * 1000))//计算出小时数 + //计算相差分钟数 + var leave2 = leave1 % (3600 * 1000) //计算小时数后剩余的毫秒数 + var minutes = Math.floor(leave2 / (60 * 1000))//计算相差分钟数 + //计算相差秒数 + var leave3 = leave2 % (60 * 1000) //计算分钟数后剩余的毫秒数 + var seconds = Math.round(leave3 / 1000) + return dayDiff + "天 " + hours + "小时 " + minutes + " 分钟" + seconds + " 秒"; +} + +module.exports = { + formatToYYYYMMDD: simpleDateFormatByMoreLine, + consumingTime: consumingTime +} diff --git a/flowable-engine-web/src/views/admin/layout/FormDesign.vue b/flowable-engine-web/src/views/admin/layout/FormDesign.vue index 8a03af4..30e0e76 100644 --- a/flowable-engine-web/src/views/admin/layout/FormDesign.vue +++ b/flowable-engine-web/src/views/admin/layout/FormDesign.vue @@ -119,6 +119,7 @@ export default { select: null, drag: false, formPreviewModel:"E", + formValue:{} } }, computed: { @@ -200,6 +201,14 @@ export default { }, viewForms() { this.viewFormVisible = true + this.$nextTick(function(){ + this.formValue=this.$refs.form.value + }) + for (const key in this.formValue) { + if(this.formValue[key]!=undefined){ + this.formValue[key]=[] + } + } }, selectItem(cp) { this.selectFormItem = cp diff --git a/flowable-engine-web/src/views/common/form/ComponentsConfigExport.js b/flowable-engine-web/src/views/common/form/ComponentsConfigExport.js index 24e1647..ba9f2cd 100644 --- a/flowable-engine-web/src/views/common/form/ComponentsConfigExport.js +++ b/flowable-engine-web/src/views/common/form/ComponentsConfigExport.js @@ -120,7 +120,8 @@ export const baseComponents = [ enablePrint: true, placeholder: ['开始时间', '结束时间'], format: 'yyyy-MM-dd HH:mm', - showLength: false + showLength: false, + length:0 } }, { diff --git a/flowable-engine-web/src/views/common/form/FormRenderView.vue b/flowable-engine-web/src/views/common/form/FormRenderView.vue index ead8a75..0f80e55 100644 --- a/flowable-engine-web/src/views/common/form/FormRenderView.vue +++ b/flowable-engine-web/src/views/common/form/FormRenderView.vue @@ -59,7 +59,6 @@ export default { } }, mounted() { - console.log(JSON.stringify(this.formItems)) this.loadFormConfig(this.formItems) }, methods: { diff --git a/flowable-engine-web/src/views/common/form/components/DateTimeRange.vue b/flowable-engine-web/src/views/common/form/components/DateTimeRange.vue index 491e519..e9d4b40 100644 --- a/flowable-engine-web/src/views/common/form/components/DateTimeRange.vue +++ b/flowable-engine-web/src/views/common/form/components/DateTimeRange.vue @@ -14,6 +14,11 @@ :start-placeholder="placeholder[0]" :end-placeholder="placeholder[1]"/>
时长： - {{ timeLength }} + {{timeLength}} +
@@ -31,7 +37,6 @@