diff --git a/main.go b/main.go index 3d5dafe..50a8f05 100644 --- a/main.go +++ b/main.go @@ -13,7 +13,45 @@ var ( func main() { pflag.Parse() - res, err := parser.ParseSqlFormat(*input, + s := ` + CREATE TABLE IF NOT EXISTS gb_service_people ( + id int(10) NOT NULL AUTO_INCREMENT, + name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名字', + avatar varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '头像', + description varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '描述', + show_status int(1) DEFAULT NULL COMMENT '显示状态:1->显示;2->不显示', + duty_date varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '值班时间,数组,每周天数 1,2,3,4,5,6,7', + type_id int(11) NOT NULL COMMENT '分类ID', + type_name varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分类名称', + sort int(5) NULL DEFAULT 1 COMMENT '排序', + create_time int(11) NULL DEFAULT 0 COMMENT '创建时间', + update_time int(11) NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (id) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '服务保障人员信息' ROW_FORMAT = Compact; + +CREATE TABLE IF NOT EXISTS gb_service_message ( + id int(10) NOT NULL AUTO_INCREMENT, + people_id bigint(20) DEFAULT NULL COMMENT '关联的服务人员id', + commenter varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '留言者名字', + commenter_contact varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '留言者联系方式', + comment text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '留言内容', + status int(1) DEFAULT NULL COMMENT '显示状态:1->显示;2->不显示', + create_time int(11) NULL DEFAULT 0 COMMENT '创建时间', + update_time int(11) NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (id) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '服务保障留言信息' ROW_FORMAT = Compact; + +CREATE TABLE IF NOT EXISTS gb_service_type ( + id bigint(20) NOT NULL AUTO_INCREMENT, + name varchar(64) DEFAULT NULL COMMENT '分类名称', + sort int(11) DEFAULT NULL COMMENT '排序', + icon varchar(255) DEFAULT NULL COMMENT '图标', + description text DEFAULT NULL COMMENT '描述', + PRIMARY KEY (id) +) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8mb4 COMMENT = '服务保障分类'; +` + + res, err := parser.ParseSqlFormat(s, parser.WithGormType(), parser.WithJsonTag(), ) diff --git a/package-lock.json b/package-lock.json index bba9ca0..cc23fc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3548,6 +3548,12 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "highlight.js": { + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", + "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", + "dev": true + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -6347,10 +6353,9 @@ "dev": true }, "highlight.js": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", - "dev": true + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.5.0.tgz", + "integrity": "sha512-SM6WDj5/C+VfIY8pZ6yW6Xa0Fm1tniYVYWYW1Q/DcMnISZFrC3aQAZZZFAAZtybKNrGId3p/DNbFTtcTXXgYBw==" }, "hmac-drbg": { "version": "1.0.1", @@ -7629,6 +7634,11 @@ "object-visit": "^1.0.0" } }, + "marked": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz", + "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==" + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", diff --git a/package.json b/package.json index 4a66ecd..d171788 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,8 @@ "codemirror": "^5.61.0", "core-js": "^3.6.5", "element-ui": "^2.15.1", + "highlight.js": "^11.5.0", + "marked": "^4.0.12", "script-loader": "^0.7.2", "shelljs": "^0.8.5", "sql-ddl-to-json-schema": "^4.0.4", diff --git a/src/App.vue b/src/App.vue index 2f69da2..930914e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,7 @@ - diff --git a/src/components/preview/previewCodeDialg.vue b/src/components/preview/previewCodeDialg.vue new file mode 100644 index 0000000..a437bd5 --- /dev/null +++ b/src/components/preview/previewCodeDialg.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/src/tmp.js b/src/tmp.js new file mode 100644 index 0000000..5184304 --- /dev/null +++ b/src/tmp.js @@ -0,0 +1,21 @@ + func (a *$1Service) Get$2List(ctx context.Context, req *model.Gb$2ReqParams) (interface{}, error) { + var l []*model.Gb$2 + cnt, err := a.$2.Q().Filter(req).List(ctx, &l) + if err != nil { + return nil, errors.WithStack(err) + } + + if req.Export { + rst, _ := excelize.Excelize(l, + excelize.ColumnFilter(\"create_time\ excelize.FilterTimestamp), + ) + return rst, nil + } + pagination := &schema.PaginationResult{ + Count: cnt, + List: l, + PageNum: req.PageNum, + PageSize: req.PageSize, + } + return pagination, nil + } \ No newline at end of file