@airpower/web 1.5.7 → 1.5.8

package/dist/main.js

@@ -14036,9 +14036,11 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
       emits("clear");
     }
     const isClearButtonShow = ref(props.showClear);
+    const placeholderRef = ref(props.placeholder);
     const formConfig = ref(void 0);
     const fieldConfig = ref(void 0);
     const fieldName = ref("");
+    const dictionary = ref(void 0);
     function onPropsValueUpdated(newProps) {
       if (newProps) {
         if (newProps.disabled) {
@@ -14067,9 +14069,6 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
       }
       return DateTimeFormatter.FULL_DATE_TIME;
     });
-    const dictionary = computed(() => {
-      return props.list ? props.list : formConfig.value && fieldConfig.value?.dictionary ? fieldConfig.value.dictionary.toArray() : void 0;
-    });
     function getSwitchColor(status) {
       return dictionary.value?.find((item) => !!item.key === status)?.color || "";
     }
@@ -14161,34 +14160,37 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
         }
       }
     }
+    watch([props.list, props.tree], () => {
+      init();
+    }, {
+      deep: true,
+      immediate: true
+    });
     function init() {
       initFieldName();
       if (props.entity && fieldName.value) {
         formConfig.value = getFormConfig(props.entity, fieldName.value);
         fieldConfig.value = getFieldConfig(props.entity, fieldName.value);
+        if (!placeholderRef.value) {
+          const field = fieldConfig.value.label || getFieldConfig(props.entity, fieldName.value).label || fieldName;
+          placeholderRef.value = `请输入${field}...`;
+          if (formConfig.value) {
+            if (dictionary.value || fieldConfig.value.dictionary || props.list || props.tree || formConfig.value.dateType !== void 0) {
+              placeholderRef.value = WebI18n.get().SelectPlease;
+            }
+            if (formConfig.value.placeholder) {
+              placeholderRef.value = formConfig.value.placeholder;
+            }
+          }
+        }
       }
+      dictionary.value = props.list ? props.list : formConfig.value && fieldConfig.value?.dictionary ? fieldConfig.value.dictionary.toArray() : void 0;
       if (props.modelValue === void 0 && formConfig.value?.defaultValue !== void 0) {
         value.value = formConfig.value.defaultValue;
         emitValue();
       }
       onPropsValueUpdated(props);
     }
-    const placeholderRef = computed(() => {
-      if (formConfig.value && formConfig.value.placeholder) {
-        return formConfig.value.placeholder;
-      }
-      if (props.placeholder) {
-        return props.placeholder;
-      }
-      if (fieldConfig.value && props.entity) {
-        const field = fieldConfig.value.label || getFieldConfig(props.entity, fieldName.value).label;
-        if (dictionary.value || fieldConfig.value?.dictionary || props.list || props.tree || formConfig.value?.dateType !== void 0) {
-          return `${WebI18n.get().SelectPlease + field}...`;
-        }
-        return `${WebI18n.get().InputPlease + field}...`;
-      }
-      return "请输入...";
-    });
     const slots = useSlots();
     init();
     return (_ctx, _cache) => {
@@ -14239,7 +14241,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
             onFocus: emitFocus,
             onKeydown: onKeyDown
           }, null, 8, ["modelValue", "clearable", "disabled", "format", "placeholder", "prefix-icon", "readonly", "suffix-icon", "value-format"]))
-        ], 64)) : dictionary.value ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+        ], 64)) : __props.list || dictionary.value ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
           formConfig.value?.switch ? (openBlock(), createBlock(_component_el_switch, {
             key: 0,
             modelValue: value.value,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",