diff --git a/examples/package-lock.json b/examples/package-lock.json index 4bcad8a..a7d0bbc 100644 --- a/examples/package-lock.json +++ b/examples/package-lock.json @@ -30,11 +30,12 @@ }, "..": { "name": "@zhicheng1012/zhicheng-components", - "version": "1.0.25", + "version": "1.0.26", "license": "MIT", "dependencies": { "async-validator": "^1.11.5", - "core-js": "^3.40.0" + "core-js": "^3.40.0", + "vue-clickaway": "^2.2.2" }, "devDependencies": { "babel-eslint": "~10.1.0", @@ -3218,12 +3219,13 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, "node_modules/@zhicheng1012/zhicheng-components": { - "version": "1.0.25", - "resolved": "https://registry.npmjs.org/@zhicheng1012/zhicheng-components/-/zhicheng-components-1.0.25.tgz", - "integrity": "sha512-oo6QqLy71T2Ak9NWGjzl8r1TVCCL3PNgvTUtWKrD4i3edtlv/3cFMrTAbZEjC3kJ6Despupj7YvgjXLaGKX0hw==", + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/@zhicheng1012/zhicheng-components/-/zhicheng-components-1.0.26.tgz", + "integrity": "sha512-An3vGczA7RMaJM+HG/SUWknSzLtG5+orG4ZK1Bl5O/PxQbvcXqlO6zLfXGO2qJ1mkD8568PrM9cg69fdMsrr/A==", "dependencies": { "async-validator": "^1.11.5", - "core-js": "^3.40.0" + "core-js": "^3.40.0", + "vue-clickaway": "^2.2.2" }, "engines": { "node": ">=12.0.0 <=16.x", @@ -9780,8 +9782,7 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { "version": "3.14.1", @@ -10175,6 +10176,17 @@ "url": "https://tidelift.com/funding/github/npm/loglevel" } }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, "node_modules/lower-case": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", @@ -15788,6 +15800,17 @@ "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==", "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details." }, + "node_modules/vue-clickaway": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/vue-clickaway/-/vue-clickaway-2.2.2.tgz", + "integrity": "sha512-25SpjXKetL06GLYoLoC8pqAV6Cur9cQ//2g35GRFBV4FgoljbZZjTINR8g2NuVXXDMLSUXaKx5dutgO4PaDE7A==", + "dependencies": { + "loose-envify": "^1.2.0" + }, + "peerDependencies": { + "vue": "^2.0.0" + } + }, "node_modules/vue-eslint-parser": { "version": "7.11.0", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz", @@ -19478,12 +19501,13 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, "@zhicheng1012/zhicheng-components": { - "version": "1.0.25", - "resolved": "https://registry.npmjs.org/@zhicheng1012/zhicheng-components/-/zhicheng-components-1.0.25.tgz", - "integrity": "sha512-oo6QqLy71T2Ak9NWGjzl8r1TVCCL3PNgvTUtWKrD4i3edtlv/3cFMrTAbZEjC3kJ6Despupj7YvgjXLaGKX0hw==", + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/@zhicheng1012/zhicheng-components/-/zhicheng-components-1.0.26.tgz", + "integrity": "sha512-An3vGczA7RMaJM+HG/SUWknSzLtG5+orG4ZK1Bl5O/PxQbvcXqlO6zLfXGO2qJ1mkD8568PrM9cg69fdMsrr/A==", "requires": { "async-validator": "^1.11.5", - "core-js": "^3.40.0" + "core-js": "^3.40.0", + "vue-clickaway": "^2.2.2" }, "dependencies": { "async-validator": { @@ -24419,8 +24443,7 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { "version": "3.14.1", @@ -24748,6 +24771,14 @@ "integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==", "dev": true }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, "lower-case": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", @@ -25101,6 +25132,7 @@ "style-loader": "~2.0.0", "url-loader": "^4.1.1", "vue": "2.6.14", + "vue-clickaway": "^2.2.2", "vue-loader": "^15.9.8", "vue-svg-loader": "^0.16.0", "vue-template-compiler": "2.6.14", @@ -29231,6 +29263,14 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz", "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" }, + "vue-clickaway": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/vue-clickaway/-/vue-clickaway-2.2.2.tgz", + "integrity": "sha512-25SpjXKetL06GLYoLoC8pqAV6Cur9cQ//2g35GRFBV4FgoljbZZjTINR8g2NuVXXDMLSUXaKx5dutgO4PaDE7A==", + "requires": { + "loose-envify": "^1.2.0" + } + }, "vue-eslint-parser": { "version": "7.11.0", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz", diff --git a/package.json b/package.json index b8387f6..7e69cfd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "@zhicheng1012/zhicheng-components", "version": "1.0.26", + "private": true, "description": "A Vue 2 component library", "main": "dist/js/zhicheng-components.umd.js", "publishConfig": { diff --git a/packages/GuipRadio/src/index.vue b/packages/GuipRadio/src/index.vue index 9024e97..1e00dbc 100644 --- a/packages/GuipRadio/src/index.vue +++ b/packages/GuipRadio/src/index.vue @@ -138,10 +138,16 @@ export default { // 当前选项是否选中 const isSelected = this.getValue(option) === this.selectedValue; - // 选中状态下优先返回selectedLabel,其次返回labelKey指定的属性 - return isSelected && option[this.selectedLabelKey] - ? option[this.selectedLabelKey] - : option[this.labelKey] || option; + // 选中状态下优先返回 selectedLabel + if (isSelected && option[this.selectedLabelKey]) { + return option[this.selectedLabelKey]; + } + + // 明确检查 labelKey 是否存在 + if (typeof option === 'object' && this.labelKey in option) { + return option[this.labelKey]; + } + return option; }, getValue(option) { // 处理对象格式的选项 @@ -149,7 +155,11 @@ export default { return option.key; } - return option[this.valueKey] || option; + // 明确检查 valueKey 是否存在 + if (typeof option === 'object' && this.valueKey in option) { + return option[this.valueKey]; + } + return option; }, // 判断选项是否禁用 isDisabled(key) { diff --git a/packages/GuipTable/src/index.vue b/packages/GuipTable/src/index.vue index badaffd..8108100 100644 --- a/packages/GuipTable/src/index.vue +++ b/packages/GuipTable/src/index.vue @@ -1,96 +1,145 @@ - - - - - - - - - - - - - - - - - 默认内容:{{ `popoverVisible_${column.prop}` }} - - - - - 取消 - 确定 - - - {{ row[column.prop] }} - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + 默认内容:{{ `popoverVisible_${column.prop}` }} + + + + + + 取消 + 确定 + + + + {{ row[column.prop] }} + + + + + + + + + + 暂无数据 + + + +
默认内容:{{ `popoverVisible_${column.prop}` }}
暂无数据