@skyfox2000/webui 1.3.7 → 1.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.3.7",
+   "version": "1.3.9",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/common/icon/helper.vue

@@ -19,18 +19,14 @@ const attrs = useAttrs(); // 手动获取 $attrs
    <Popover placement="topRight">
       <template #content>
          <slot>
-            <div class="text-[14px]" :style="{ maxWidth }">
+            <div class="text-[14px]" :class="[maxWidth]">
                {{ text }}
             </div>
          </slot>
       </template>
       <span class="ml-2">
-         <ToolIcon
-            icon="icon-question-circle"
-            class="text-[#888]"
-            :class="[size ? 'w-' + size + ' h-' + size : 'w-5 h-5']"
-            v-bind="attrs"
-         />
+         <ToolIcon icon="icon-question-circle" class="text-[#888]"
+            :class="[size ? 'w-' + size + ' h-' + size : 'w-5 h-5']" v-bind="attrs" />
       </span>
    </Popover>
 </template>

package/src/components/content/dialog/excelForm.vue

@@ -412,13 +412,10 @@ const dialogSave = async (uploadFile: UploadFile) => {
          });
 
          if (result?.status === ResStatus.SUCCESS) {
-            message.success('数据保存成功！');
             if (excelCtrl.afterSave) {
                excelCtrl.afterSave();
             }
             excelCtrl.visible.value = false;
-         } else {
-            message.error('保存失败：' + (result?.msg || '未知错误'));
          }
       } catch (error) {
          console.error('保存错误：', error);

package/src/components/content/form/formItem.vue

@@ -60,6 +60,7 @@ const getRule = (rule: Array<string>, ruleObj: Record<string, any> | undefined):
    if (rule.length === 1) {
       return ruleObj[key];
    }
+   if (!ruleObj[key]) return undefined;
    return getRule(rest, ruleObj[key].fields as Record<string, any>);
 };
 /**
@@ -92,18 +93,13 @@ const required = computed(() => {
 </script>
 <template>
    <div :class="['relative', bottomMargin ? bottomMargin : 'mb-1']">
-      <FormItem
-         v-if="visible"
-         :required="required"
-         class="relative"
-         :class="[nextLine ? 'mb-0' : rule ? '' : 'mb-3']"
-         v-bind="attrs"
-      >
+      <FormItem v-if="visible" :required="required" class="relative" :class="[nextLine ? 'mb-0' : rule ? '' : 'mb-3']"
+         v-bind="attrs">
          <template #label>
             <span :class="[errInfo.errClass ? 'text-[#ff4d4f]' : '', 'w-full']"> {{ label }}</span>
          </template>
-         <div class="flex items-center" :class="width ? width : 'w-full'" v-if="!nextLine">
-            <div class="flex-grow">
+         <div class="flex items-center" :class="width ? width : 'w-full'">
+            <div class="flex-grow" v-if="!nextLine">
                <slot></slot>
             </div>
             <div class="w-8 mt-[-2px]">
@@ -113,18 +109,12 @@ const required = computed(() => {
             </div>
          </div>
       </FormItem>
-      <div
-         v-if="nextLine"
-         class="w-[95%] flex items-center relative"
-         :class="[nextLine ? (rule ? 'mb-7' : 'mb-3') : '']"
-      >
+      <div v-if="nextLine" class="w-[95%] flex items-center relative"
+         :class="[nextLine ? (rule ? 'mb-7' : 'mb-3') : '']">
          <slot></slot>
       </div>
-      <span
-         :style="{ left: nextLine ? '2px' : labelWidth }"
-         class="absolute bottom-[3px] text-[12px] text-[#ff4d4fcc]"
-         v-if="errInfo.errClass"
-      >
+      <span :style="{ left: nextLine ? '2px' : labelWidth }" class="absolute bottom-[3px] text-[12px] text-[#ff4d4fcc]"
+         v-if="errInfo.errClass">
          {{ errInfo.msg }}
       </span>
    </div>

package/src/components/form/autoComplete/index.vue

@@ -58,7 +58,7 @@ optionCtrl.fieldMap = {
 };
 
 /// 避免类型错误
-const innerValue = ref<SelectValue | undefined>(optionCtrl?.selected.value || undefined);
+const innerValue = ref<SelectValue | undefined>(undefined);
 
 watch(
    () => props.value,
@@ -137,15 +137,8 @@ onUnmounted(() => {
 
 <template>
    <div>
-      <AutoComplete
-         v-model:value="innerValue"
-         :class="['w-full', errInfo?.errClass]"
-         :options="selectOptions"
-         @search="onSearch"
-         @select="onSelected"
-         v-bind="attrs"
-         :allow-clear="false"
-      >
+      <AutoComplete v-model:value="innerValue" :class="['w-full', errInfo?.errClass]" :options="selectOptions"
+         @search="onSearch" @select="onSelected" v-bind="attrs" :allow-clear="false">
          <Input allow-clear :placeholder="'请输入并选择' + labelText" />
          <template #option="{ label }">
             {{ label }}

package/src/components/form/select/index.vue

@@ -70,11 +70,42 @@ const innerValue = ref<string | number | string[] | number[] | undefined>(option
 const emit = defineEmits(['change', 'update:value', 'update:label', 'update:labels']);
 inputFactory.inputEmit = emit;
 
+const onChanged = (value: any) => {
+   const selectedOptions = onOptionChanged(optionCtrl, props, value as SelectValue);
+   const labels: string[] = getSelectedLabels(selectedOptions);
+
+   innerValue.value = value;
+   emit('update:labels', labels);
+   emit('update:label', labels.join(";"));
+   emit('change', value);
+
+   if (errInfo?.value.errClass && editorCtrl) {
+      /// 重新开始验证
+      formValidate(editorCtrl);
+   }
+};
 /**
  * 实际的选择项
  */
 const selectOptions = ref<OptionItemProps[]>(optionCtrl?.options.value || []);
 
