fix 修改多个实例重复安装警告问题 #1654

helper/vetur/attributes.json

@@ -25,7 +25,7 @@
   },
   "vxe-table/resizable": {
     "type": "boolean",
-    "description": "所有的列是否允许拖动列宽调整大小"
+    "description": "所有的列是否允许拖动列宽调整大小，被 column-config.resizable 替换"
   },
   "vxe-table/stripe": {
     "type": "boolean",
@@ -65,19 +65,19 @@
   },
   "vxe-table/highlight-current-row": {
     "type": "boolean",
-    "description": "是否要高亮当前行"
+    "description": "是否要高亮当前行，被 row-config.isCurrent 替换"
   },
   "vxe-table/highlight-hover-row": {
     "type": "boolean",
-    "description": "鼠标移到行是否要高亮显示"
+    "description": "鼠标移到行是否要高亮显示，被 row-config.isHover 替换"
   },
   "vxe-table/highlight-current-column": {
     "type": "boolean",
-    "description": "是否要高亮当前列"
+    "description": "是否要高亮当前列，被 column-config.isCurrent 替换"
   },
   "vxe-table/highlight-hover-column": {
     "type": "boolean",
-    "description": "鼠标移到列是否要高亮显示"
+    "description": "鼠标移到列是否要高亮显，被 column-config.isHover 替换示"
   },
   "vxe-table/row-class-name": {
     "type": "string | (({ row, rowindex, $rowindex }) => any)",
@@ -521,7 +521,7 @@
   },
   "vxe-grid/resizable": {
     "type": "boolean",
-    "description": "所有的列是否允许拖动列宽调整大小"
+    "description": "所有的列是否允许拖动列宽调整大小，被 column-config.resizable 替换"
   },
   "vxe-grid/stripe": {
     "type": "boolean",
@@ -561,19 +561,19 @@
   },
   "vxe-grid/highlight-current-row": {
     "type": "boolean",
-    "description": "是否要高亮当前行"
+    "description": "是否要高亮当前行，被 row-config.isCurrent 替换"
   },
   "vxe-grid/highlight-hover-row": {
     "type": "boolean",
-    "description": "鼠标移到行是否要高亮显示"
+    "description": "鼠标移到行是否要高亮显示，被 row-config.isHover 替换"
   },
   "vxe-grid/highlight-current-column": {
     "type": "boolean",
-    "description": "是否要高亮当前列"
+    "description": "是否要高亮当前列，被 column-config.isCurrent 替换"
   },
   "vxe-grid/highlight-hover-column": {
     "type": "boolean",
-    "description": "鼠标移到列是否要高亮显示"
+    "description": "鼠标移到列是否要高亮显，被 column-config.isHover 替换示"
   },
   "vxe-grid/row-class-name": {
     "type": "string | (({ row, rowindex, $rowindex }) => any)",
@@ -951,6 +951,10 @@
     "type": "boolean",
     "description": "是否禁用"
   },
+  "vxe-radio/strict": {
+    "type": "boolean",
+    "description": "严格模式，选中后不能取消"
+  },
   "vxe-radio/name": {
     "type": "string",
     "description": "原生 name 属性"
@@ -967,6 +971,10 @@
     "type": "boolean",
     "description": "是否禁用"
   },
+  "vxe-radio-group/strict": {
+    "type": "boolean",
+    "description": "严格模式，选中后不能取消"
+  },
   "vxe-radio-button/model-value": {
     "type": "any",
     "description": "v-model 绑定值"
@@ -983,6 +991,10 @@
     "type": "boolean",
     "description": "是否禁用"
   },
+  "vxe-radio-button/strict": {
+    "type": "boolean",
+    "description": "严格模式，选中后不能取消"
+  },
   "vxe-checkbox/model-value": {
     "type": "string | number | boolean",
     "description": "v-model 绑定值"
@@ -1387,7 +1399,11 @@
     "type": "boolean",
     "description": "鼠标是否可进入到 tooltip 中"
   },
-  "vxe-tooltip/leave-delay": {
+  "vxe-tooltip/enter-delay": {
+    "type": "number",
+    "description": "鼠标移入后延时多少才显示 tooltip"
+  },
+  "vxe-tooltip/leavedelay": {
     "type": "number",
     "description": "鼠标移出后延时多少才隐藏 tooltip"
   },
@@ -1727,6 +1743,10 @@
     "type": "any",
     "description": "纵向虚拟滚动配置"
   },
+  "vxe-pulldown/model-value": {
+    "type": "boolean",
+    "description": "v-model 绑定值"
+  },
   "vxe-pulldown/size": {
     "type": "string",
     "description": "尺寸"

helper/vetur/tags.json

@@ -276,6 +276,7 @@
       "content",
       "size",
       "disabled",
+      "strict",
       "name"
     ],
     "description": "单选框"
