diff --git a/.gitignore b/.gitignore index d4e7333..d96b00e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ typings/ # Optional REPL history .node_repl_history +.history # Output of 'npm pack' *.tgz diff --git a/CONFIG.md b/CONFIG.md index d4ee2bf..79065a9 100755 --- a/CONFIG.md +++ b/CONFIG.md @@ -26,7 +26,7 @@ /* UI */ ui: { - columns: 6, // Total are 12 columns. + columns: 6, // Total are 12 columns. [support dx expression] label: '', // Label display [support dx expression] showLabel: true, // Whether to show the label (when it is false, it still takes up space) noLabelSpace: false, // Whether the label does not occupy space, the priority is higher than showLabel diff --git a/CONFIG_CN.md b/CONFIG_CN.md index 176c719..13b1464 100644 --- a/CONFIG_CN.md +++ b/CONFIG_CN.md @@ -27,7 +27,7 @@ /* UI */ ui: { - columns: 6, // 占用列数,共12列。 + columns: 6, // 占用列数,共12列。【支持dx表达式】 label: '', // 标签内容【支持dx表达式】 showLabel: true, // 是否显示标签(注意:当为 false 时,依然占着空间) noLabelSpace: false, // 标签是否不占空间,优先级比showLabel高 diff --git a/packages/ncform-common/test/unit/ncform-utils.js b/packages/ncform-common/test/unit/ncform-utils.js index 7a2ce7b..6ebf39e 100755 --- a/packages/ncform-common/test/unit/ncform-utils.js +++ b/packages/ncform-common/test/unit/ncform-utils.js @@ -374,6 +374,35 @@ describe('/src/ncform-utils.js', () => { console.log(JSON.stringify(formSchema, null, 2)); assert(formSchema.properties.name.value === value.name); }); + it("setValueToSchema - 对象嵌套数组再嵌套对象", () => { + const value = { + user: [ + { + name: "jorge" + }, + { + name: "ping" + } + ] + }; + const formSchema = { + type: 'object', + properties: { + user: { + type: 'array', + item: { + type: 'object', + properties: { + name: "string" + } + } + } + } + }; + ncformUtils.setValueToSchema(value, formSchema); + console.log(JSON.stringify(formSchema, null, 2)); + assert(JSON.stringify(formSchema.properties.user.value) === JSON.stringify(value.user)); + }); it("setValueToSchema - 普通数组", () => { const value = ['daniel', 'sarah']; const formSchema = { diff --git a/packages/ncform-theme-elementui/conf/webpack.config.prd.js b/packages/ncform-theme-elementui/conf/webpack.config.prd.js index 8c01501..a8ce7bb 100755 --- a/packages/ncform-theme-elementui/conf/webpack.config.prd.js +++ b/packages/ncform-theme-elementui/conf/webpack.config.prd.js @@ -7,7 +7,7 @@ module.exports = { mode: 'production', - devtool: false, + devtool: 'source-map', entry: { ncformStdComps: path.join(config.src, 'components', 'index.js'), diff --git a/packages/ncform-theme-elementui/package-lock.json b/packages/ncform-theme-elementui/package-lock.json index a433ee0..2e11785 100755 --- a/packages/ncform-theme-elementui/package-lock.json +++ b/packages/ncform-theme-elementui/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "dependencies": { "@ncform/ncform": { - "version": "1.6.6", - "resolved": "https://registry.npm.taobao.org/@ncform/ncform/download/@ncform/ncform-1.6.6.tgz", - "integrity": "sha1-Ma92hGwhzu/XV4C/sInScQIu0hY=", + "version": "1.6.9", + "resolved": "https://registry.npmjs.org/@ncform/ncform/-/ncform-1.6.9.tgz", + "integrity": "sha512-KSwvFwON0pNpWbT725TR1uEbTqLm/a13BGJIh8NKNkb5iRBpknG/S941PbjI7lj4A1+PCMgvZrqgH0pQGf5r3Q==", "dev": true, "requires": { - "@ncform/ncform-common": "^1.6.6", + "@ncform/ncform-common": "^1.6.9", "axios": "^0.18.0", "extend": "^3.0.1", "lodash-es": "^4.16.2", @@ -20,8 +20,8 @@ "dependencies": { "axios": { "version": "0.18.1", - "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.18.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.18.1.tgz", - "integrity": "sha1-/z8N4ue10YDnV62YAA8Qgbh7zqM=", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz", + "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", "dev": true, "requires": { "follow-redirects": "1.5.10", @@ -30,8 +30,8 @@ }, "debug": { "version": "3.1.0", - "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { "ms": "2.0.0" @@ -39,8 +39,8 @@ }, "follow-redirects": { "version": "1.5.10", - "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz", - "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", "dev": true, "requires": { "debug": "=3.1.0" @@ -48,16 +48,16 @@ }, "is-buffer": { "version": "2.0.4", - "resolved": "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.4.tgz", - "integrity": "sha1-PlcvI8hBGlz9lVfISeNmXgspBiM=", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", "dev": true } } }, "@ncform/ncform-common": { - "version": "1.6.6", - "resolved": "https://registry.npm.taobao.org/@ncform/ncform-common/download/@ncform/ncform-common-1.6.6.tgz", - "integrity": "sha1-HXpaF5iGPiAR+fIVIzJgTgX0o0w=", + "version": "1.6.9", + "resolved": "https://registry.npmjs.org/@ncform/ncform-common/-/ncform-common-1.6.9.tgz", + "integrity": "sha512-ZmSL3IpcDStcdx07fAPMaD0qTIK1HWp3XvDyP4Ql7GKg9KhiIiGRY9cDbyCyrjvAxN6ykYvPKT+oipgqaMkDgg==", "requires": { "assert": "^1.4.1", "axios": "^0.18.0", @@ -68,8 +68,8 @@ "dependencies": { "axios": { "version": "0.18.1", - "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.18.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.18.1.tgz", - "integrity": "sha1-/z8N4ue10YDnV62YAA8Qgbh7zqM=", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz", + "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", "requires": { "follow-redirects": "1.5.10", "is-buffer": "^2.0.2" @@ -77,24 +77,24 @@ }, "debug": { "version": "3.1.0", - "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "requires": { "ms": "2.0.0" } }, "follow-redirects": { "version": "1.5.10", - "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz", - "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", "requires": { "debug": "=3.1.0" } }, "is-buffer": { "version": "2.0.4", - "resolved": "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.4.tgz", - "integrity": "sha1-PlcvI8hBGlz9lVfISeNmXgspBiM=" + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" } } }, @@ -1632,7 +1632,7 @@ }, "bezier-easing": { "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/bezier-easing/download/bezier-easing-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-2.1.0.tgz", "integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY=", "dev": true }, @@ -14093,9 +14093,9 @@ } }, "vue-scrollto": { - "version": "2.17.1", - "resolved": "https://registry.npm.taobao.org/vue-scrollto/download/vue-scrollto-2.17.1.tgz", - "integrity": "sha1-zWLuC5jPfiup/ZTwKa3c0JOXikg=", + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/vue-scrollto/-/vue-scrollto-2.18.1.tgz", + "integrity": "sha512-JojeVOP1Z50Jt0OCOd61jRRRF8TrNvPAzF4LAKwkTEZnt30mpDd48aDZZOEPD3l6z2PybOyUGFT/FNWfTtFv9w==", "dev": true, "requires": { "bezier-easing": "2.1.0" diff --git a/packages/ncform-theme-elementui/src/components/layout-comps/array-table.vue b/packages/ncform-theme-elementui/src/components/layout-comps/array-table.vue index a68f51a..c14492e 100755 --- a/packages/ncform-theme-elementui/src/components/layout-comps/array-table.vue +++ b/packages/ncform-theme-elementui/src/components/layout-comps/array-table.vue @@ -16,7 +16,7 @@