+const updateInnerValue = (newVal: OptionItemProps[]) => {
+   if (newVal.length > 0 && isEmpty(props.value) && !!props.selectFirst) {
+      for (let i = 0; i < newVal.length; i++) {
+         const item = newVal[i];
+
+         if (item.disabled === undefined || item.disabled === false) {
+            innerValue.value = item.value;
+            break;
+         }
+      }
+   } else if (newVal.length > 0) {
+      // 当选项加载完成后，设置实际的 value 值
+      innerValue.value = props.value === null ? undefined : props.value;
+   }
+   if (newVal.length > 0 && innerValue.value !== undefined) onChanged(innerValue.value);
+};
+
 // 监听 optionCtrl.options 的变化，确保 selectOptions 能响应式更新
 if (optionCtrl) {
    watch(
@@ -86,31 +117,10 @@ if (optionCtrl) {
    );
 }
 
-const onChanged = (value: any) => {
-   const selectedOptions = onOptionChanged(optionCtrl, props, value as SelectValue);
-   const labels: string[] = getSelectedLabels(selectedOptions);
-
-   innerValue.value = value;
-   emit('update:labels', labels);
-   emit('update:label', labels.join(";"));
-   emit('change', value);
-
-   if (errInfo?.value.errClass && editorCtrl) {
-      /// 重新开始验证
-      formValidate(editorCtrl);
-   }
-};
-
 watch(
    () => selectOptions.value,
    (newVal) => {
-      if (newVal.length && isEmpty(props.value) && props.selectFirst) {
-         innerValue.value = newVal[0].value;
-      } else {
-         // 当选项加载完成后，设置实际的 value 值
-         innerValue.value = props.value === null ? undefined : props.value;
-      }
-      if (newVal.length > 0 && innerValue.value) onChanged(innerValue.value);
+      updateInnerValue(newVal);
    },
 );
 
@@ -136,6 +146,7 @@ watch(
    },
 );
 
+
 onMounted(() => {
    if (url.value && !url.value.fieldMap) {
       url.value.fieldMap = {
@@ -147,7 +158,19 @@ onMounted(() => {
    if (props.dataKey) {
       const options = JSON.parse(JSON.stringify(OPTIONS.getOptions(props.dataKey)));
       selectOptions.value = options;
-   } else if (optionCtrl) loadOption(optionCtrl.autoload, optionCtrl, props);
+      updateInnerValue(options);
+   } else if (optionCtrl) {
+      // 检查是否已经有预加载的选项
+      const preloadedOptions = optionCtrl.options.value || [];
+      if (preloadedOptions.length > 0) {
+         // 选项已经加载完成，直接更新selectOptions并执行updateInnerValue
+         selectOptions.value = preloadedOptions;
+         updateInnerValue(preloadedOptions);
+      } else {
+         // 选项尚未加载，执行加载操作
+         loadOption(optionCtrl.autoload, optionCtrl, props);
+      }
+   }
 });
 
 onUnmounted(() => {

package/src/components/form/treeSelect/index.vue

@@ -30,7 +30,7 @@ const props = defineProps({
 });
 
 // 如果初始value为undefined，自动设置undefValue为true
-const undefValue = props.value === undefined ? true : props.undefValue;
+const undefVal = props.value === undefined ? true : props.undefValue;
 
 const treeCtrl = props.treeCtrl;
 
@@ -54,6 +54,12 @@ watch(
    },
    { immediate: true },
 );
+watch(
+   () => currentValue.value,
+   (newVal) => {
+      emit('update:value', newVal);
+   },
+);
 
 // 监听树数据变化
 watch(
@@ -71,10 +77,14 @@ const handleChange = (value: SelectValue) => {
    if (props.multiple) {
       currentValue.value = value ?? [];
    } else {
-      currentValue.value = value ?? undefValue ? undefined : null;
+      // 修复原始代码中的逻辑错误
+      if (value === undefined || value === null) {
+         currentValue.value = undefVal ? undefined : null;
+      } else {
+         currentValue.value = value;
+      }
    }
    emit('change', currentValue.value);
-   emit('update:value', currentValue.value);
 };
 
 // 组件挂载时加载数据
@@ -94,8 +104,9 @@ onMounted(() => {
       queryTree(props.treeCtrl);
    }
 });
+
 const onClear = () => {
-   currentValue.value = undefValue ? undefined : null;
+   currentValue.value = undefVal ? undefined : null;
 };
 </script>
 
@@ -109,4 +120,4 @@ const onClear = () => {
    border-color: #ef444480;
    box-shadow: 0 0 3px 0 #ff4d4f;
 }
-</style>
+</style>