From 6bc62282b4a33674437128b64491d1fcec6c4321 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 21 Oct 2024 12:20:30 +0800
Subject: [PATCH] 1

---
 src/views/flow/DesktopForm.vue | 151 +++++++++++++++++----------------
 src/views/flow/create.vue      |   1 +
 2 files changed, 81 insertions(+), 71 deletions(-)

diff --git a/src/views/flow/DesktopForm.vue b/src/views/flow/DesktopForm.vue
index 66f4ab3..f56eee3 100644
--- a/src/views/flow/DesktopForm.vue
+++ b/src/views/flow/DesktopForm.vue
@@ -1,52 +1,55 @@
 <script>
-import { deepCopy } from "@/utils"
-import formBuilder from '@/utils/formBuilder'
+import { deepCopy } from "@/utils";
+import formBuilder from "@/utils/formBuilder";
 import { PopupManager } from "element-ui/lib/utils/popup";
+import { getToken } from "@/utils/auth";
+import request from '@/utils/request'
+
 export default {
   props: {
     isFirstNode: {
       type: Boolean,
-      default: true
+      default: true,
     },
     readable: {
       type: Array,
       default: () => [],
-      required: true
+      required: true,
     },
     writeable: {
       type: Array,
       default: () => [],
-      required: true
+      required: true,
     },
     originalForm: {
       type: Object,
       default: () => ({}),
-      required: true
+      required: true,
     },
     subForm: {
       type: Map,
-      default: () => new Map()
+      default: () => new Map(),
     },
     device: {
       type: String,
-      default: 'desktop',
-      required: true
+      default: "desktop",
+      required: true,
     },
     fields: {
       type: Array,
       default: () => [],
-      required: true
+      required: true,
     },
     fileList: {
       type: Object,
       default: () => ({}),
-      required: true
+      required: true,
     },
     scriptContent: String,
     rules: {
       type: Object,
-      default: () => ({})
-    }
+      default: () => ({}),
+    },
   },
   data() {
     return {
@@ -57,99 +60,105 @@ export default {
       action: process.env.VUE_APP_BASE_API,
       form: {},
       file: {},
-    }
+    };
   },
   methods: {
+    request,
     async validate() {
-      return await (this.$refs['elForm'].validate())
-    }
-  },
-  computed: {
-
+      return await this.$refs["elForm"].validate();
+    },
   },
+  computed: {},
   watch: {
     info(newVal) {
-      let keys = newVal.map(i => i.name)
-      keys.forEach(key => {
-        this.form[key] = ''
-      })
+      let keys = newVal.map((i) => i.name);
+      keys.forEach((key) => {
+        this.form[key] = "";
+      });
     },
     originalForm(newVal) {
-      this.form = deepCopy(newVal)
+      this.form = deepCopy(newVal);
     },
     fileList: {
-      handler:function(newVal) {
-        this.file = deepCopy(newVal)
+      handler: function (newVal) {
+        this.file = deepCopy(newVal);
       },
       immediate: true,
-      deep: true
+      deep: true,
     },
     scriptContent(newVal) {
-      if(newVal) {
+      if (newVal) {
         try {
-          new Function(newVal).bind(this)()
+          new Function(newVal).bind(this)();
         } catch (err) {
-          console.error(err)
+          console.error(err);
         }
       }
     },
     isShowModal(newVal) {
-      if(newVal) {
-        this.zIndex = PopupManager.nextZIndex()
+      if (newVal) {
+        this.zIndex = PopupManager.nextZIndex();
       }
-    }
+    },
   },
   render(h) {
-    const authFields = this.fields.map(field => ({
+    const authFields = this.fields.map((field) => ({
       ...field,
-      _readable: this.readable.indexOf(field.id) !== -1 || field.type === 'label',
+      _readable:
+        this.readable.indexOf(field.id) !== -1 || field.type === "label",
       _writeable: this.writeable.indexOf(field.id) !== -1,
-    }))
+    }));
     authFields.unshift({
-      name: 'flow_title',
-      label: '工作名称',
-      type: 'text',
+      name: "flow_title",
+      label: "工作名称",
+      type: "text",
       gs_x: 0,
       gs_y: 0,
       gs_width: 12,
       gs_height: 1,
       label_show: 1,
       _readable: !this.isFirstNode,
-      _writeable: this.isFirstNode
-    })
-    return h('div',[
-      h('el-form', {
-        ref: 'elForm',
-        class: 'form',
-        props: {
-          model: this.form,
-          'label-position': 'right',
-          'label-width': '100px',
-          rules: this.rules,
-          'inline-message': true
-        }
-      },authFields.map(field => formBuilder.bind(this)(this.device, field, h))),
+      _writeable: this.isFirstNode,
+    });
+    return h("div", [
+      h(
+        "el-form",
+        {
+          ref: "elForm",
+          class: "form",
+          props: {
+            model: this.form,
+            "label-position": "right",
+            "label-width": "100px",
+            rules: this.rules,
+            "inline-message": true,
+          },
+        },
+        authFields.map((field) => formBuilder.bind(this)(this.device, field, h))
+      ),
       // 用于编写脚本中弹窗
-      h('vxe-modal',{
-        props: {
-          zIndex: this.zIndex,
-          value: this.isShowModal,
-          height: 640,
-          width: 860,
-          'esc-closable': true
+      h(
+        "vxe-modal",
+        {
+          props: {
+            zIndex: this.zIndex,
+            value: this.isShowModal,
+            height: 640,
+            width: 860,
+            "esc-closable": true,
+          },
+          on: {
+            input: (e) => {
+              this.isShowModal = e;
+            },
+          },
         },
-        on: {
-          input: e => {
-            this.isShowModal = e
-          }
-        }
-      }, [
-        this.modalRender.bind(this)(h)
-      ])
-    ])
+        [this.modalRender.bind(this)(h)]
+      ),
+    ]);
   },
-  created() {}
-}
+  created() {},
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/flow/create.vue b/src/views/flow/create.vue
index 8988efb..e8a0600 100644
--- a/src/views/flow/create.vue
+++ b/src/views/flow/create.vue
@@ -303,6 +303,7 @@ export default {
     // 处理url中default_json
     handleDefaultJSON() {
       try {
+        if(!this.$route.query?.default_json) return
         const res = JSON.parse(this.$route.query?.default_json)
         console.log('default_json', res)
         for (let key in this.$route.query) {