wui-components-v2 1.1.72 → 1.1.74

package/components/custom-date-picker/custom-date-picker.vue

@@ -8,13 +8,11 @@ defineOptions({
 const props = defineProps({
   modelValue: String,
   placeholder: String,
-  columns: {
-    type: Array as PropType<SelectOption[]>,
-    default: () => [],
-  },
   labelKey: { type: String, default: 'label' },
   valueKey: { type: String, default: 'value' },
   type: { type: String, default: 'date' },
+  min: String,
+  max: String,
 })
 
 const emit = defineEmits<{
@@ -40,7 +38,7 @@ watch(
 )
 
 watch(currentValue, val => {
-  const newVal = props.type === 'year' ? dayjs(val).format('YYYY') : val
+  const newVal = ['year', 'month'].includes(props.type) ? dayjs(val).format('YYYY-MM') : val
   emit('update:modelValue', newVal)
 })
 
@@ -61,6 +59,7 @@ const labelText = computed(() => {
     return currentValue.value || ''
   }
 })
+console.log('labelText', props)
 </script>
 
 <template>
@@ -71,13 +70,14 @@ const labelText = computed(() => {
   </div>
 
   <wd-calendar
-    v-if="['date', 'datetime'].includes(type)"
+    v-if="['date', 'datetime', 'month'].includes(type)"
     v-model="currentValue"
     v-model:visible="open"
     label-key="label"
     value-key="value"
     class="custom-date-picker"
     :type="type as any"
+    :min-date="props.min === '$$current' ? dayjs().startOf('day').valueOf() : undefined"
   />
   <wd-datetime-picker
     v-else

package/components/form-control/form-control.vue

@@ -291,7 +291,7 @@ defineExpose({
 })
 const clearValueMap = fields.value.reduce(
   (acc, field) => {
-    acc[field.id] = field.clearValueOnHidden ? '' : field.defaultValue ?? null
+    acc[field.id] = field.clearValueOnHidden ? '' : (field.defaultValue ?? null)
     return acc
   },
   {} as Record<string, any>
@@ -441,6 +441,7 @@ console.log('clearValueMap', clearValueMap)
             :title="item.title"
           >
             <customDatePicker
+              :min="item.min"
               v-model="model[item.sourceId]"
               type="datetime"
               :clearable="!item.disabled"
@@ -479,6 +480,22 @@ console.log('clearValueMap', clearValueMap)
               :placeholder="`请选择${item.title}`"
             />
           </wd-form-item>
+          <wd-form-item
+            v-else-if="
+              ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'date-M1'
+            "
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <customDatePicker
+              v-model="model[item.sourceId]"
+              type="month"
+              use-second
+              :clearable="!item.disabled"
+              :placeholder="`请选择${item.title}`"
+            />
+          </wd-form-item>
           <wd-form-item
             v-else-if="
               ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'file' ||

package/components/user-choose/user-choose.vue

@@ -51,7 +51,8 @@ const EVENT_NAME = `userChooseSelected_${generateHighResolutionID()}`
 const addUser = () => {
   const addEvent = generateHighResolutionID()
   // 当前已有数据时，跳转到编辑页面
-  if (currentValue.value) {
+  if (currentValue.value && typeof currentValue.value === 'string') {
+    console.log('currentValue.value', currentValue.value)
     // 和 fetchDataById 中的 requestId 逻辑保持一致
     const entityId = currentValue.value.split('@R@')[0]
     router.push(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.72",
+  "version": "1.1.74",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",