@@ -284,7 +285,8 @@
     "attributes": [
       "model-value",
       "size",
-      "disabled"
+      "disabled",
+      "strict"
     ],
     "subtags": [
       "vxe-radio",
@@ -297,7 +299,8 @@
       "model-value",
       "label",
       "content",
-      "disabled"
+      "disabled",
+      "strict"
     ],
     "description": "单选按钮"
   },
@@ -454,7 +457,8 @@
       "z-index",
       "is-arrow",
       "enterable",
-      "leave-delay"
+      "enter-delay",
+      "leavedelay"
     ],
     "description": "工具提示"
   },
@@ -572,6 +576,7 @@
   },
   "vxe-pulldown": {
     "attributes": [
+      "model-value",
       "size",
       "disabled",
       "placement",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.2.0-beta.0",
+  "version": "4.2.0-beta.1",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -36,7 +36,7 @@
     "@vue/cli-plugin-typescript": "~4.5.0",
     "@vue/cli-plugin-vuex": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.2.28",
+    "@vue/compiler-sfc": "^3.2.31",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^7.0.0",
     "core-js": "^3.6.5",
@@ -61,7 +61,7 @@
     "sass": "^1.45.1",
     "sass-loader": "^10.0.5",
     "typescript": "~4.3.5",
-    "vue": "^3.2.30",
+    "vue": "^3.2.31",
     "vue-i18n": "^9.1.7",
     "vue-router": "^4.0.11",
     "vuex": "^4.0.2",

packages/button/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Button = Object.assign(VxeButtonComponent, {
   install (app: App) {
-    dynamicApp.component(VxeButtonComponent.name, VxeButtonComponent)
     app.component(VxeButtonComponent.name, VxeButtonComponent)
   }
 })
 
+dynamicApp.component(VxeButtonComponent.name, VxeButtonComponent)
+
 export default Button

packages/checkbox-group/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const CheckboxGroup = Object.assign(VxeCheckboxGroupComponent, {
   install (app: App) {
-    dynamicApp.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent)
     app.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent)
   }
 })
 
+dynamicApp.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent)
+
 export default CheckboxGroup

packages/checkbox/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Checkbox = Object.assign(VxeCheckboxComponent, {
   install (app: App) {
-    dynamicApp.component(VxeCheckboxComponent.name, VxeCheckboxComponent)
     app.component(VxeCheckboxComponent.name, VxeCheckboxComponent)
   }
 })
 
+dynamicApp.component(VxeCheckboxComponent.name, VxeCheckboxComponent)
+
 export default Checkbox

packages/colgroup/index.ts

@@ -4,12 +4,14 @@ import { dynamicApp } from '../dynamics'
 
 export const Colgroup = Object.assign(VxeTableColgroupComponent, {
   install (app: App) {
-    dynamicApp.component(VxeTableColgroupComponent.name, VxeTableColgroupComponent)
     app.component(VxeTableColgroupComponent.name, VxeTableColgroupComponent)
     // 兼容旧用法
-    dynamicApp.component('VxeTableColgroup', VxeTableColgroupComponent)
     app.component('VxeTableColgroup', VxeTableColgroupComponent)
   }
 })
 
+dynamicApp.component(VxeTableColgroupComponent.name, VxeTableColgroupComponent)
+// 兼容旧用法
+dynamicApp.component('VxeTableColgroup', VxeTableColgroupComponent)
+
 export default Colgroup

packages/column/index.ts

@@ -4,12 +4,14 @@ import { dynamicApp } from '../dynamics'
 
 export const Column = Object.assign(VxeTableColumnComponent, {
   install (app: App) {
-    dynamicApp.component(VxeTableColumnComponent.name, VxeTableColumnComponent)
     app.component(VxeTableColumnComponent.name, VxeTableColumnComponent)
     // 兼容旧用法
-    dynamicApp.component('VxeTableColumn', VxeTableColumnComponent)
     app.component('VxeTableColumn', VxeTableColumnComponent)
   }
 })
 
+dynamicApp.component(VxeTableColumnComponent.name, VxeTableColumnComponent)
+// 兼容旧用法
+dynamicApp.component('VxeTableColumn', VxeTableColumnComponent)
+
 export default Column

packages/export/index.ts

@@ -35,11 +35,12 @@ export const Export = {
       }
     })
     VXETable.hooks.add('$tableExport', exportHook)
-    dynamicApp.component(ExportPanelComponent.name, ExportPanelComponent)
-    dynamicApp.component(ImportPanelComponent.name, ImportPanelComponent)
     app.component(ExportPanelComponent.name, ExportPanelComponent)
     app.component(ImportPanelComponent.name, ImportPanelComponent)
   }
 }
 
