el-plus-crud 0.1.37 → 0.1.38

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.38](https://github.com/KDJack/el-plus-crud/compare/v0.1.37...v0.1.38) (2024-04-26)
+
 ### [0.1.37](https://github.com/KDJack/el-plus-crud/compare/v0.1.36...v0.1.37) (2024-04-26)
 
 ### [0.1.36](https://github.com/KDJack/el-plus-crud/compare/v0.1.35...v0.1.36) (2024-04-26)

package/dist/el-plus-crud.mjs

@@ -5987,16 +5987,18 @@ const pi = /* @__PURE__ */ lt(Kz, [["__scopeId", "data-v-45863775"]]), Hz = /* @
       d.value !== Y && (d.value = Y, M.splice(0, M.length, ...await c.desc.remote(Y)), Y === "" && (T.value || L()));
     }
     function L() {
-      if (c.desc.defaultKey) {
+      if (d.value === null && c.desc.defaultKey) {
         let Y = c.formData[c.desc.defaultKey.value];
         Array.isArray(Y) || (Y = [Y]);
         let E = c.formData[c.desc.defaultKey.label];
         if (Array.isArray(E) || (E = [E]), Y.length <= 0 || Y.length !== E.length)
           return;
         Y.map((U, ee) => {
-          const Z = M.findIndex((ge) => ge.value === U);
-          Z >= 0 && M.splice(Z, 1), M.unshift({ value: U, label: E[ee], dataItem: Lt.cloneDeep(c.formData) });
-        }), console.log("options: ", M);
+          if (U) {
+            const Z = M.findIndex((ge) => ge.value === U);
+            Z >= 0 && M.splice(Z, 1), M.unshift({ value: U, label: E[ee], dataItem: Lt.cloneDeep(c.formData) });
+          }
+        });
       }
     }
     function V() {
@@ -6004,7 +6006,7 @@ const pi = /* @__PURE__ */ lt(Kz, [["__scopeId", "data-v-45863775"]]), Hz = /* @
       T.value = !0, (E = (Y = c.desc) == null ? void 0 : Y.on) != null && E.clear && typeof ((ee = (U = c.desc) == null ? void 0 : U.on) == null ? void 0 : ee.clear) == "function" && c.desc.on.clear(), d.value = null, c.desc.remote && M.splice(0, M.length);
     }
     return Qe(async () => {
-      _.remote = !!c.desc.remote, p.value = await Fe(c, _), p.value.remote = !!c.desc.remote, delete p.value.disabled, L(), v.value = !0;
+      _.remote = !!c.desc.remote, p.value = await Fe(c, _), p.value.remote = !!c.desc.remote, delete p.value.disabled, v.value = !0;
     }), Pe(
       () => c.desc.options,
       async (Y) => {
@@ -6027,9 +6029,9 @@ const pi = /* @__PURE__ */ lt(Kz, [["__scopeId", "data-v-45863775"]]), Hz = /* @
         }) && (dn.warning("最大长度为： " + (((U = (E = g.form) == null ? void 0 : E.leng) == null ? void 0 : U.input) || 20)), m.value = Y.filter((ee) => {
           var Z, ge;
           return typeof ee != "string" || ee.length <= (((ge = (Z = g.form) == null ? void 0 : Z.leng) == null ? void 0 : ge.input) || 20);
-        }));
+        })), L();
       },
-      { immediate: !0, deep: !0 }
+      { immediate: !0 }
     ), a({ field: c.field, clear: V }), (Y, E) => {
       const U = K("el-option"), ee = K("el-select");
       return v.value ? (I(), H(ee, ie({

package/lib/components/el-plus-form/components/ElPlusFormSelect.vue

@@ -131,7 +131,7 @@ async function queryOptionsFn(query: string) {
  * 初始化默认项
  */
 function initDefault() {
-  if (props.desc.defaultKey) {
+  if (oldQuery.value === null && props.desc.defaultKey) {
     let defaultValue = props.formData[props.desc.defaultKey.value]
     if (!Array.isArray(defaultValue)) defaultValue = [defaultValue]
     let defaultLabel = props.formData[props.desc.defaultKey.label]
@@ -140,12 +140,15 @@ function initDefault() {
     if (defaultValue.length <= 0 || defaultValue.length !== defaultLabel.length) return
     // 遍历
     defaultValue.map((val: any, i: number) => {
-      // 这里需要判断下默认值是否已经出现在了options中，如果存在，则需要删除
-      const index = options.findIndex((item) => item.value === val)
-      if (index >= 0) options.splice(index, 1)
-      options.unshift({ value: val, label: defaultLabel[i], dataItem: cloneDeep(props.formData) })
+      if (val) {
+        // 这里需要判断下默认值是否已经出现在了options中，如果存在，则需要删除
+        const index = options.findIndex((item) => item.value === val)
+        if (index >= 0) {
+          options.splice(index, 1)
+        }
+        options.unshift({ value: val, label: defaultLabel[i], dataItem: cloneDeep(props.formData) })
+      }
     })
-    console.log('options: ', options)
   }
 }
 
@@ -164,7 +167,6 @@ onBeforeMount(async () => {
   attrs.value = await getAttrs(props, tempAttr)
   attrs.value.remote = !!props.desc.remote
   delete attrs.value.disabled
-  initDefault()
   isInit.value = true
 })
 
@@ -201,8 +203,10 @@ watch(
         currentValue.value = (val as Array<string>).filter((item) => typeof item !== 'string' || item.length <= (defaultConf.form?.leng?.input || 20))
       }
     }
+    // 处理一下默认值
+    initDefault()
   },
-  { immediate: true, deep: true }
+  { immediate: true }
 )
 
 defineExpose({ field: props.field, clear })

package/package.json

@@ -2,7 +2,7 @@
   "name": "el-plus-crud",
   "description": "采用Vue3 + TS，封装的element-plus数据驱动表单、列表组件",
   "author": "K.D.Jack",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "license": "MIT",
   "private": false,
   "main": "dist/el-plus-crud.mjs",