n20-common-lib 3.2.1 → 3.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ProFilterView/advancedQuery.vue

@@ -185,12 +185,13 @@
 </template>
 
 <script>
+import axios from '../../utils/axios.js'
 import ClDatePicker from '../DatePicker/index.vue'
 import ClDatePickerPor from '../DatePicker/por.vue'
 import ClInputNumber from '../InputNumber/index.vue'
 import ClInputNumberRange from '../InputNumber/numberRange.vue'
 import ClInputSearch from '../InputSearch/index.vue'
-import axios from '../../utils/axios.js'
+
 export default {
   name: 'AdvancedQuery',
   components: {
@@ -554,6 +555,15 @@ export default {
     updatefield(field, row) {
       this.$set(row, 'advancedQueryType', field.advancedQueryType)
       if (field.advancedQueryType === 4) {
+        field.options = field.options.map((item) => {
+          if (field.props?.labelKey) {
+            item.label = item[field.props.labelKey]
+          }
+          if (field.props?.valueKey) {
+            item.value = item[field.props.valueKey]
+          }
+          return item
+        })
         this.$set(row, 'options', field.options)
       }
       // slot 类型特殊处理