Browse Source

补充提交

lph 1 year ago
parent
commit
ba7e92f324

+ 2 - 2
ruoyi-ui/src/views/dragform/index.vue

@@ -165,7 +165,7 @@
         prop="fId"
         prop="fId"
         show-overflow-tooltip
         show-overflow-tooltip
       />
       />
-      <!-- <el-table-column
+      <el-table-column
         label="表单名称
         label="表单名称
 "
 "
         align="center"
         align="center"
@@ -178,7 +178,7 @@
         align="center"
         align="center"
         prop="dfNickname"
         prop="dfNickname"
         show-overflow-tooltip
         show-overflow-tooltip
-      /> -->
+      />
       <el-table-column
       <el-table-column
         label="表单vue模版"
         label="表单vue模版"
         align="center"
         align="center"

+ 8 - 4
ruoyi-ui/src/views/system/fromModel/index.vue

@@ -74,7 +74,7 @@ export default {
   methods: {
   methods: {
     handleSave(values) {
     handleSave(values) {
       var jsonData = JSON.parse(values);
       var jsonData = JSON.parse(values);
-      console.log(values);
+      console.log(jsonData);
       //
       //
       var editorHtmlJson =
       var editorHtmlJson =
         codeHtmlFront + JSON.stringify(jsonData) + codeHtmlLast;
         codeHtmlFront + JSON.stringify(jsonData) + codeHtmlLast;
@@ -85,7 +85,7 @@ export default {
         formDescription,
         formDescription,
         formSQL,
         formSQL,
         formNodeId,
         formNodeId,
-      } = jsonData;
+      } = jsonData.config;
       // console.log(this.fid)
       // console.log(this.fid)
       if (!this.fid) {
       if (!this.fid) {
         addForm({
         addForm({
@@ -105,13 +105,17 @@ export default {
         });
         });
       } else {
       } else {
         updateForm({
         updateForm({
-          dfName: "1",
-          dfNickname: "1",
+          dfName: formName,
+          dfNickname: nickFormName,
           sqlKey: sessionStorage.getItem("sqlKey") || "",
           sqlKey: sessionStorage.getItem("sqlKey") || "",
           dfVueTemplate: values,
           dfVueTemplate: values,
           dfHtmlTemplate: editorHtmlJson.toString(),
           dfHtmlTemplate: editorHtmlJson.toString(),
           dtId: JSON.parse(values).config.tdId,
           dtId: JSON.parse(values).config.tdId,
           fId: this.fid,
           fId: this.fid,
+          dfTableName: mainTableName,
+          dfNotes: formDescription,
+          dfFormSql: formSQL,
+          dfNodeId: formNodeId,
         }).then((res) => {
         }).then((res) => {
           console.log(res);
           console.log(res);
           this.$message(res.msg);
           this.$message(res.msg);