@skyfox2000/webui 1.3.8 → 1.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.3.8",
+   "version": "1.3.10",
    "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/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/select/index.vue

@@ -66,8 +66,7 @@ const defaultVal = ref(props.value);
 const placeholder = ref(attrs.placeholder);
 
 /// 避免类型错误
-/// 初始化禁止使用optionCtrl.selected值，避免组件值缓存
-const innerValue = ref<string | number | string[] | number[] | undefined>(undefined);
+const innerValue = ref<string | number | string[] | number[] | undefined>(optionCtrl?.selected.value || undefined);
 const emit = defineEmits(['change', 'update:value', 'update:label', 'update:labels']);
 inputFactory.inputEmit = emit;
 

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>

package/src/utils/page.ts

@@ -85,6 +85,17 @@ export const initPageFactory = (options: {
    };
 };
 
+const initUrls = (apiUrls: ApiUrls) => {
+   for (let urlKey in apiUrls.urls) {
+      if (!apiUrls.urls[urlKey]!.api) {
+         apiUrls.urls[urlKey]!.api = apiUrls.api;
+      }
+      if (!apiUrls.urls[urlKey]!.authorize) {
+         apiUrls.urls[urlKey]!.authorize = apiUrls.authorize;
+      }
+   }
+};
+
 /**
  * 编辑器工厂处理
  *
@@ -100,6 +111,7 @@ export const useEditorFactory = <T, E>(
    defaultData?: Partial<E>,
    formRules?: Record<string, ValidateRule>,
 ) => {
+   initUrls(urls);
    /**
     * 表单数据交互控制
     */
@@ -133,6 +145,7 @@ export const useEditorFactory = <T, E>(
  * @returns
  */
 export const useGridFactory = <T, G>(urls: ApiUrls, pageCtrl: PageControl<T>, columns?: Record<string, any>[]) => {
+   initUrls(urls);
    /**
     * 表格数据交互控制
     */
@@ -194,6 +207,7 @@ export const useGridFactory = <T, G>(urls: ApiUrls, pageCtrl: PageControl<T>, co
  * @returns
  */
 export const useTreeFactory = <T>(urls: ApiUrls, pageCtrl: PageControl<T>) => {
+   initUrls(urls);
    /**
     * 树数据交互控制
     */
@@ -306,15 +320,7 @@ export const usePageFactory = <T>(
    defaultData?: Partial<T>,
    formRules?: Record<string, ValidateRule>,
 ) => {
-   // urls 参数处理
-   // api 默认
-   // authorize 默认
-   for (const key in urls.urls) {
-      if (urls.urls[key]) {
-         if (!urls.urls[key].api) urls.urls[key].api = urls.api;
-         if (urls.urls[key].authorize === undefined) urls.urls[key].authorize = urls.authorize;
-      }
-   }
+   initUrls(urls);
 
    /**
     * 页面交互主数据