@xuekl/cli-components 1.5.9 → 1.6.1

package/XklButton.vue

@@ -37,7 +37,9 @@ const btnClick = () => {
     }
 
     if (attrs.onConfirm) {
-        if (props.prevent) {
+        if (props.prevent === false) {
+            attrs.onConfirm()
+        } else {
             ElMessageBox.confirm(
                 '当前内容可能存在修改，确认继续?',
                 '提示',
@@ -50,8 +52,6 @@ const btnClick = () => {
                 attrs.onConfirm()
             }).catch(() => {
             })
-        } else {
-            attrs.onConfirm()
         }
     }
 }

package/XklFormInfo.vue

@@ -4,7 +4,8 @@
             <template v-for="item in formList" :key="item.prop">
                 <el-col :span="item.span" v-if="item.show()">
                     <el-form-item :label="item.label + '：'" :label-width="item.labelWidth">
-                        <span v-if="item.type">{{ form[item.reflect] || form[item.prop] }}</span>
+                        <span v-if="item.type === 'dict-select'">{{ dictLabel(item.config.dict, form[item.prop]) }}</span>
+                        <span v-else-if="item.type">{{ form[item.reflect] || form[item.prop] }}</span>
                         <slot v-else :name="item.prop"></slot>
                     </el-form-item>
                 </el-col>
@@ -19,9 +20,11 @@ export default {
 }
 </script>
 <script setup lang="ts">
+import http from "@/utils/httpRequest"
+import { baseConf } from './index'
 import { setUpperFirst } from '@xuekl/cli-utils'
 import { FormItem } from '@xuekl/cli-base/type.d'
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 
 const props = defineProps(['form'])
 const XklFormRef = ref(null)
@@ -29,6 +32,7 @@ const { form } = props
 const formList: FormItem[] = []
 const opts = form._opts || {}
 
+
 // 获取符合mode的字段
 Object.keys(form).forEach(prop => {
     if (form['get' + setUpperFirst(prop)]) {
@@ -56,6 +60,29 @@ Object.keys(form).forEach(prop => {
     }
 })
 
+const dictTypes = formList.map(item => item.config?.dict).filter(res => !!res)
+const dictStore = ref({})
+
+dictTypes.forEach((dict: string) => {
+    http({
+        url: http.adornUrl(`${baseConf.dict_api_url}${dict}`),
+        method: 'get',
+        params: http.adornParams({})
+    }).then(({ data }) => {
+        dictStore.value[dict] = data.data
+    })
+})
+
+const dictLabel = computed(() => {
+    return function (dict: string, val: string | number) {
+        if (dictStore.value[dict]) {
+            const item = dictStore.value[dict].find(res => res.dictValue == val) || {}
+            return item.dictLabel
+        }
+        return ''
+    }
+})
+
 
 </script>
 <style lang="scss" scoped>

package/package.json

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