From 1299915419dcb8737131fe639a6c70dbd051e1b8 Mon Sep 17 00:00:00 2001
From: ssc <273702440@qq.com>
Date: Mon, 15 May 2023 13:23:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E8=B5=B7/=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=97=B6=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=8D=95=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/api/design/form-variable.js      | 50 ++++++++++
 .../components/nf-form-variable/index.vue     | 94 +++++++++++++++++++
 .../workflow/components/nf-theme/index.vue    | 64 +++++++++++++
 src/views/plugin/workflow/mixins/ex-form.js   |  6 ++
 .../workflow/pages/external/Leave/detail.vue  | 17 ++--
 .../workflow/pages/external/Leave/start.vue   |  2 +-
 .../workflow/pages/process/form/detail.vue    | 17 ++--
 7 files changed, 233 insertions(+), 17 deletions(-)
 create mode 100644 src/views/plugin/workflow/api/design/form-variable.js
 create mode 100644 src/views/plugin/workflow/components/nf-form-variable/index.vue
 create mode 100644 src/views/plugin/workflow/components/nf-theme/index.vue

diff --git a/src/views/plugin/workflow/api/design/form-variable.js b/src/views/plugin/workflow/api/design/form-variable.js
new file mode 100644
index 0000000..638dc59
--- /dev/null
+++ b/src/views/plugin/workflow/api/design/form-variable.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+const prefix = '/blade-workflow/design/form/variable'
+
+export const getList = (current, size, params) => {
+  return request({
+    url: `${prefix}/list`,
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (params) => {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'get',
+    params
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: `${prefix}/remove`,
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/views/plugin/workflow/components/nf-form-variable/index.vue b/src/views/plugin/workflow/components/nf-form-variable/index.vue
new file mode 100644
index 0000000..e4fd790
--- /dev/null
+++ b/src/views/plugin/workflow/components/nf-form-variable/index.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="nf-form-variable">
+    <el-button
+      text
+      icon="el-icon-clock"
+      title="表单历史"
+      style="color: black; font-size: 18px"
+      @click="visible = true"
+    ></el-button>
+    <el-drawer v-model="visible" size="60%" append-to-body class="nf-drawer" destroy-on-close>
+      <template #header>
+        <span> 流程表单提交历史 <el-tag v-if="isDev">@nutflow1.8.1+</el-tag> </span>
+      </template>
+      <el-tabs v-model="active" class="nf-theme-custom">
+        <el-tab-pane v-for="(item, index) in list" :name="index" :key="index" lazy>
+          <template #label>
+            <el-popover placement="top" width="auto" trigger="hover">
+              {{ item.createUsername }} 于 {{ item.createTime }} 提交
+              <template #reference>{{ item.taskName }}</template>
+            </el-popover>
+          </template>
+          <nf-form
+            v-model="item.formVariable"
+            :option="item.formOption"
+            :style="themeCustomStyle"
+          ></nf-form>
+        </el-tab-pane>
+      </el-tabs>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { getList } from '../../api/design/form-variable'
+import theme from '../../mixins/theme'
+export default {
+  name: 'nf-form-variable',
+  mixins: [theme],
+  props: {
+    processInsId: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    isDev() {
+      return process.env.NODE_ENV === "development"
+    }
+  },
+  watch: {
+    processInsId: {
+      handler(val) {
+        this.getFormVariable(val)
+      },
+      immediate: true
+    },
+  },
+  data() {
+    return {
+      visible: false,
+      active: 0,
+      list: []
+    }
+  },
+  methods: {
+    getFormVariable(processInsId) {
+      if (this.validatenull(processInsId)) return
+
+      getList(1, -1, { processInsId }).then(res => {
+        const list = res.data.data.records
+        list.forEach(item => {
+          item.formVariable = JSON.parse(item.formVariable)
+          item.formOption = JSON.parse(item.formOption)
+          item.formOption.detail = true
+        })
+        this.list = list
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.nf-form-variable {
+  .el-button.is-text {
+    padding: 0;
+  }
+}
+.nf-drawer {
+  .nf-form {
+    padding: 0 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/plugin/workflow/components/nf-theme/index.vue b/src/views/plugin/workflow/components/nf-theme/index.vue
new file mode 100644
index 0000000..f710327
--- /dev/null
+++ b/src/views/plugin/workflow/components/nf-theme/index.vue
@@ -0,0 +1,64 @@
+<template>
+  <el-popover popper-class="nf-theme-popover" placement="left" width="auto" trigger="click">
+    <el-radio-group v-model="theme">
+      <el-row :gutter="15">
+        <el-col v-for="(item, index) in themeList" :key="index" :span="8">
+          <el-radio :label="item.value">{{ item.label }}</el-radio>
+        </el-col>
+      </el-row>
+    </el-radio-group>
+    <template #reference>
+      <el-button
+        title="主题"
+        text
+        icon="el-icon-brush"
+        style="color: black; font-size: 18px"
+      ></el-button
+    ></template>
+  </el-popover>
+</template>
+
+<script>
+export default {
+  name: 'nf-theme',
+  props: {
+    modelValue: {
+      type: String,
+      default: 'default',
+    },
+    themeList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  watch: {
+    modelValue: {
+      handler(val) {
+        this.theme = val
+      },
+      immediate: true
+    },
+    theme: {
+      handler(val) {
+        this.$emit('update:modelValue', val)
+      }
+    }
+  },
+  data() {
+    return {
+      theme: ''
+    }
+  },
+}
+</script>
+
+<style lang="scss">
+.nf-theme-popover {
+  .el-radio {
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js
index 2eda517..b874c04 100644
--- a/src/views/plugin/workflow/mixins/ex-form.js
+++ b/src/views/plugin/workflow/mixins/ex-form.js
@@ -211,6 +211,8 @@ export default {
             }
           }
           if (valid) {
+            form['wf_form_option'] = JSON.stringify(this.option)
+            form['wf_form_variable'] = JSON.stringify(form)
             startProcess(form).then(res => {
               if (isExForm === true) {
                 resolve(res, done)
@@ -257,6 +259,8 @@ export default {
             }
           }
           if (valid) {
+            form['wf_form_option'] = JSON.stringify(this.option)
+            form['wf_form_variable'] = JSON.stringify(form)
             startProcessByKey(form).then(res => {
               if (isExForm === true) {
                 resolve(res, done)
@@ -344,6 +348,8 @@ export default {
           reject()
           return
         }
+        variables['wf_form_option'] = JSON.stringify(this.option)
+        variables['wf_form_variable'] = JSON.stringify(this.form)
         const {
           taskId,
           processInstanceId,
diff --git a/src/views/plugin/workflow/pages/external/Leave/detail.vue b/src/views/plugin/workflow/pages/external/Leave/detail.vue
index 9699ab9..1f098f1 100644
--- a/src/views/plugin/workflow/pages/external/Leave/detail.vue
+++ b/src/views/plugin/workflow/pages/external/Leave/detail.vue
@@ -4,14 +4,13 @@
       <el-affix position="top" :offset="110">
         <div class="header">
           <h3>{{ process.processDefinitionName }}</h3>
-          <div v-if="process.status != 'todo'">
-            主题：<el-select-v2
+          <div style="display: flex">
+            <nf-theme
+              v-if="process.status != 'todo'"
               v-model="theme"
-              size="default"
-              :clearable="false"
-              :options="themeList"
-              @change="setThemeStyle"
-            ></el-select-v2>
+              :theme-list="themeList"
+            ></nf-theme>
+            <nf-form-variable :process-ins-id="process.processInstanceId"></nf-form-variable>
           </div>
         </div>
       </el-affix>
@@ -95,6 +94,8 @@
 import NfExamineForm from '../../../components/nf-exam-form/index.vue'
 import NfButton from '../../../components/nf-button/index.vue'
 import NfFlow from '../../../components/nf-flow/index.vue'
+import NfTheme from '../../../components/nf-theme/index.vue'
+import NfFormVariable from '../../../components/nf-form-variable/index.vue'
 import NfUserSelect from '../../../components/nf-user-select/index.vue'
 
 import exForm from '../../../mixins/ex-form'
@@ -102,7 +103,7 @@ import theme from '../../../mixins/theme'
 
 export default {
   mixins: [exForm, theme],
-  components: { NfUserSelect, NfExamineForm, NfButton, NfFlow },
+  components: { NfUserSelect, NfExamineForm, NfButton, NfFlow, NfTheme, NfFormVariable },
   watch: {
     '$route.query.p': {
       handler(val) {
diff --git a/src/views/plugin/workflow/pages/external/Leave/start.vue b/src/views/plugin/workflow/pages/external/Leave/start.vue
index 772bc25..cd0bc17 100755
--- a/src/views/plugin/workflow/pages/external/Leave/start.vue
+++ b/src/views/plugin/workflow/pages/external/Leave/start.vue
@@ -259,7 +259,7 @@ export default {
           submit({ id: data.id, processInsId }).then(() => {
             this.$message.success("发起成功")
             this.handleCloseTag('/plugin/workflow/pages/process/send')
-            done()
+            if (typeof done == 'function') done()
           })
         }).catch(() => {
           this.loading = false
diff --git a/src/views/plugin/workflow/pages/process/form/detail.vue b/src/views/plugin/workflow/pages/process/form/detail.vue
index 360e65a..abdfb24 100644
--- a/src/views/plugin/workflow/pages/process/form/detail.vue
+++ b/src/views/plugin/workflow/pages/process/form/detail.vue
@@ -4,14 +4,13 @@
       <el-affix position="top" :offset="110">
         <div class="header">
           <h3>{{ process.processDefinitionName }}</h3>
-          <div v-if="process.status != 'todo'">
-            主题：<el-select-v2
+          <div style="display: flex">
+            <nf-theme
+              v-if="process.status != 'todo'"
               v-model="theme"
-              size="default"
-              :clearable="false"
-              :options="themeList"
-              @change="setThemeStyle"
-            ></el-select-v2>
+              :theme-list="themeList"
+            ></nf-theme>
+            <nf-form-variable :process-ins-id="process.processInstanceId"></nf-form-variable>
           </div>
         </div>
       </el-affix>
@@ -109,12 +108,14 @@ import NfExamineForm from '../../../components/nf-exam-form/index.vue'
 import NfButton from '../../../components/nf-button/index.vue'
 import NfFlow from '../../../components/nf-flow/index.vue'
 import NfUserSelect from '../../../components/nf-user-select/index.vue'
+import NfTheme from '../../../components/nf-theme/index.vue'
+import NfFormVariable from '../../../components/nf-form-variable/index.vue'
 import exForm from '../../../mixins/ex-form'
 import theme from '../../../mixins/theme'
 
 export default {
   mixins: [exForm, theme],
-  components: { NfUserSelect, NfExamineForm, NfButton, NfFlow },
+  components: { NfUserSelect, NfExamineForm, NfButton, NfFlow, NfTheme, NfFormVariable },
   watch: {
     '$route.params.params': {
       handler(val) {