From 2d2bcde71063082291c3087e88034cc9acf502e1 Mon Sep 17 00:00:00 2001
From: aaron <462826@qq.com>
Date: Tue, 17 Nov 2020 17:27:04 +0800
Subject: [PATCH] add class and page
---
src/model/model.go | 96 ++++++++++++++-
src/server/repo/config.go | 37 ++++++
src/server/repo/excel.go | 37 ++++++
src/server/repo/instances.go | 37 ++++++
src/server/repo/text.go | 37 ++++++
src/server/service/config.go | 68 +++++++++++
src/server/service/excel.go | 68 +++++++++++
src/server/service/instances.go | 68 +++++++++++
src/server/service/ranges.go | 9 ++
src/server/service/text.go | 68 +++++++++++
src/zd.go | 72 +++++++++--
ui/src/api/manage.js | 83 +++++++++++++
ui/src/views/data/buildin/config/Edit.vue | 141 ++++++++++++++++++++++
ui/src/views/data/buildin/config/List.vue | 103 ++++++++++++++++
ui/src/views/data/buildin/ranges/Edit.vue | 2 +-
ui/src/views/data/buildin/text/Edit.vue | 108 +++++++++++++++++
ui/src/views/data/buildin/text/List.vue | 112 +++++++++++++++++
17 files changed, 1134 insertions(+), 12 deletions(-)
create mode 100644 src/server/repo/config.go
create mode 100644 src/server/repo/excel.go
create mode 100644 src/server/repo/instances.go
create mode 100644 src/server/repo/text.go
create mode 100644 src/server/service/config.go
create mode 100644 src/server/service/excel.go
create mode 100644 src/server/service/instances.go
create mode 100644 src/server/service/text.go
create mode 100644 ui/src/views/data/buildin/config/Edit.vue
create mode 100644 ui/src/views/data/buildin/config/List.vue
create mode 100644 ui/src/views/data/buildin/text/Edit.vue
create mode 100644 ui/src/views/data/buildin/text/List.vue
diff --git a/src/model/model.go b/src/model/model.go
index 7494d209..d054fca8 100644
--- a/src/model/model.go
+++ b/src/model/model.go
@@ -6,7 +6,8 @@ import (
var (
CommonPrefix = "zd_"
- Models = []interface{}{ &ZdDef{}, &ZdField{}, &ZdSection{}, &ZdRefer{}, &ZdRanges{}, &ZdRangesItem{} }
+ Models = []interface{}{ &ZdDef{}, &ZdField{}, &ZdSection{}, &ZdRefer{},
+ &ZdRanges{}, &ZdRangesItem{}, &ZdText{}, &ZdConfig{}, &ZdInstances{}, &ZdExcel{} }
)
type ZdDef struct {
@@ -133,10 +134,99 @@ type ZdRangesItem struct {
RangesID uint `gorm:"column:rangesID" json:"rangesID"`
Ord int `gorm:"column:ord" json:"ord"`
- ParentID uint `gorm:"-" json:"parentID"` // for tree node
-
+ // for tree node
+ ParentID uint `gorm:"-" json:"parentID"`
Children []*ZdRangesItem `gorm:"-" json:"children"`
}
func (*ZdRangesItem) TableName() string {
return constant.TablePrefix + "rangesItem"
}
+
+type ZdText struct {
+ Model
+ Title string `gorm:"column:title" json:"title"`
+ Text string `gorm:"column:desc" json:"desc"`
+ Path string `gorm:"column:path" json:"path" yaml:"-"`
+
+ Folder string `gorm:"-" json:"folder" yaml:"-"`
+
+ Name string `gorm:"column:name" json:"name"`
+}
+func (*ZdText) TableName() string {
+ return constant.TablePrefix + "text"
+}
+
+type ZdExcel struct {
+ Model
+ Title string `gorm:"column:title" json:"title"`
+ Text string `gorm:"column:desc" json:"desc"`
+ Path string `gorm:"column:path" json:"path" yaml:"-"`
+
+ Folder string `gorm:"-" json:"folder" yaml:"-"`
+
+ Name string `gorm:"column:name" json:"name"`
+}
+func (*ZdExcel) TableName() string {
+ return constant.TablePrefix + "excel"
+}
+
+type ZdConfig struct {
+ Model
+ Title string `gorm:"column:title" json:"title"`
+ Desc string `gorm:"column:desc" json:"desc"`
+ Path string `gorm:"column:path" json:"path" yaml:"-"`
+
+ Yaml string `gorm:"yaml" json:"yaml"`
+ Folder string `gorm:"-" json:"folder" yaml:"-"`
+
+ Name string `gorm:"column:name" json:"name"`
+ Field string `gorm:"column:field" json:"field"`
+ Note string `gorm:"column:note" json:"note"`
+
+ Prefix string `gorm:"column:prefix" json:"prefix"`
+ Postfix string `gorm:"column:postfix" json:"postfix"`
+ Loop string `gorm:"column:loop" json:"loop"`
+ Loopfix string `gorm:"column:loopfix" json:"loopfix"`
+ Format string `gorm:"column:format" json:"format"`
+}
+func (*ZdConfig) TableName() string {
+ return constant.TablePrefix + "config"
+}
+
+type ZdInstances struct {
+ Model
+ Title string `gorm:"column:title" json:"title"`
+ Desc string `gorm:"column:desc" json:"desc"`
+ Path string `gorm:"column:path" json:"path" yaml:"-"`
+
+ Yaml string `gorm:"yaml" json:"yaml"`
+ Folder string `gorm:"-" json:"folder" yaml:"-"`
+
+ Name string `gorm:"column:name" json:"name"`
+ Field string `gorm:"column:field" json:"field"`
+ Note string `gorm:"column:note" json:"note"`
+
+ Prefix string `gorm:"column:prefix" json:"prefix"`
+ Postfix string `gorm:"column:postfix" json:"postfix"`
+ Format string `gorm:"column:format" json:"format"`
+
+ Instances []ZdInstancesItem `gorm:"ForeignKey:instancesID" json:"instances"`
+}
+func (*ZdInstances) TableName() string {
+ return constant.TablePrefix + "instances"
+}
+
+type ZdInstancesItem struct {
+ Model
+ Name string `gorm:"column:name" json:"name"`
+ Value string `gorm:"column:value" json:"value"`
+ InstancesID uint `gorm:"column:instancesID" json:"instancesID"`
+ Ord int `gorm:"column:ord" json:"ord"`
+
+ // for tree node only
+ ParentID uint `gorm:"-" json:"parentID"`
+ Children []*ZdInstancesItem `gorm:"-" json:"children"`
+}
+func (*ZdInstancesItem) TableName() string {
+ return constant.TablePrefix + "instancesItem"
+}
diff --git a/src/server/repo/config.go b/src/server/repo/config.go
new file mode 100644
index 00000000..5ff9a4b8
--- /dev/null
+++ b/src/server/repo/config.go
@@ -0,0 +1,37 @@
+package serverRepo
+
+import (
+ "github.com/easysoft/zendata/src/model"
+ "github.com/jinzhu/gorm"
+)
+
+type ConfigRepo struct {
+ db *gorm.DB
+}
+
+func (r *ConfigRepo) List() (models []*model.ZdConfig, err error) {
+ err = r.db.Where("true").Order("id ASC").Find(&models).Error
+ return
+}
+
+func (r *ConfigRepo) Get(id uint) (model model.ZdConfig, err error) {
+ err = r.db.Where("id=?", id).First(&model).Error
+ return
+}
+
+func (r *ConfigRepo) Save(model *model.ZdConfig) (err error) {
+ err = r.db.Save(model).Error
+ return
+}
+
+func (r *ConfigRepo) Remove(id uint) (err error) {
+ model := model.ZdConfig{}
+ model.ID = id
+ err = r.db.Delete(model).Error
+
+ return
+}
+
+func NewConfigRepo(db *gorm.DB) *ConfigRepo {
+ return &ConfigRepo{db: db}
+}
diff --git a/src/server/repo/excel.go b/src/server/repo/excel.go
new file mode 100644
index 00000000..a0fe8137
--- /dev/null
+++ b/src/server/repo/excel.go
@@ -0,0 +1,37 @@
+package serverRepo
+
+import (
+ "github.com/easysoft/zendata/src/model"
+ "github.com/jinzhu/gorm"
+)
+
+type ExcelRepo struct {
+ db *gorm.DB
+}
+
+func (r *ExcelRepo) List() (models []*model.ZdExcel, err error) {
+ err = r.db.Where("true").Order("id ASC").Find(&models).Error
+ return
+}
+
+func (r *ExcelRepo) Get(id uint) (model model.ZdExcel, err error) {
+ err = r.db.Where("id=?", id).First(&model).Error
+ return
+}
+
+func (r *ExcelRepo) Save(model *model.ZdExcel) (err error) {
+ err = r.db.Save(model).Error
+ return
+}
+
+func (r *ExcelRepo) Remove(id uint) (err error) {
+ model := model.ZdExcel{}
+ model.ID = id
+ err = r.db.Delete(model).Error
+
+ return
+}
+
+func NewExcelRepo(db *gorm.DB) *ExcelRepo {
+ return &ExcelRepo{db: db}
+}
diff --git a/src/server/repo/instances.go b/src/server/repo/instances.go
new file mode 100644
index 00000000..5747e7b9
--- /dev/null
+++ b/src/server/repo/instances.go
@@ -0,0 +1,37 @@
+package serverRepo
+
+import (
+ "github.com/easysoft/zendata/src/model"
+ "github.com/jinzhu/gorm"
+)
+
+type InstancesRepo struct {
+ db *gorm.DB
+}
+
+func (r *InstancesRepo) List() (models []*model.ZdInstances, err error) {
+ err = r.db.Where("true").Order("id ASC").Find(&models).Error
+ return
+}
+
+func (r *InstancesRepo) Get(id uint) (model model.ZdInstances, err error) {
+ err = r.db.Where("id=?", id).First(&model).Error
+ return
+}
+
+func (r *InstancesRepo) Save(model *model.ZdInstances) (err error) {
+ err = r.db.Save(model).Error
+ return
+}
+
+func (r *InstancesRepo) Remove(id uint) (err error) {
+ model := model.ZdInstances{}
+ model.ID = id
+ err = r.db.Delete(model).Error
+
+ return
+}
+
+func NewInstancesRepo(db *gorm.DB) *InstancesRepo {
+ return &InstancesRepo{db: db}
+}
diff --git a/src/server/repo/text.go b/src/server/repo/text.go
new file mode 100644
index 00000000..33726b0c
--- /dev/null
+++ b/src/server/repo/text.go
@@ -0,0 +1,37 @@
+package serverRepo
+
+import (
+ "github.com/easysoft/zendata/src/model"
+ "github.com/jinzhu/gorm"
+)
+
+type TextRepo struct {
+ db *gorm.DB
+}
+
+func (r *TextRepo) List() (models []*model.ZdText, err error) {
+ err = r.db.Where("true").Order("id ASC").Find(&models).Error
+ return
+}
+
+func (r *TextRepo) Get(id uint) (model model.ZdText, err error) {
+ err = r.db.Where("id=?", id).First(&model).Error
+ return
+}
+
+func (r *TextRepo) Save(model *model.ZdText) (err error) {
+ err = r.db.Save(model).Error
+ return
+}
+
+func (r *TextRepo) Remove(id uint) (err error) {
+ model := model.ZdText{}
+ model.ID = id
+ err = r.db.Delete(model).Error
+
+ return
+}
+
+func NewTextRepo(db *gorm.DB) *TextRepo {
+ return &TextRepo{db: db}
+}
diff --git a/src/server/service/config.go b/src/server/service/config.go
new file mode 100644
index 00000000..d11ec1e5
--- /dev/null
+++ b/src/server/service/config.go
@@ -0,0 +1,68 @@
+package serverService
+
+import (
+ "github.com/easysoft/zendata/src/model"
+ "github.com/easysoft/zendata/src/server/repo"
+ logUtils "github.com/easysoft/zendata/src/utils/log"
+ stringUtils "github.com/easysoft/zendata/src/utils/string"
+)
+
+type ConfigService struct {
+ configRepo *serverRepo.ConfigRepo
+ resService *ResService
+}
+
+func (s *ConfigService) List() (list []*model.ZdConfig) {
+ config := s.resService.LoadRes("config")
+ list, _ = s.configRepo.List()
+
+ s.saveResToDB(config, list)
+ list, _ = s.configRepo.List()
+
+ return
+}
+
+func (s *ConfigService) Get(id int) (config model.ZdConfig) {
+ config, _ = s.configRepo.Get(uint(id))
+
+ return
+}
+
+func (s *ConfigService) Save(config *model.ZdConfig) (err error) {
+ err = s.configRepo.Save(config)
+
+ return
+}
+
+func (s *ConfigService) Remove(id int) (err error) {
+ err = s.configRepo.Remove(uint(id))
+ if err != nil {
+ return
+ }
+
+ config, _ := s.configRepo.Get(uint(id))
+ logUtils.PrintTo(config.Path)
+ //fileUtils.RemoveExist(config.Path)
+
+ return
+}
+
+func (s *ConfigService) saveResToDB(config []model.ResFile, list []*model.ZdConfig) (err error) {
+ names := make([]string, 0)
+ for _, item := range list {
+ names = append(names, item.Path)
+ }
+
+ for _, item := range config {
+ if !stringUtils.FindInArrBool(item.Path, names) {
+ config := model.ZdConfig{Path: item.Path, Name: item.Name, Title: item.Title, Desc: item.Desc, Field: item.Title, Note: item.Desc}
+ s.configRepo.Save(&config)
+ }
+ }
+
+ return
+}
+
+func NewConfigService(configRepo *serverRepo.ConfigRepo) *ConfigService {
+ return &ConfigService{configRepo: configRepo}
+}
diff --git a/src/server/service/excel.go b/src/server/service/excel.go
new file mode 100644
index 00000000..08eb9f16
--- /dev/null
+++ b/src/server/service/excel.go
@@ -0,0 +1,68 @@
+package serverService
+
+import (
+ "github.com/easysoft/zendata/src/model"
+ "github.com/easysoft/zendata/src/server/repo"
+ logUtils "github.com/easysoft/zendata/src/utils/log"
+ stringUtils "github.com/easysoft/zendata/src/utils/string"
+)
+
+type ExcelService struct {
+ excelRepo *serverRepo.ExcelRepo
+ resService *ResService
+}
+
+func (s *ExcelService) List() (list []*model.ZdExcel) {
+ excel := s.resService.LoadRes("excel")
+ list, _ = s.excelRepo.List()
+
+ s.saveResToDB(excel, list)
+ list, _ = s.excelRepo.List()
+
+ return
+}
+
+func (s *ExcelService) Get(id int) (excel model.ZdExcel) {
+ excel, _ = s.excelRepo.Get(uint(id))
+
+ return
+}
+
+func (s *ExcelService) Save(excel *model.ZdExcel) (err error) {
+ err = s.excelRepo.Save(excel)
+
+ return
+}
+
+func (s *ExcelService) Remove(id int) (err error) {
+ err = s.excelRepo.Remove(uint(id))
+ if err != nil {
+ return
+ }
+
+ excel, _ := s.excelRepo.Get(uint(id))
+ logUtils.PrintTo(excel.Path)
+ //fileUtils.RemoveExist(excel.Path)
+
+ return
+}
+
+func (s *ExcelService) saveResToDB(excel []model.ResFile, list []*model.ZdExcel) (err error) {
+ names := make([]string, 0)
+ for _, item := range list {
+ names = append(names, item.Path)
+ }
+
+ for _, item := range excel {
+ if !stringUtils.FindInArrBool(item.Path, names) {
+ excel := model.ZdExcel{Path: item.Path, Name: item.Name, Title: item.Title}
+ s.excelRepo.Save(&excel)
+ }
+ }
+
+ return
+}
+
+func NewExcelService(excelRepo *serverRepo.ExcelRepo) *ExcelService {
+ return &ExcelService{excelRepo: excelRepo}
+}
diff --git a/src/server/service/instances.go b/src/server/service/instances.go
new file mode 100644
index 00000000..9c7673ce
--- /dev/null
+++ b/src/server/service/instances.go
@@ -0,0 +1,68 @@
+package serverService
+
+import (
+ "github.com/easysoft/zendata/src/model"
+ "github.com/easysoft/zendata/src/server/repo"
+ logUtils "github.com/easysoft/zendata/src/utils/log"
+ stringUtils "github.com/easysoft/zendata/src/utils/string"
+)
+
+type InstancesService struct {
+ instancesRepo *serverRepo.InstancesRepo
+ resService *ResService
+}
+
+func (s *InstancesService) List() (list []*model.ZdInstances) {
+ instances := s.resService.LoadRes("instances")
+ list, _ = s.instancesRepo.List()
+
+ s.saveResToDB(instances, list)
+ list, _ = s.instancesRepo.List()
+
+ return
+}
+
+func (s *InstancesService) Get(id int) (instances model.ZdInstances) {
+ instances, _ = s.instancesRepo.Get(uint(id))
+
+ return
+}
+
+func (s *InstancesService) Save(instances *model.ZdInstances) (err error) {
+ err = s.instancesRepo.Save(instances)
+
+ return
+}
+
+func (s *InstancesService) Remove(id int) (err error) {
+ err = s.instancesRepo.Remove(uint(id))
+ if err != nil {
+ return
+ }
+
+ instances, _ := s.instancesRepo.Get(uint(id))
+ logUtils.PrintTo(instances.Path)
+ //fileUtils.RemoveExist(instances.Path)
+
+ return
+}
+
+func (s *InstancesService) saveResToDB(instances []model.ResFile, list []*model.ZdInstances) (err error) {
+ names := make([]string, 0)
+ for _, item := range list {
+ names = append(names, item.Path)
+ }
+
+ for _, item := range instances {
+ if !stringUtils.FindInArrBool(item.Path, names) {
+ instances := model.ZdInstances{Path: item.Path, Name: item.Name, Title: item.Title, Desc: item.Desc, Field: item.Title, Note: item.Desc}
+ s.instancesRepo.Save(&instances)
+ }
+ }
+
+ return
+}
+
+func NewInstancesService(instancesRepo *serverRepo.InstancesRepo) *InstancesService {
+ return &InstancesService{instancesRepo: instancesRepo}
+}
diff --git a/src/server/service/ranges.go b/src/server/service/ranges.go
index 546887d1..b6afa371 100644
--- a/src/server/service/ranges.go
+++ b/src/server/service/ranges.go
@@ -3,6 +3,7 @@ package serverService
import (
"github.com/easysoft/zendata/src/model"
"github.com/easysoft/zendata/src/server/repo"
+ logUtils "github.com/easysoft/zendata/src/utils/log"
stringUtils "github.com/easysoft/zendata/src/utils/string"
)
@@ -52,6 +53,14 @@ func (s *RangesService) Save(ranges *model.ZdRanges) (err error) {
func (s *RangesService) Remove(id int) (err error) {
err = s.rangesRepo.Remove(uint(id))
+ if err != nil {
+ return
+ }
+
+ ranges, _ := s.rangesRepo.Get(uint(id))
+ logUtils.PrintTo(ranges.Path)
+ //fileUtils.RemoveExist(ranges.Path)
+
return
}
diff --git a/src/server/service/text.go b/src/server/service/text.go
new file mode 100644
index 00000000..ef1aab6e
--- /dev/null
+++ b/src/server/service/text.go
@@ -0,0 +1,68 @@
+package serverService
+
+import (
+ "github.com/easysoft/zendata/src/model"
+ "github.com/easysoft/zendata/src/server/repo"
+ logUtils "github.com/easysoft/zendata/src/utils/log"
+ stringUtils "github.com/easysoft/zendata/src/utils/string"
+)
+
+type TextService struct {
+ textRepo *serverRepo.TextRepo
+ resService *ResService
+}
+
+func (s *TextService) List() (list []*model.ZdText) {
+ text := s.resService.LoadRes("text")
+ list, _ = s.textRepo.List()
+
+ s.saveResToDB(text, list)
+ list, _ = s.textRepo.List()
+
+ return
+}
+
+func (s *TextService) Get(id int) (text model.ZdText) {
+ text, _ = s.textRepo.Get(uint(id))
+
+ return
+}
+
+func (s *TextService) Save(text *model.ZdText) (err error) {
+ err = s.textRepo.Save(text)
+
+ return
+}
+
+func (s *TextService) Remove(id int) (err error) {
+ err = s.textRepo.Remove(uint(id))
+ if err != nil {
+ return
+ }
+
+ text, _ := s.textRepo.Get(uint(id))
+ logUtils.PrintTo(text.Path)
+ //fileUtils.RemoveExist(text.Path)
+
+ return
+}
+
+func (s *TextService) saveResToDB(text []model.ResFile, list []*model.ZdText) (err error) {
+ names := make([]string, 0)
+ for _, item := range list {
+ names = append(names, item.Path)
+ }
+
+ for _, item := range text {
+ if !stringUtils.FindInArrBool(item.Path, names) {
+ text := model.ZdText{Path: item.Path, Name: item.Name, Title: item.Title}
+ s.textRepo.Save(&text)
+ }
+ }
+
+ return
+}
+
+func NewTextService(textRepo *serverRepo.TextRepo) *TextService {
+ return &TextService{textRepo: textRepo}
+}
diff --git a/src/zd.go b/src/zd.go
index 39a2678d..08224f88 100644
--- a/src/zd.go
+++ b/src/zd.go
@@ -279,7 +279,11 @@ type Server struct {
sectionService *serverService.SectionService
referService *serverService.ReferService
resService *serverService.ResService
+
rangesService *serverService.RangesService
+ instancesService *serverService.InstancesService
+ textService *serverService.TextService
+ excelService *serverService.ExcelService
}
func Init() (err error) {
@@ -292,14 +296,22 @@ func Init() (err error) {
sectionRepo := serverRepo.NewSectionRepo(gormDb)
referRepo := serverRepo.NewReferRepo(gormDb)
rangesRepo := serverRepo.NewRangesRepo(gormDb)
+ instancesRepo := serverRepo.NewInstancesRepo(gormDb)
+ textRepo := serverRepo.NewTextRepo(gormDb)
+ excelRepo := serverRepo.NewExcelRepo(gormDb)
defService := serverService.NewDefService(deferRepo, fieldRepo, referRepo)
fieldService := serverService.NewFieldService(deferRepo, fieldRepo, referRepo)
sectionService := serverService.NewSectionService(fieldRepo, sectionRepo)
referService := serverService.NewReferService(fieldRepo, referRepo)
+
rangesService := serverService.NewRangesService(rangesRepo)
+ instancesService := serverService.NewInstancesService(instancesRepo)
+ textService := serverService.NewTextService(textRepo)
+ excelService := serverService.NewExcelService(excelRepo)
- server := NewServer(config, defService, fieldService, sectionService, referService, rangesService)
+ server := NewServer(config, defService, fieldService, sectionService, referService,
+ rangesService, instancesService, textService, excelService)
server.Run()
return
@@ -425,6 +437,9 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
case "saveRanges":
ranges := serverUtils.ConvertRanges(reqData.Data)
ret.Data = s.rangesService.Save(&ranges)
+ case "removeRanges":
+ err = s.rangesService.Remove(reqData.Id)
+
case "createResRangesItem":
var rangesItem *model.ZdRangesItem
rangesId := reqData.DomainId
@@ -442,6 +457,47 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
case "removeResRangesItem":
err = s.rangesService.RemoveItem(reqData.Id)
ret.Data = s.rangesService.GetItemTree(reqData.DomainId)
+
+ case "listInstances":
+ ret.Data = s.rangesService.List()
+ case "getInstances":
+ ret.Data = s.rangesService.Get(reqData.Id)
+ case "saveInstances":
+ ranges := serverUtils.ConvertRanges(reqData.Data)
+ ret.Data = s.rangesService.Save(&ranges)
+ case "removeInstances":
+ err = s.rangesService.Remove(reqData.Id)
+
+ case "listExcel":
+ ret.Data = s.rangesService.List()
+ case "getExcel":
+ ret.Data = s.rangesService.Get(reqData.Id)
+ case "saveExcel":
+ ranges := serverUtils.ConvertRanges(reqData.Data)
+ ret.Data = s.rangesService.Save(&ranges)
+ case "removeExcel":
+ err = s.rangesService.Remove(reqData.Id)
+
+ case "listText":
+ ret.Data = s.rangesService.List()
+ case "getText":
+ ret.Data = s.rangesService.Get(reqData.Id)
+ case "saveText":
+ ranges := serverUtils.ConvertRanges(reqData.Data)
+ ret.Data = s.rangesService.Save(&ranges)
+ case "removeText":
+ err = s.rangesService.Remove(reqData.Id)
+
+ case "listConfig":
+ ret.Data = s.rangesService.List()
+ case "getConfig":
+ ret.Data = s.rangesService.Get(reqData.Id)
+ case "saveConfig":
+ ranges := serverUtils.ConvertRanges(reqData.Data)
+ ret.Data = s.rangesService.Save(&ranges)
+ case "removeConfig":
+ err = s.rangesService.Remove(reqData.Id)
+
}
if err != nil {
ret.Code = 0
@@ -451,13 +507,10 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
io.WriteString(writer, string(bytes))
}
-func NewServer(config *serverConfig.Config,
- defService *serverService.DefService,
- fieldServer *serverService.FieldService,
- sectionService *serverService.SectionService,
- referService *serverService.ReferService,
- rangesService *serverService.RangesService,
-) *Server {
+func NewServer(config *serverConfig.Config, defService *serverService.DefService,
+ fieldServer *serverService.FieldService, sectionService *serverService.SectionService, referService *serverService.ReferService,
+ rangesService *serverService.RangesService, instancesService *serverService.InstancesService,
+ textService *serverService.TextService, excelService *serverService.ExcelService, ) *Server {
return &Server{
config: config,
defService: defService,
@@ -465,6 +518,9 @@ func NewServer(config *serverConfig.Config,
sectionService: sectionService,
referService: referService,
rangesService: rangesService,
+ instancesService: instancesService,
+ textService: textService,
+ excelService: excelService,
}
}
diff --git a/ui/src/api/manage.js b/ui/src/api/manage.js
index 300c3232..0e661378 100644
--- a/ui/src/api/manage.js
+++ b/ui/src/api/manage.js
@@ -207,6 +207,15 @@ export function saveRanges (model) {
data: data
})
}
+export function removeRanges (id) {
+ const data = {'action': 'removeRanges', id: id}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
export function getResRangesItemTree (id) {
const data = {'action': 'getResRangesItemTree', id: id}
@@ -251,3 +260,77 @@ export function saveRangesItem (model) {
data: data
})
}
+
+export function listText () {
+ const data = {'action': 'listText'}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
+export function getText (id) {
+ const data = {'action': 'getText', id: id}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
+export function saveText (model) {
+ const data = {'action': 'saveText', data: model}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
+export function removeText (id) {
+ const data = {'action': 'removeText', id: id}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
+
+export function listConfig () {
+ const data = {'action': 'listConfig'}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
+export function getConfig (id) {
+ const data = {'action': 'getConfig', id: id}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
+export function saveConfig (model) {
+ const data = {'action': 'saveConfig', data: model}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
+export function removeConfig (id) {
+ const data = {'action': 'removeConfig', id: id}
+
+ return request({
+ url: api.admin,
+ method: 'post',
+ data: data
+ })
+}
diff --git a/ui/src/views/data/buildin/config/Edit.vue b/ui/src/views/data/buildin/config/Edit.vue
new file mode 100644
index 00000000..542bd149
--- /dev/null
+++ b/ui/src/views/data/buildin/config/Edit.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 函数
+
+
+ md5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 重置
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/views/data/buildin/config/List.vue b/ui/src/views/data/buildin/config/List.vue
new file mode 100644
index 00000000..683f07a2
--- /dev/null
+++ b/ui/src/views/data/buildin/config/List.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+ 编辑 |
+ 设计 |
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/views/data/buildin/ranges/Edit.vue b/ui/src/views/data/buildin/ranges/Edit.vue
index 6e1b34ad..f5485450 100644
--- a/ui/src/views/data/buildin/ranges/Edit.vue
+++ b/ui/src/views/data/buildin/ranges/Edit.vue
@@ -71,7 +71,7 @@
import {getRanges, saveRanges} from "../../../../api/manage";
export default {
- name: 'RangesEditComponent',
+ name: 'RangesEdit',
data() {
return {
colsFull: 24,
diff --git a/ui/src/views/data/buildin/text/Edit.vue b/ui/src/views/data/buildin/text/Edit.vue
new file mode 100644
index 00000000..420f7629
--- /dev/null
+++ b/ui/src/views/data/buildin/text/Edit.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 重置
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/views/data/buildin/text/List.vue b/ui/src/views/data/buildin/text/List.vue
new file mode 100644
index 00000000..96b77386
--- /dev/null
+++ b/ui/src/views/data/buildin/text/List.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+ 编辑 |
+ 设计 |
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
--
GitLab