+dynamicApp.component(ExportPanelComponent.name, ExportPanelComponent)
+dynamicApp.component(ImportPanelComponent.name, ImportPanelComponent)
+
 export default Export

packages/filter/index.ts

@@ -8,9 +8,10 @@ export const Filter = {
   Panel: PanelComponent,
   install (app: App) {
     VXETable.hooks.add('$tableFilter', filterHook)
-    dynamicApp.component(PanelComponent.name, PanelComponent)
     app.component(PanelComponent.name, PanelComponent)
   }
 }
 
+dynamicApp.component(PanelComponent.name, PanelComponent)
+
 export default Filter

packages/footer/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Footer = Object.assign(VxeTableFooterComponent, {
   install (app: App) {
-    dynamicApp.component(VxeTableFooterComponent.name, VxeTableFooterComponent)
     app.component(VxeTableFooterComponent.name, VxeTableFooterComponent)
   }
 })
 
+dynamicApp.component(VxeTableFooterComponent.name, VxeTableFooterComponent)
+
 export default Footer

packages/form-gather/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const FormGather = Object.assign(VxeFormGatherComponent, {
   install (app: App) {
-    dynamicApp.component(VxeFormGatherComponent.name, VxeFormGatherComponent)
     app.component(VxeFormGatherComponent.name, VxeFormGatherComponent)
   }
 })
 
+dynamicApp.component(VxeFormGatherComponent.name, VxeFormGatherComponent)
+
 export default FormGather

packages/form-item/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const FormItem = Object.assign(VxeFormItemComponent, {
   install (app: App) {
-    dynamicApp.component(VxeFormItemComponent.name, VxeFormItemComponent)
     app.component(VxeFormItemComponent.name, VxeFormItemComponent)
   }
 })
 
+dynamicApp.component(VxeFormItemComponent.name, VxeFormItemComponent)
+
 export default FormItem

packages/form/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Form = Object.assign(VxeFormComponent, {
   install (app: App) {
-    dynamicApp.component(VxeFormComponent.name, VxeFormComponent)
     app.component(VxeFormComponent.name, VxeFormComponent)
   }
 })
 
+dynamicApp.component(VxeFormComponent.name, VxeFormComponent)
+
 export default Form

packages/grid/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Grid = Object.assign(VxeGridComponent, {
   install (app: App) {
-    dynamicApp.component(VxeGridComponent.name, VxeGridComponent)
     app.component(VxeGridComponent.name, VxeGridComponent)
   }
 })
 
+dynamicApp.component(VxeGridComponent.name, VxeGridComponent)
+
 export default Grid

packages/header/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Header = Object.assign(VxeTableHeader, {
   install (app: App) {
-    dynamicApp.component(VxeTableHeader.name, VxeTableHeader)
     app.component(VxeTableHeader.name, VxeTableHeader)
   }
 })
 
+dynamicApp.component(VxeTableHeader.name, VxeTableHeader)
+
 export default Header

packages/input/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Input = Object.assign(VxeInputConstructor, {
   install (app: App) {
-    dynamicApp.component(VxeInputConstructor.name, VxeInputConstructor)
     app.component(VxeInputConstructor.name, VxeInputConstructor)
   }
 })
 
+dynamicApp.component(VxeInputConstructor.name, VxeInputConstructor)
+
 export default Input

packages/list/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const List = Object.assign(VxeListComponent, {
   install (app: App) {
-    dynamicApp.component(VxeListComponent.name, VxeListComponent)
     app.component(VxeListComponent.name, VxeListComponent)
   }
 })
 
+dynamicApp.component(VxeListComponent.name, VxeListComponent)
+
 export default List

packages/menu/index.ts

@@ -8,9 +8,10 @@ export const Menu = {
   Panel: PanelComponent,
   install (app: App) {
     VXETable.hooks.add('$tableMenu', menuHook)
-    dynamicApp.component(PanelComponent.name, PanelComponent)
     app.component(PanelComponent.name, PanelComponent)
   }
 }
 
+dynamicApp.component(PanelComponent.name, PanelComponent)
+
 export default Menu

packages/modal/index.ts

@@ -98,10 +98,11 @@ export const modal = ModalController
 
 export const Modal = Object.assign(VxeModalComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeModalComponent.name, VxeModalComponent)
     app.component(VxeModalComponent.name, VxeModalComponent)
     VXETable.modal = ModalController
   }
 })
 
+dynamicApp.component(VxeModalComponent.name, VxeModalComponent)
+
 export default Modal

packages/optgroup/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Optgroup = Object.assign(VxeOptgroupComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeOptgroupComponent.name, VxeOptgroupComponent)
     app.component(VxeOptgroupComponent.name, VxeOptgroupComponent)
   }
 })
 
