@xuekl/cli-components 1.0.6 → 1.0.8

package/XklForm.vue

@@ -19,7 +19,7 @@
                         <XklDict v-else-if="item.type === 'dict-select'" v-model="form[item.prop]"
                             v-model:label="form[item.prop + 'Label']" :config="item.config" v-bind="item.element"
                             v-on="item.events" :disabled="item.disabled()"></XklDict>
-                        <XklSelect v-else-if="item.type === 'url-select'" v-model="form[item.prop]"
+                        <XklSelect v-else-if="item.type === 'url-select'" v-model="form[item.prop]" :key="item.key()"
                             v-model:label="form[item.prop + 'Label']" :config="item.config" v-bind="item.element"
                             v-on="item.events" :disabled="item.disabled()">
                         </XklSelect>
@@ -83,6 +83,7 @@ Object.keys(form).forEach(prop => {
         field.rules = field.rules || []
         field.refRules = ref(field.rules)
         field.show = field.show || (() => true)
+        field.key = field.key || (() => prop)
         field.disabled = field.disabled || (() => false)
         if (!['query', 'search'].includes(opts.mode)) {
             if (field.required) {
@@ -119,6 +120,7 @@ Object.keys(form).forEach(prop => {
             span: field.span || opts.span,
             labelWidth: field.labelWidth || opts.labelWidth,
             show: field.show,
+            key: field.key,
             disabled: field.disabled,
             required: field.required,
             refRules: field.refRules,

package/XklSelect.vue

@@ -26,9 +26,23 @@ const changeHandle = (val: string) => {
 }
 
 const handleData = (data) => {
+    const split = config?.split
+    const labelTarget = config?.labelTarget
+    let labels = []
+    if (split) {
+        if (labelTarget) {
+            labels = labelTarget.split(split)
+        }
+    }
+
     data.forEach(inner => {
         inner.value = inner[config?.valueTarget || 'value']
-        inner.label = inner[config?.labelTarget || 'label']
+        if (!split) {
+            inner.label = inner[labelTarget || 'label']
+        } else {
+            inner.label = labels.map(label => inner[label]).join(split)
+        }
+
     })
     return data
 }
@@ -47,10 +61,16 @@ onBeforeMount(() => {
         dataList.value = handleData(list)
     } else {
         if (!config) { return }
+        let doParams
+        if (typeof config.params === 'function') {
+            doParams = config.params
+        } else {
+            doParams = () => config.params
+        }
         http({
             url: http.adornUrl(config.url),
             method: 'get',
-            params: http.adornParams(config.params)
+            params: http.adornParams(doParams())
         }).then(({ data }) => {
             dataList.value = handleData(data.data)
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuekl/cli-components",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "",
   "main": "index.ts",
   "scripts": {