@xuekl/cli-components 1.3.6 → 1.3.9

package/XklDatePicker.vue

@@ -13,8 +13,6 @@ import { ref } from 'vue';
 const props = defineProps(['type'])
 const { type } = props
 
-console.log('type', type);
-
 
 const startPlaceholder = ref('')
 const endPlaceholder = ref('')
@@ -22,11 +20,19 @@ const valueFormat = ref('YYYY-MM-DD')
 if (type === 'daterange') {
     startPlaceholder.value = '开始日期'
     endPlaceholder.value = '结束日期'
-    valueFormat.value = 'YYYY-MM-DD'
 } else if (type === 'datetimerange') {
     startPlaceholder.value = '开始时间'
     endPlaceholder.value = '结束时间'
+}
+
+if (['date', 'dates', 'daterange'].includes(type)) {
+    valueFormat.value = 'YYYY-MM-DD'
+} else if (['datetime', 'datetimerange'].includes(type)) {
     valueFormat.value = 'YYYY-MM-DD HH:mm:ss'
+} else if (['month', 'monthrange'].includes(type)) {
+    valueFormat.value = 'YYYY-MM'
+} else {
+    valueFormat.value = ''
 }
 
 </script>

package/XklForm.vue

@@ -71,7 +71,7 @@ export default {
 <script setup lang="ts">
 import { setUpperFirst } from '@xuekl/cli-utils'
 import { FormItem } from '@xuekl/cli-base/type.d'
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch, onMounted, Ref } from 'vue'
 import XklSelect from './XklSelect.vue'
 import XklTreeSelect from './XklTreeSelect.vue'
 import XklDict from './XklDict.vue'
@@ -82,7 +82,7 @@ const props = defineProps(['form'])
 const XklFormRef = ref(null)
 const { form } = props
 const sourceFormList: FormItem[] = []
-const formList: FormItem[] = ref([])
+const formList: Ref<FormItem[]> = ref([])
 const opts = form._opts || {}
 const isCollapse = ref(true)
 if (typeof opts.defaultCollapse !== 'undefined') {

package/XklFormInfo.vue

@@ -43,7 +43,8 @@ Object.keys(form).forEach(prop => {
             labelWidth: field.labelWidth || opts.labelWidth,
             show: field.show,
             key: field.key,
-            reflect: field.reflect
+            reflect: field.reflect,
+            config: field.config || {}
         }
         if (opts.mode) {
             if (field.mode && field.mode.includes(opts.mode)) {

package/XklUpload.vue

@@ -1,6 +1,6 @@
 <template>
-    <el-upload v-model:file-list="fileList" class="upload-demo" :headers="headers" :action="actionUrl"
-        :on-change="handleChange" :before-upload="beforeUpload">
+    <el-upload v-model:file-list="fileList" class="xkl-upload" :headers="headers" :data="config.params()"
+        :action="actionUrl" :on-change="handleChange" :before-upload="beforeUpload">
         <el-button type="primary">点击上传</el-button>
         <template #tip>
             <div v-if="config.maxSize" class="el-upload__tip">
@@ -23,8 +23,10 @@ const props = defineProps(['config', 'modelValue'])
 const emit = defineEmits(['update:modelValue'])
 const { config, modelValue } = props
 
+config.params = config.params || (() => { })
+
 const headers = {
-    Authorization: getToken()
+    [config.authorization || 'Authorization']: getToken()
 }
 const actionUrl = http.adornUrl(config.url || '/common/upload')
 
@@ -43,15 +45,20 @@ const handleChange = (_file, _files) => {
     const upFiles = fileList.value.map((res: any) => {
         const j = {
             name: res.name,
-            url: res.url
+            url: res.url,
+            fileName: res.name,
+            filePath: res.url
         }
         if (res.response) {
-            j.name = res.response.originalFilename
-            j.url = res.response.url
+            j.name = res.response.data.fileName
+            j.url = res.response.data.filePath
+            j.fileName = res.response.data.fileName
+            j.filePath = res.response.data.filePath
         }
 
         return j
     })
+
     emit('update:modelValue', upFiles)
 }
 
@@ -59,4 +66,9 @@ const handleChange = (_file, _files) => {
 onMounted(() => {
     fileList.value = modelValue
 })
-</script>
+</script>
+<style lang="scss">
+.xkl-upload {
+    width: 100%;
+}
+</style>

package/package.json

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