lw-cdp-ui 1.1.48 → 1.1.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/lwFormMini/index.vue +2 -0
- package/dist/components/lwTableSelect/index.vue +7 -3
- package/dist/lw-cdp-ui.esm.js +1595 -1592
- package/dist/lw-cdp-ui.umd.js +13 -13
- package/dist/style.css +1 -1
- package/package.json +1 -1
|
@@ -130,6 +130,8 @@
|
|
|
130
130
|
<template v-else-if="item.component == 'cascader'">
|
|
131
131
|
<el-cascader v-model="form[item.name]"
|
|
132
132
|
style="width: 100%;"
|
|
133
|
+
:props="item.options?.props"
|
|
134
|
+
:separator="item.options?.separator"
|
|
133
135
|
:options="item.options.items"
|
|
134
136
|
clearable></el-cascader>
|
|
135
137
|
</template>
|
|
@@ -129,10 +129,14 @@ export default {
|
|
|
129
129
|
[this.defaultProps.keyword]: this.keyword
|
|
130
130
|
}
|
|
131
131
|
let expression = this.$expression(this.formData)
|
|
132
|
-
if (expression) {
|
|
133
|
-
this.formData.expression =
|
|
132
|
+
if (expression && this.params?.expression) {
|
|
133
|
+
this.formData.expression = `${this.params.expression} AND ${expression}`
|
|
134
|
+
} else if (expression) {
|
|
135
|
+
this.formData.expression = expression
|
|
136
|
+
} else if (this.params?.expression) {
|
|
137
|
+
this.formData.expression = this.params?.expression
|
|
134
138
|
} else {
|
|
135
|
-
this.formData.expression =
|
|
139
|
+
this.formData.expression = ''
|
|
136
140
|
}
|
|
137
141
|
Object.assign(reqData, this.params, this.formData)
|
|
138
142
|
|