fix import/export for field size

eja · May 19, 2024 · 7ec5359 · 7ec5359
1 parent e8038ab
commit 7ec5359
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/db/export.go b/db/export.go
@@ -20,7 +20,7 @@ func ModuleExport(moduleId int64, data bool) (module TypeModule, err error) {
 		SortList:    row["sortList"],
 	}
 
-	rows, err = Rows("SELECT translate, powerEdit, name, type, powerList, powerSearch, value FROM ejaFields WHERE ejaModuleId=?", moduleId)
+	rows, err = Rows("SELECT * FROM ejaFields WHERE ejaModuleId=?", moduleId)
 	if err != nil {
 		return
 	}
@@ -31,6 +31,9 @@ func ModuleExport(moduleId int64, data bool) (module TypeModule, err error) {
 			PowerSearch: Number(row["powerSearch"]),
 			PowerList:   Number(row["powerList"]),
 			PowerEdit:   Number(row["powerEdit"]),
+			SizeSearch:  Number(row["sizeSearch"]),
+			SizeList:    Number(row["sizeList"]),
+			SizeEdit:    Number(row["sizeEdit"]),
 			Type:        row["type"],
 			Translate:   Number(row["translate"]),
 		})

diff --git a/db/import.go b/db/import.go
@@ -59,7 +59,7 @@ func ModuleImport(module TypeModule, moduleName string) error {
 					}
 				}
 			}
-			_, err = Run(`
+			run, err := Run(`
 					INSERT INTO ejaFields 
 						(ejaId, ejaOwner, ejaLog, ejaModuleId, name, type, value, translate, powerSearch, powerList, powerEdit) 
           VALUES 
@@ -68,6 +68,9 @@ func ModuleImport(module TypeModule, moduleName string) error {
 			if err != nil {
 				return err
 			}
+			Run(`UPDATE ejaFields SET sizeSearch=? WHERE ejaId=?`, field.SizeSearch, run.LastId)
+			Run(`UPDATE ejaFields SET sizeList=? WHERE ejaId=?`, field.SizeList, run.LastId)
+			Run(`UPDATE ejaFields SET sizeEdit=? WHERE ejaId=?`, field.SizeEdit, run.LastId)
 		}
 
 		ejaPermissionsId := ModuleGetIdByName("ejaPermissions")

diff --git a/db/module.go b/db/module.go
@@ -30,6 +30,9 @@ type TypeModuleField struct {
 	Translate   int64  `json:"translate"`
 	PowerSearch int64  `json:"powerSearch"`
 	Name        string `json:"name"`
+	SizeSearch  int64  `json:"sizeSearch"`
+	SizeList    int64  `json:"sizeList"`
+	SizeEdit    int64  `json:"sizeEdit"`
 }
 
 // TypeModuleTranslation represents translation information within a TypeModule.