vxcontrol/ncform
1
0
Fork 0
mirror of https://github.com/vxcontrol/ncform.git synced 2026-07-18 16:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #146 from ncform/develop

Browse Source 
Develop
This commit is contained in:
Daniel.xiao
2020-05-02 00:47:32 +08:00
committed by GitHub
parent 465c894116 dc29bcc244
commit db7aa11aa4
18 changed files with 224 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -47,6 +47,7 @@ typings/
# Optional REPL history
.node_repl_history
.history
# Output of 'npm pack'
*.tgz
CONFIG.md
+1 -1
View File
@@ -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
CONFIG_CN.md
+1 -1
View File
@@ -27,7 +27,7 @@
/* UI */
ui: {
columns: 6, // 占用列数，共12列。
columns: 6, // 占用列数，共12列。【支持dx表达式】
label: '', // 标签内容【支持dx表达式】
showLabel: true, // 是否显示标签（注意：当为 false 时，依然占着空间）
noLabelSpace: false, // 标签是否不占空间，优先级比showLabel高
packages/ncform-common/test/unit/ncform-utils.js
+29
View File
@@ -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 = {
packages/ncform-theme-elementui/conf/webpack.config.prd.js
+1 -1
View File
@@ -7,7 +7,7 @@ module.exports = {
mode: 'production',
devtool: false,
devtool: 'source-map',
entry: {
ncformStdComps: path.join(config.src, 'components', 'index.js'),
packages/ncform-theme-elementui/package-lock.json
Generated
+27 -27
View File
@@ -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"
packages/ncform-theme-elementui/src/components/layout-comps/array-table.vue
+1 -1
View File
@@ -16,7 +16,7 @@
<col v-if="showActionColumn" width="130px"/>
</colgroup>
<thead>
<th v-for="(renderSchema, idx) in renderSchemas" :key="renderSchema.ui.label" v-show="!analyzeItemVal(renderSchema.ui.hidden, idx)">
<th v-for="(renderSchema, idx) in renderSchemas" :key="idx" v-show="!analyzeItemVal(renderSchema.ui.hidden, idx)">
<i v-if="showRequiredFlag(renderSchema.rules.required)" class="text-danger">*</i>
packages/ncform-theme-elementui/src/components/layout-comps/array-tabs.vue
+1 -1
View File
@@ -21,7 +21,7 @@
<!-- array item 是 正常的 object 类型 -->
<template v-if="isNormalObjSchema(dataItem.__dataSchema)">
<ncform-object :schema="dataItem.__dataSchema" :form-data="formData" :idx-chain="(idxChain ? idxChain + ',' : '') + idx" :config="dataItem.__dataSchema.ui.widgetConfig" :show-legend="false">
<ncform-object :schema="dataItem.__dataSchema" :form-data="formData" :idx-chain="(idxChain ? idxChain + ',' : '') + idx" :config="dataItem.__dataSchema.ui.widgetConfig" :global-const="globalConst" :show-legend="false">
<template v-for="(fieldSchema, fieldName) in (dataItem.__dataSchema.properties || {__notObjItem: dataItem.__dataSchema})" :slot="fieldName"><!-- 注意：__notObjItem 这个Key为与form-item约定好的值，其它名字不生效 -->
<slot :name="fieldName" :schema="fieldSchema" :idx="idx"></slot>
packages/ncform-theme-elementui/src/components/layout-comps/array.vue
+1 -1
View File
@@ -24,7 +24,7 @@
<!-- array item 是 正常的 object 类型 -->
<template v-if="isNormalObjSchema(dataItem.__dataSchema)">
<ncform-object v-show="mergeConfig.disableItemCollapse || dataItem.__dataSchema._expand" :schema="dataItem.__dataSchema" :form-data="formData" :idx-chain="(idxChain ? idxChain + ',' : '') + idx" :config="dataItem.__dataSchema.ui.widgetConfig" :show-legend="false">
<ncform-object v-show="mergeConfig.disableItemCollapse || dataItem.__dataSchema._expand" :schema="dataItem.__dataSchema" :form-data="formData" :idx-chain="(idxChain ? idxChain + ',' : '') + idx" :global-const="globalConst" :config="dataItem.__dataSchema.ui.widgetConfig" :show-legend="false">
<template v-for="(fieldSchema, fieldName) in (dataItem.__dataSchema.properties || {__notObjItem: dataItem.__dataSchema})" :slot="fieldName"><!-- 注意：__notObjItem 这个Key为与form-item约定好的值，其它名字不生效 -->
<slot :name="fieldName" :schema="fieldSchema" :idx="idx"></slot>
packages/ncform-theme-elementui/src/components/layout-comps/object.vue
+2 -2
View File
@@ -10,7 +10,7 @@
<div v-for="(fieldSchema, field) in schema.properties"
:key="field"
:class="['el-col-' + (fieldSchema.ui.columns * 2 || 24)]"
:class="['el-col-' + ((_analyzeVal(fieldSchema.ui.columns) || 12) * 2 || 24)]"
:style="{display: _analyzeVal(fieldSchema.ui.hidden) ? 'none' : ''}"
class="el-col el-form-item">
@@ -43,7 +43,7 @@
<div v-if="mergeConfig.layout === 'h'" v-show="!collapsed" class="el-row h-layout" style="width: 100%">
<div v-for="(fieldSchema, field) in schema.properties"
:key="field"
:class="['el-col-' + (fieldSchema.ui.columns * 2 || 24)]"
:class="['el-col-' + ((_analyzeVal(fieldSchema.ui.columns) || 12) * 2 || 24)]"
:style="{display: _analyzeVal(fieldSchema.ui.hidden) ? 'none' : ''}"
class="el-col el-form-item">
<template>
packages/ncform/conf/webpack.config.prd.js
+2
View File
@@ -11,6 +11,8 @@ module.exports = {
filename: "[name].min.js",
},
devtool: 'source-map',
optimization: {
minimize: true
}
packages/ncform/examples/components/vue-ncform/_dx.html
+23 -1
View File
@@ -209,7 +209,29 @@
},
}
}
}
},
{
id: md5('columns dx value'),
title: 'columns dx value',
formName: 'form_' + Math.random(),
formSchema: {
type: 'object',
properties: {
a: {
default: 6,
type: 'number',
ui: {
columns: 6
}
},
b: {
ui: {
columns: 'dx: {{$root.a}}'
}
}
}
}
},
]
}
});
packages/ncform/examples/components/vue-ncform/_others.html
+2 -1
View File
@@ -137,10 +137,11 @@
changeModel(formSchema) {
formSchema.value = { user: { name: 'daniel' } };
},
onChange({paths, itemValue, formValue}) {
onChange({paths, itemValue, formValue, itemOldValue}) {
console.log('paths:', paths);
console.log('itemValue:', itemValue);
console.log('formValue:', JSON.stringify(formValue, null, 2));
console.log('itemOldValue', itemOldValue);
}
}
});
packages/ncform/package-lock.json
Generated
+126 -104
View File
@@ -61,18 +61,6 @@
}
}
},
"@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=",
"requires": {
"assert": "^1.4.1",
"axios": "^0.18.0",
"extend": "^3.0.1",
"lodash-es": "^4.17.4",
"power-assert": "^1.4.4"
}
},
"@types/q": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
@@ -127,7 +115,8 @@
"acorn-es7-plugin": {
"version": "1.1.7",
"resolved": "http://registry.npm.taobao.org/acorn-es7-plugin/download/acorn-es7-plugin-1.1.7.tgz",
"integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s="
"integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=",
"dev": true
},
"acorn-globals": {
"version": "4.3.0",
@@ -405,7 +394,8 @@
"array-filter": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
"integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
"integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=",
"dev": true
},
"array-find-index": {
"version": "1.0.2",
@@ -515,6 +505,7 @@
"version": "1.4.1",
"resolved": "http://registry.npm.taobao.org/assert/download/assert-1.4.1.tgz",
"integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
"dev": true,
"requires": {
"util": "0.10.3"
}
@@ -1103,7 +1094,8 @@
"call-signature": {
"version": "0.0.2",
"resolved": "http://registry.npm.taobao.org/call-signature/download/call-signature-0.0.2.tgz",
"integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY="
"integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY=",
"dev": true
},
"callsite": {
"version": "1.0.0",
@@ -1754,7 +1746,8 @@
"core-js": {
"version": "2.5.1",
"resolved": "http://registry.npm.taobao.org/core-js/download/core-js-2.5.1.tgz",
"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -2237,6 +2230,7 @@
"version": "1.1.2",
"resolved": "http://registry.npm.taobao.org/define-properties/download/define-properties-1.1.2.tgz",
"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
"dev": true,
"requires": {
"foreach": "^2.0.5",
"object-keys": "^1.0.8"
@@ -2361,7 +2355,8 @@
"diff-match-patch": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/diff-match-patch/download/diff-match-patch-1.0.0.tgz",
"integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg="
"integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg=",
"dev": true
},
"diffie-hellman": {
"version": "5.0.2",
@@ -2510,7 +2505,8 @@
"eastasianwidth": {
"version": "0.1.1",
"resolved": "http://registry.npm.taobao.org/eastasianwidth/download/eastasianwidth-0.1.1.tgz",
"integrity": "sha1-RNZW3p2kFWlEZzNTZfsxR7hXK3w="
"integrity": "sha1-RNZW3p2kFWlEZzNTZfsxR7hXK3w=",
"dev": true
},
"easy-extender": {
"version": "2.3.4",
@@ -2583,6 +2579,7 @@
"version": "1.2.3",
"resolved": "http://registry.npm.taobao.org/empower/download/empower-1.2.3.tgz",
"integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=",
"dev": true,
"requires": {
"core-js": "^2.0.0",
"empower-core": "^0.6.2"
@@ -2592,6 +2589,7 @@
"version": "0.6.2",
"resolved": "http://registry.npm.taobao.org/empower-core/download/empower-core-0.6.2.tgz",
"integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=",
"dev": true,
"requires": {
"call-signature": "0.0.2",
"core-js": "^2.0.0"
@@ -3136,6 +3134,7 @@
"version": "1.7.0",
"resolved": "http://registry.npm.taobao.org/espurify/download/espurify-1.7.0.tgz",
"integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=",
"dev": true,
"requires": {
"core-js": "^2.0.0"
}
@@ -3161,7 +3160,8 @@
"estraverse": {
"version": "4.2.0",
"resolved": "http://registry.npm.taobao.org/estraverse/download/estraverse-4.2.0.tgz",
"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
"dev": true
},
"esutils": {
"version": "2.0.2",
@@ -3799,7 +3799,8 @@
"foreach": {
"version": "2.0.5",
"resolved": "http://registry.npm.taobao.org/foreach/download/foreach-2.0.5.tgz",
"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
"dev": true
},
"forever-agent": {
"version": "0.6.1",
@@ -3884,8 +3885,8 @@
"dev": true,
"optional": true,
"requires": {
"delegates": "1.0.0",
"readable-stream": "2.3.6"
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
}
},
"balanced-match": {
@@ -3900,7 +3901,7 @@
"dev": true,
"optional": true,
"requires": {
"balanced-match": "1.0.0",
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -3967,7 +3968,7 @@
"dev": true,
"optional": true,
"requires": {
"minipass": "2.3.5"
"minipass": "^2.2.1"
}
},
"fs.realpath": {
@@ -3982,14 +3983,14 @@
"dev": true,
"optional": true,
"requires": {
"aproba": "1.2.0",
"console-control-strings": "1.1.0",
"has-unicode": "2.0.1",
"object-assign": "4.1.1",
"signal-exit": "3.0.2",
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
"wide-align": "1.1.3"
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
"has-unicode": "^2.0.0",
"object-assign": "^4.1.0",
"signal-exit": "^3.0.0",
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
}
},
"glob": {
@@ -3998,12 +3999,12 @@
"dev": true,
"optional": true,
"requires": {
"fs.realpath": "1.0.0",
"inflight": "1.0.6",
"inherits": "2.0.3",
"minimatch": "3.0.4",
"once": "1.4.0",
"path-is-absolute": "1.0.1"
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"has-unicode": {
@@ -4018,7 +4019,7 @@
"dev": true,
"optional": true,
"requires": {
"safer-buffer": "2.1.2"
"safer-buffer": ">= 2.1.2 < 3"
}
},
"ignore-walk": {
@@ -4027,7 +4028,7 @@
"dev": true,
"optional": true,
"requires": {
"minimatch": "3.0.4"
"minimatch": "^3.0.4"
}
},
"inflight": {
@@ -4036,8 +4037,8 @@
"dev": true,
"optional": true,
"requires": {
"once": "1.4.0",
"wrappy": "1.0.2"
"once": "^1.3.0",
"wrappy": "1"
}
},
"inherits": {
@@ -4058,7 +4059,7 @@
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "1.0.1"
"number-is-nan": "^1.0.0"
}
},
"isarray": {
@@ -4073,7 +4074,7 @@
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "1.1.11"
"brace-expansion": "^1.1.7"
}
},
"minimist": {
@@ -4088,8 +4089,8 @@
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "5.1.2",
"yallist": "3.0.3"
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
}
},
"minizlib": {
@@ -4098,7 +4099,7 @@
"dev": true,
"optional": true,
"requires": {
"minipass": "2.3.5"
"minipass": "^2.2.1"
}
},
"mkdirp": {
@@ -4122,9 +4123,9 @@
"dev": true,
"optional": true,
"requires": {
"debug": "2.6.9",
"iconv-lite": "0.4.24",
"sax": "1.2.4"
"debug": "^2.1.2",
"iconv-lite": "^0.4.4",
"sax": "^1.2.4"
}
},
"node-pre-gyp": {
@@ -4133,16 +4134,16 @@
"dev": true,
"optional": true,
"requires": {
"detect-libc": "1.0.3",
"mkdirp": "0.5.1",
"needle": "2.2.4",
"nopt": "4.0.1",
"npm-packlist": "1.2.0",
"npmlog": "4.1.2",
"rc": "1.2.8",
"rimraf": "2.6.3",
"semver": "5.6.0",
"tar": "4.4.8"
"detect-libc": "^1.0.2",
"mkdirp": "^0.5.1",
"needle": "^2.2.1",
"nopt": "^4.0.1",
"npm-packlist": "^1.1.6",
"npmlog": "^4.0.2",
"rc": "^1.2.7",
"rimraf": "^2.6.1",
"semver": "^5.3.0",
"tar": "^4"
}
},
"nopt": {
@@ -4151,8 +4152,8 @@
"dev": true,
"optional": true,
"requires": {
"abbrev": "1.1.1",
"osenv": "0.1.5"
"abbrev": "1",
"osenv": "^0.1.4"
}
},
"npm-bundled": {
@@ -4167,8 +4168,8 @@
"dev": true,
"optional": true,
"requires": {
"ignore-walk": "3.0.1",
"npm-bundled": "1.0.5"
"ignore-walk": "^3.0.1",
"npm-bundled": "^1.0.1"
}
},
"npmlog": {
@@ -4177,10 +4178,10 @@
"dev": true,
"optional": true,
"requires": {
"are-we-there-yet": "1.1.5",
"console-control-strings": "1.1.0",
"gauge": "2.7.4",
"set-blocking": "2.0.0"
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
"gauge": "~2.7.3",
"set-blocking": "~2.0.0"
}
},
"number-is-nan": {
@@ -4201,7 +4202,7 @@
"dev": true,
"optional": true,
"requires": {
"wrappy": "1.0.2"
"wrappy": "1"
}
},
"os-homedir": {
@@ -4222,8 +4223,8 @@
"dev": true,
"optional": true,
"requires": {
"os-homedir": "1.0.2",
"os-tmpdir": "1.0.2"
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
}
},
"path-is-absolute": {
@@ -4244,10 +4245,10 @@
"dev": true,
"optional": true,
"requires": {
"deep-extend": "0.6.0",
"ini": "1.3.5",
"minimist": "1.2.0",
"strip-json-comments": "2.0.1"
"deep-extend": "^0.6.0",
"ini": "~1.3.0",
"minimist": "^1.2.0",
"strip-json-comments": "~2.0.1"
},
"dependencies": {
"minimist": {
@@ -4264,13 +4265,13 @@
"dev": true,
"optional": true,
"requires": {
"core-util-is": "1.0.2",
"inherits": "2.0.3",
"isarray": "1.0.0",
"process-nextick-args": "2.0.0",
"safe-buffer": "5.1.2",
"string_decoder": "1.1.1",
"util-deprecate": "1.0.2"
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"rimraf": {
@@ -4279,7 +4280,7 @@
"dev": true,
"optional": true,
"requires": {
"glob": "7.1.3"
"glob": "^7.1.3"
}
},
"safe-buffer": {
@@ -4324,9 +4325,9 @@
"dev": true,
"optional": true,
"requires": {
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
"strip-ansi": "^3.0.0"
}
},
"string_decoder": {
@@ -4335,7 +4336,7 @@
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "5.1.2"
"safe-buffer": "~5.1.0"
}
},
"strip-ansi": {
@@ -4344,7 +4345,7 @@
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "2.1.1"
"ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
@@ -4359,13 +4360,13 @@
"dev": true,
"optional": true,
"requires": {
"chownr": "1.1.1",
"fs-minipass": "1.2.5",
"minipass": "2.3.5",
"minizlib": "1.2.1",
"mkdirp": "0.5.1",
"safe-buffer": "5.1.2",
"yallist": "3.0.3"
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
"minipass": "^2.3.4",
"minizlib": "^1.1.1",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2",
"yallist": "^3.0.2"
}
},
"util-deprecate": {
@@ -4380,7 +4381,7 @@
"dev": true,
"optional": true,
"requires": {
"string-width": "1.0.2"
"string-width": "^1.0.2 || 2"
}
},
"wrappy": {
@@ -5383,7 +5384,8 @@
"indexof": {
"version": "0.0.1",
"resolved": "http://registry.npm.taobao.org/indexof/download/indexof-0.0.1.tgz",
"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
"dev": true
},
"inflight": {
"version": "1.0.6",
@@ -7581,7 +7583,8 @@
"object-keys": {
"version": "1.0.11",
"resolved": "http://registry.npm.taobao.org/object-keys/download/object-keys-1.0.11.tgz",
"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
"dev": true
},
"object-path": {
"version": "0.9.2",
@@ -8964,6 +8967,7 @@
"version": "1.4.4",
"resolved": "http://registry.npm.taobao.org/power-assert/download/power-assert-1.4.4.tgz",
"integrity": "sha1-kpXqdDcZb1pgH95CDwQmMRhtdRc=",
"dev": true,
"requires": {
"define-properties": "^1.1.2",
"empower": "^1.2.3",
@@ -8976,6 +8980,7 @@
"version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/power-assert-context-formatter/download/power-assert-context-formatter-1.1.1.tgz",
"integrity": "sha1-7bo1LT7YpgMRTWZyZazOYNaJzN8=",
"dev": true,
"requires": {
"core-js": "^2.0.0",
"power-assert-context-traversal": "^1.1.1"
@@ -8985,6 +8990,7 @@
"version": "1.1.2",
"resolved": "http://registry.npm.taobao.org/power-assert-context-reducer-ast/download/power-assert-context-reducer-ast-1.1.2.tgz",
"integrity": "sha1-SEqZ4m9Jc/+IMuXFzHVnAuYJQXQ=",
"dev": true,
"requires": {
"acorn": "^4.0.0",
"acorn-es7-plugin": "^1.0.12",
@@ -8996,7 +9002,8 @@
"acorn": {
"version": "4.0.13",
"resolved": "http://registry.npm.taobao.org/acorn/download/acorn-4.0.13.tgz",
"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
"dev": true
}
}
},
@@ -9004,6 +9011,7 @@
"version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/power-assert-context-traversal/download/power-assert-context-traversal-1.1.1.tgz",
"integrity": "sha1-iMq8oNE7Y1nwfT0+ivppkmRXftk=",
"dev": true,
"requires": {
"core-js": "^2.0.0",
"estraverse": "^4.1.0"
@@ -9013,6 +9021,7 @@
"version": "1.4.1",
"resolved": "http://registry.npm.taobao.org/power-assert-formatter/download/power-assert-formatter-1.4.1.tgz",
"integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=",
"dev": true,
"requires": {
"core-js": "^2.0.0",
"power-assert-context-formatter": "^1.0.7",
@@ -9027,6 +9036,7 @@
"version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/power-assert-renderer-assertion/download/power-assert-renderer-assertion-1.1.1.tgz",
"integrity": "sha1-y/wOd+AIao+Wrz8djme57n4ozpg=",
"dev": true,
"requires": {
"power-assert-renderer-base": "^1.1.1",
"power-assert-util-string-width": "^1.1.1"
@@ -9035,12 +9045,14 @@
"power-assert-renderer-base": {
"version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/power-assert-renderer-base/download/power-assert-renderer-base-1.1.1.tgz",
"integrity": "sha1-lqZQxv0F7hvB9mtUrWFELIs/Y+s="
"integrity": "sha1-lqZQxv0F7hvB9mtUrWFELIs/Y+s=",
"dev": true
},
"power-assert-renderer-comparison": {
"version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/power-assert-renderer-comparison/download/power-assert-renderer-comparison-1.1.1.tgz",
"integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=",
"dev": true,
"requires": {
"core-js": "^2.0.0",
"diff-match-patch": "^1.0.0",
@@ -9053,6 +9065,7 @@
"version": "1.1.2",
"resolved": "http://registry.npm.taobao.org/power-assert-renderer-diagram/download/power-assert-renderer-diagram-1.1.2.tgz",
"integrity": "sha1-ZV+PcRk1qbbVQbhjJ2VHF8Y3qYY=",
"dev": true,
"requires": {
"core-js": "^2.0.0",
"power-assert-renderer-base": "^1.1.1",
@@ -9064,6 +9077,7 @@
"version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/power-assert-renderer-file/download/power-assert-renderer-file-1.1.1.tgz",
"integrity": "sha1-o34rvReMys0E5427eckv40kzxec=",
"dev": true,
"requires": {
"power-assert-renderer-base": "^1.1.1"
}
@@ -9072,6 +9086,7 @@
"version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/power-assert-util-string-width/download/power-assert-util-string-width-1.1.1.tgz",
"integrity": "sha1-vmWet5N/3S5smncmjar2S9W3xZI=",
"dev": true,
"requires": {
"eastasianwidth": "^0.1.1"
}
@@ -11140,6 +11155,7 @@
"version": "1.3.0",
"resolved": "http://registry.npm.taobao.org/stringifier/download/stringifier-1.3.0.tgz",
"integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=",
"dev": true,
"requires": {
"core-js": "^2.0.0",
"traverse": "^0.6.6",
@@ -12122,7 +12138,8 @@
"traverse": {
"version": "0.6.6",
"resolved": "http://registry.npm.taobao.org/traverse/download/traverse-0.6.6.tgz",
"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
"dev": true
},
"trim-newlines": {
"version": "1.0.0",
@@ -12190,7 +12207,8 @@
"type-name": {
"version": "2.0.2",
"resolved": "http://registry.npm.taobao.org/type-name/download/type-name-2.0.2.tgz",
"integrity": "sha1-7+fUEj2KxSr/9/QMfk3sUmYAj7Q="
"integrity": "sha1-7+fUEj2KxSr/9/QMfk3sUmYAj7Q=",
"dev": true
},
"typedarray": {
"version": "0.0.6",
@@ -12363,6 +12381,7 @@
"version": "1.2.2",
"resolved": "http://registry.npm.taobao.org/universal-deep-strict-equal/download/universal-deep-strict-equal-1.2.2.tgz",
"integrity": "sha1-DaSsL3PP95JMgfpN4BjKViyisKc=",
"dev": true,
"requires": {
"array-filter": "^1.0.0",
"indexof": "0.0.1",
@@ -12550,6 +12569,7 @@
"version": "0.10.3",
"resolved": "http://registry.npm.taobao.org/util/download/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"dev": true,
"requires": {
"inherits": "2.0.1"
},
@@ -12557,7 +12577,8 @@
"inherits": {
"version": "2.0.1",
"resolved": "http://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz",
"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
"dev": true
}
}
},
@@ -13063,7 +13084,8 @@
"xtend": {
"version": "4.0.1",
"resolved": "http://registry.npm.taobao.org/xtend/download/xtend-4.0.1.tgz",
"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
"dev": true
},
"y18n": {
"version": "3.2.1",
packages/ncform/src/components/vue-ncform/form-item.vue
+2 -1
View File
@@ -282,7 +282,8 @@ export default {
formVM.$emit('change', {
paths: this.paths,
itemValue: this.schema.value,
formValue: this.formData
formValue: this.formData,
itemOldValue: this.$data.itemValue
})
}
packages/ncform/src/components/vue-ncform/layout-comps/array-table.vue
+1 -1
View File
@@ -14,7 +14,7 @@
</colgroup>
<thead>
<tr>
<th v-for="(renderSchema, idx) in renderSchemas" :key="renderSchema.ui.label" v-show="!analyzeItemVal(renderSchema.ui.hidden, idx)">
<th v-for="(renderSchema, idx) in renderSchemas" :key="idx" v-show="!analyzeItemVal(renderSchema.ui.hidden, idx)">
<i v-if="showRequiredFlag(renderSchema.rules.required)" class="text-danger">*</i>
packages/ncform/src/components/vue-ncform/layout-comps/array.vue
+1 -1
View File
@@ -19,7 +19,7 @@
<!-- array item 是 正常的 object 类型 -->
<template v-if="isNormalObjSchema(dataItem.__dataSchema)">
<ncform-object v-show="mergeConfig.disableItemCollapse || dataItem.__dataSchema._expand" :schema="dataItem.__dataSchema" :form-data="formData" :idx-chain="(idxChain ? idxChain + ',' : '') + idx" :config="dataItem.__dataSchema.ui.widgetConfig" :show-legend="false">
<ncform-object v-show="mergeConfig.disableItemCollapse || dataItem.__dataSchema._expand" :schema="dataItem.__dataSchema" :form-data="formData" :idx-chain="(idxChain ? idxChain + ',' : '') + idx" :config="dataItem.__dataSchema.ui.widgetConfig" :global-const="globalConst" :show-legend="false">
<!-- 注意：__notObjItem 这个Key为与form-item约定好的值，其它名字不生效 -->
<template v-for="(fieldSchema, fieldName) in (dataItem.__dataSchema.properties || {__notObjItem: dataItem.__dataSchema})" :slot="fieldName">
packages/ncform/src/components/vue-ncform/layout-comps/object.vue
+2 -2
View File
@@ -6,7 +6,7 @@
<div v-if="mergeConfig.layout === 'v'" v-show="!collapsed" class="form-row v-layout" style="width: 100%">
<div v-for="(fieldSchema, field) in schema.properties"
:key="field"
:class="['col-md-' + (fieldSchema.ui.columns || 12)]"
:class="['col-md-' + (_analyzeVal(fieldSchema.ui.columns) || 12)]"
:style="{display: _analyzeVal(fieldSchema.ui.hidden) ? 'none' : ''}"
class="form-group">
<template>
@@ -34,7 +34,7 @@
<div v-if="mergeConfig.layout === 'h'" v-show="!collapsed" class="form-row h-layout" style="width: 100%">
<div v-for="(fieldSchema, field) in schema.properties"
:key="field"
:class="['col-md-' + (fieldSchema.ui.columns || 12)]"
:class="['col-md-' + (_analyzeVal(fieldSchema.ui.columns) || 12)]"
:style="{display: _analyzeVal(fieldSchema.ui.hidden) ? 'none' : ''}"
class="form-group row">
<template>