diff --git a/docs/components/TQueryCondition/base.md b/docs/components/TQueryCondition/base.md
index aee703e1..3185b83a 100644
--- a/docs/components/TQueryCondition/base.md
+++ b/docs/components/TQueryCondition/base.md
@@ -53,7 +53,7 @@ TQueryCondition/querybar
### 自定义按钮
-::: demo 设置`footer`插槽,可以自定义按钮
+::: demo 设置`footerBtn`插槽,可以自定义按钮,设置`:footer=null`,不展示按钮
TQueryCondition/footer
:::
@@ -90,24 +90,24 @@ TQueryCondition/dynamic
### 2、配置参数(Attributes)
-| 参数 | 说明 | 类型 | 默认值 |
-| :----------------- | :---------------------------------------- | :---------- | :--------------------------------------------- |
-| opts | 接收筛选器组件配置 | object | 无 |
-| loading | 查询按钮 loading 状态,请求数据时需要体现 | Boolean | false |
-| reset | 是否显示“重置”按钮 | Boolean | true |
-| maxVisibleRows | 收起时设置默认展示行数 | Number | 1 |
-| boolEnter | 是否敲回车查询 | Boolean | true |
-| isShowOpen | 是否显示收起和展开 | Boolean | true |
-| packUpTxt | 收起文案 | String | '收起' |
-| unfoldTxt | 展开文案 | String | '展开' |
-| isExpansion | 是否默认展开 | Boolean | false |
-| labelWidth | labelWidth 宽度 | String | '120px' |
-| btnCheckBind | 查询按钮配置(继承`el-button`所有属性) | object | `{type: primary, size: default,btnTxt:'查询'}` |
-| btnResetBind | 重置按钮配置(继承`el-button`所有属性) | object | `{ size: default,btnTxt:'重置'}` |
-| footer | 自定义按钮(设置:footer="null"不显示按钮) | object/slot | - |
-| configChangedReset | 更新opts是否重置(默认重置) | Boolean | false |
-| isShowWidthSize | 是否开启动态设置每行显示数 | Boolean | false |
-| widthSize | 每行显示多少项,最小值2 | Number | 4 |
+| 参数 | 说明 | 类型 | 默认值 |
+| :----------------- | :---------------------------------------- | :------ | :--------------------------------------------- |
+| opts | 接收筛选器组件配置 | object | 无 |
+| loading | 查询按钮 loading 状态,请求数据时需要体现 | Boolean | false |
+| reset | 是否显示“重置”按钮 | Boolean | true |
+| maxVisibleRows | 收起时设置默认展示行数 | Number | 1 |
+| boolEnter | 是否敲回车查询 | Boolean | true |
+| isShowOpen | 是否显示“收起和展开” | Boolean | true |
+| packUpTxt | 收起文案 | String | '收起' |
+| unfoldTxt | 展开文案 | String | '展开' |
+| isExpansion | 是否默认展开 | Boolean | false |
+| labelWidth | labelWidth 宽度 | String | '120px' |
+| btnCheckBind | 查询按钮配置(继承`el-button`所有属性) | object | `{type: primary, size: default,btnTxt:'查询'}` |
+| btnResetBind | 重置按钮配置(继承`el-button`所有属性) | object | `{ size: default,btnTxt:'重置'}` |
+| footer | 自定义按钮(设置:footer="null"不显示按钮) | object | - |
+| configChangedReset | 更新opts是否重置(默认重置) | Boolean | false |
+| isShowWidthSize | 是否开启动态设置每行显示数 | Boolean | false |
+| widthSize | 每行显示多少项,最小值2 | Number | 4 |
@@ -123,8 +123,8 @@ TQueryCondition/dynamic
| slotName | 自定义输入框插槽(作用域插槽解构接收{param/scope}返回当前所有表单初始值) | string | - |
| comp | 组件名称,可直接指定全局注册的组件,也可引入'elmentUI'如:Button 或者'el-button' | string,component | - |
| span | 控件占用的列宽,默认占用 1 列,最多 4 列 (独占一行) | number | 1 |
-| arrLabel | type=select-arr 时,每个下拉显示的中文 | String | dictLabel |
-| arrKey | type=select-arr 时,每个下拉显示的中文传后台的数字 | String | dictValue |
+| arrLabel | type=select-arr 时,每个下拉显示的中文 | String | label |
+| arrKey | type=select-arr 时,每个下拉显示的中文传后台的数字 | String | key |
| defaultVal | 默认值 | - | - |
| bind | 渲染时组件会调用 v-bind 指定设置该配置更新元素的属性(继承第三方组件属性) | object,function | 无 |
| eventHandle | 配置组件事件,与写组件时change 等同理 | object | 本身值,当前formData数据 |
@@ -139,10 +139,10 @@ TQueryCondition/dynamic
#### 5、Slots
-| 插槽名 | 说明 |
-| :------- | :------------------------------- |
-| querybar | 按钮操作插槽(位置基于重置后面) |
-| footer | 按钮操作插槽 |
+| 插槽名 | 说明 |
+| :-------- | :------------------------------- |
+| querybar | 按钮操作插槽(位置基于重置后面) |
+| footerBtn | 按钮操作插槽 |
#### 6、Exposes(Method)
diff --git a/docs/examples/TQueryCondition/base.vue b/docs/examples/TQueryCondition/base.vue
index 4b78de03..fefdf655 100644
--- a/docs/examples/TQueryCondition/base.vue
+++ b/docs/examples/TQueryCondition/base.vue
@@ -6,7 +6,8 @@
@submit="conditionEnter"
@handleEvent="handleEvent"
isExpansion
- :btnResetBind="{ size: 'small', btnTxt: '搜索', icon: 'Search' }"
+ labelWidth="160px"
+ :btnResetBind="{ size: 'small', btnTxt: '重置', icon: 'Search' }"
>
diff --git a/docs/examples/TQueryCondition/dynamic.vue b/docs/examples/TQueryCondition/dynamic.vue
index 14f109c1..897766a7 100644
--- a/docs/examples/TQueryCondition/dynamic.vue
+++ b/docs/examples/TQueryCondition/dynamic.vue
@@ -32,12 +32,12 @@ let state = reactive({
listTypeInfo: {
sexList: [
{
- dictLabel: '前纺一车间',
- dictValue: 'W1',
+ label: '前纺一车间',
+ key: 'W1',
},
{
- dictLabel: '前纺二车间',
- dictValue: 'W2',
+ label: '前纺二车间',
+ key: 'W2',
},
],
},
@@ -63,8 +63,8 @@ let state = reactive({
placeholder: '选择第一条数据才新增',
isSelfCom: true,
bind: {
- valueCustom: 'dictValue',
- labelCustom: 'dictLabel',
+ valueCustom: 'key',
+ labelCustom: 'label',
optionSource: [],
},
eventHandle: {
@@ -164,16 +164,16 @@ onMounted(() => {
const getList = () => {
listTypeInfo.value.sexList = [
{
- dictLabel: '前纺一车间',
- dictValue: 'W1',
+ label: '前纺一车间',
+ key: 'W1',
},
{
- dictLabel: '前纺二车间',
- dictValue: 'W2',
+ label: '前纺二车间',
+ key: 'W2',
},
{
- dictLabel: '前纺三车间',
- dictValue: 'W3',
+ label: '前纺三车间',
+ key: 'W3',
},
]
state.opt.workshopNum2.bind.optionSource = listTypeInfo.value.sexList
diff --git a/docs/examples/TQueryCondition/footer.vue b/docs/examples/TQueryCondition/footer.vue
index c6b5cc2d..0f28c4b2 100644
--- a/docs/examples/TQueryCondition/footer.vue
+++ b/docs/examples/TQueryCondition/footer.vue
@@ -1,13 +1,8 @@
-
-
+
+
重置
查询
@@ -17,88 +12,86 @@
diff --git a/docs/examples/TQueryCondition/isExpansion.vue b/docs/examples/TQueryCondition/isExpansion.vue
index 652d13e9..923b29ae 100644
--- a/docs/examples/TQueryCondition/isExpansion.vue
+++ b/docs/examples/TQueryCondition/isExpansion.vue
@@ -1,99 +1,92 @@
-
+
diff --git a/docs/examples/TQueryCondition/labelRender.vue b/docs/examples/TQueryCondition/labelRender.vue
index c9774a41..1e377261 100644
--- a/docs/examples/TQueryCondition/labelRender.vue
+++ b/docs/examples/TQueryCondition/labelRender.vue
@@ -7,90 +7,88 @@
diff --git a/docs/examples/TQueryCondition/maxVisibleSpans.vue b/docs/examples/TQueryCondition/maxVisibleSpans.vue
index 9e2a78d0..88a02897 100644
--- a/docs/examples/TQueryCondition/maxVisibleSpans.vue
+++ b/docs/examples/TQueryCondition/maxVisibleSpans.vue
@@ -26,12 +26,12 @@ let state = reactive({
listTypeInfo: {
sexList: [
{
- dictLabel: '前纺一车间',
- dictValue: 'W1',
+ label: '前纺一车间',
+ key: 'W1',
},
{
- dictLabel: '前纺二车间',
- dictValue: 'W2',
+ label: '前纺二车间',
+ key: 'W2',
},
],
},
diff --git a/docs/examples/TQueryCondition/querybar.vue b/docs/examples/TQueryCondition/querybar.vue
index 936789ab..b4c9d583 100644
--- a/docs/examples/TQueryCondition/querybar.vue
+++ b/docs/examples/TQueryCondition/querybar.vue
@@ -11,88 +11,86 @@
diff --git a/docs/examples/TQueryCondition/slotName.vue b/docs/examples/TQueryCondition/slotName.vue
index 201d4f22..c4fef160 100644
--- a/docs/examples/TQueryCondition/slotName.vue
+++ b/docs/examples/TQueryCondition/slotName.vue
@@ -1,27 +1,12 @@
-
+
-
+
-
+
@@ -29,7 +14,7 @@
diff --git a/docs/examples/TSelectTable/isShowQuery.vue b/docs/examples/TSelectTable/isShowQuery.vue
index 2988343a..a337f4a8 100644
--- a/docs/examples/TSelectTable/isShowQuery.vue
+++ b/docs/examples/TSelectTable/isShowQuery.vue
@@ -17,37 +17,37 @@
diff --git a/docs/examples/TSelectTable/isShowQueryBtnBind.vue b/docs/examples/TSelectTable/isShowQueryBtnBind.vue
index c141153e..9733a102 100644
--- a/docs/examples/TSelectTable/isShowQueryBtnBind.vue
+++ b/docs/examples/TSelectTable/isShowQueryBtnBind.vue
@@ -11,7 +11,7 @@
isShowQuery
multiple
isShowBlurBtn
- :btnBind="{color:'#626aef',icon:'Edit'}"
+ :btnBind="{ color: '#626aef', icon: 'Edit' }"
:opts="opts"
@submit="conditionEnter"
/>
@@ -19,37 +19,37 @@
diff --git a/docs/examples/TSelectTable/isShowQueryMultiple.vue b/docs/examples/TSelectTable/isShowQueryMultiple.vue
index 8ce955a0..957b5814 100644
--- a/docs/examples/TSelectTable/isShowQueryMultiple.vue
+++ b/docs/examples/TSelectTable/isShowQueryMultiple.vue
@@ -18,37 +18,37 @@
diff --git a/docs/examples/TSelectTable/isShowQuerySpan.vue b/docs/examples/TSelectTable/isShowQuerySpan.vue
index 9a8246a9..fba54c5c 100644
--- a/docs/examples/TSelectTable/isShowQuerySpan.vue
+++ b/docs/examples/TSelectTable/isShowQuerySpan.vue
@@ -18,37 +18,37 @@
diff --git a/packages/query-condition/src/index.vue b/packages/query-condition/src/index.vue
index 721492d8..c27c443c 100644
--- a/packages/query-condition/src/index.vue
+++ b/packages/query-condition/src/index.vue
@@ -114,8 +114,8 @@
]"
>
-
-
+
+
{
return value.value
case 'el-select-multiple':
case 'select-arr':
- return value[opt.arrLabel || 'dictLabel']
+ return value[opt.arrLabel || 'label']
case 'select-obj':
return value
}
@@ -474,7 +474,7 @@ const compChildValue = computed(() => {
return value.value
case 'el-select-multiple':
case 'select-arr':
- return value[opt.arrKey || 'dictValue']
+ return value[opt.arrKey || 'key']
case 'select-obj':
return key
}
@@ -489,7 +489,7 @@ const compChildShowLabel = computed(() => {
return value.label
case 'el-select-multiple':
case 'select-arr':
- return value[opt.arrLabel || 'dictLabel']
+ return value[opt.arrLabel || 'label']
case 'select-obj':
return value
}