diff --git a/package.json b/package.json index e508a054..99e2b115 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@jx3box/jx3box-dict": "^2.2.2", "@jx3box/jx3box-editor": "^2.2.12", "@jx3box/jx3box-macro": "^1.0.1", - "@jx3box/jx3box-talent": "^1.2.7", + "@jx3box/jx3box-talent": "^1.2.9", "@jx3box/jx3box-talent2": "^1.5.9", "axios": "^0.21.1", "codemirror": "^5.62.2", diff --git a/src/assets/css/talent.less b/src/assets/css/talent.less index 671b7897..7c8c9ccd 100644 --- a/src/assets/css/talent.less +++ b/src/assets/css/talent.less @@ -53,6 +53,8 @@ // .x; .mb(20px); .pr; + .flex; + gap: 20px; .u-toolbar { .pa; .rb(0); @@ -85,6 +87,8 @@ border-top-right-radius: 0; border-bottom-right-radius: 0; .fz(14px, 16px); + box-sizing: border-box; + height: 40px; } .el-input__inner { border-top-left-radius: 0; diff --git a/src/components/single/single.vue b/src/components/single/single.vue index f79130f4..a492f024 100644 --- a/src/components/single/single.vue +++ b/src/components/single/single.vue @@ -179,6 +179,7 @@ export default { try { schema = JSON.parse(schema); schema.container = container; + schema.client = schema.client || 'std'; let ins = new talent(schema); ins.then((t) => { diff --git a/src/service/talent.js b/src/service/talent.js index d50e0b2c..890e2e92 100644 --- a/src/service/talent.js +++ b/src/service/talent.js @@ -2,8 +2,8 @@ import axios from "axios"; import { __dataPath } from "@jx3box/jx3box-common/data/jx3box.json"; import { $cms } from "@jx3box/jx3box-common/js/https"; -function getTalentVersions() { - return axios.get(__dataPath + "talent/index.json"); +function getTalentVersions(std = "std") { + return axios.get(__dataPath + `talent/${std}/index.json`); } function getTalents(param) { diff --git a/src/views/Single.vue b/src/views/Single.vue index 2bf60f09..b12d7242 100644 --- a/src/views/Single.vue +++ b/src/views/Single.vue @@ -237,11 +237,13 @@ export default { // 正式服 this.data.forEach((item, i) => { let container = `#talent-box-${i}`; + console.log(item) let schema = item.talent; if (schema) { try { schema = JSON.parse(schema); schema.container = container; + schema.client = schema.client || 'std'; let ins = new talent(schema); ins.then((t) => { diff --git a/src/views/Talent.vue b/src/views/Talent.vue index 700d1737..29b68028 100644 --- a/src/views/Talent.vue +++ b/src/views/Talent.vue @@ -4,6 +4,10 @@