+dynamicApp.component(VxeOptgroupComponent.name, VxeOptgroupComponent)
+
 export default Optgroup

packages/option/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Option = Object.assign(VxeOptionComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeOptionComponent.name, VxeOptionComponent)
     app.component(VxeOptionComponent.name, VxeOptionComponent)
   }
 })
 
+dynamicApp.component(VxeOptionComponent.name, VxeOptionComponent)
+
 export default Option

packages/pager/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Pager = Object.assign(VxePagerComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxePagerComponent.name, VxePagerComponent)
     app.component(VxePagerComponent.name, VxePagerComponent)
   }
 })
 
+dynamicApp.component(VxePagerComponent.name, VxePagerComponent)
+
 export default Pager

packages/pulldown/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Pulldown = Object.assign(VxePulldownComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxePulldownComponent.name, VxePulldownComponent)
     app.component(VxePulldownComponent.name, VxePulldownComponent)
   }
 })
 
+dynamicApp.component(VxePulldownComponent.name, VxePulldownComponent)
+
 export default Pulldown

packages/radio-button/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const RadioButton = Object.assign(VxeRadioButtonComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeRadioButtonComponent.name, VxeRadioButtonComponent)
     app.component(VxeRadioButtonComponent.name, VxeRadioButtonComponent)
   }
 })
 
+dynamicApp.component(VxeRadioButtonComponent.name, VxeRadioButtonComponent)
+
 export default RadioButton

packages/radio-group/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const RadioGroup = Object.assign(VxeRadioGroupComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeRadioGroupComponent.name, VxeRadioGroupComponent)
     app.component(VxeRadioGroupComponent.name, VxeRadioGroupComponent)
   }
 })
 
+dynamicApp.component(VxeRadioGroupComponent.name, VxeRadioGroupComponent)
+
 export default RadioGroup

packages/radio/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Radio = Object.assign(VxeRadioComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeRadioComponent.name, VxeRadioComponent)
     app.component(VxeRadioComponent.name, VxeRadioComponent)
   }
 })
 
+dynamicApp.component(VxeRadioComponent.name, VxeRadioComponent)
+
 export default Radio

packages/select/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Select = Object.assign(VxeSelectComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeSelectComponent.name, VxeSelectComponent)
     app.component(VxeSelectComponent.name, VxeSelectComponent)
   }
 })
 
+dynamicApp.component(VxeSelectComponent.name, VxeSelectComponent)
+
 export default Select

packages/switch/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Switch = Object.assign(VxeSwitchComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeSwitchComponent.name, VxeSwitchComponent)
     app.component(VxeSwitchComponent.name, VxeSwitchComponent)
   }
 })
 
+dynamicApp.component(VxeSwitchComponent.name, VxeSwitchComponent)
+
 export default Switch

packages/table/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Table = Object.assign(VxeTableComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeTableComponent.name, VxeTableComponent)
     app.component(VxeTableComponent.name, VxeTableComponent)
   }
 })
 
+dynamicApp.component(VxeTableComponent.name, VxeTableComponent)
+
 export default Table

packages/table/src/table.ts

@@ -5737,7 +5737,7 @@ export default defineComponent({
           if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
             warnLog('vxe.error.reqProp', ['keep-source'])
           }
-          if (treeConfig && treeOpts.line && (!props.rowKey || !rowOpts.useKey || !showOverflow)) {
+          if (treeConfig && treeOpts.line && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
             warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow'])
           }
           if (treeConfig && props.stripe) {

packages/textarea/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Textarea = Object.assign(VxeTextareaComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeTextareaComponent.name, VxeTextareaComponent)
     app.component(VxeTextareaComponent.name, VxeTextareaComponent)
   }
 })
 
+dynamicApp.component(VxeTextareaComponent.name, VxeTextareaComponent)
+
 export default Textarea

packages/toolbar/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Toolbar = Object.assign(VxeToolbarComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeToolbarComponent.name, VxeToolbarComponent)
     app.component(VxeToolbarComponent.name, VxeToolbarComponent)
   }
 })
 
+dynamicApp.component(VxeToolbarComponent.name, VxeToolbarComponent)
+
 export default Toolbar

packages/tooltip/index.ts

@@ -6,9 +6,10 @@ import { dynamicApp } from '../dynamics'
 export const Tooltip = Object.assign(VxeTooltipComponent, {
   install: function (app: App) {
     VXETable.tooltip = true
-    dynamicApp.component(VxeTooltipComponent.name, VxeTooltipComponent)
     app.component(VxeTooltipComponent.name, VxeTooltipComponent)
   }
 })
 
+dynamicApp.component(VxeTooltipComponent.name, VxeTooltipComponent)
+
 export default Tooltip