xyvcard-goods 0.0.15 → 0.0.17

package/dist/{skuForm-B7yYjwdJ.mjs → skuForm-H9IDa7ys.mjs}

@@ -1,6 +1,6 @@
-import { defineComponent as te, ref as b, computed as se, watch as D, resolveComponent as i, openBlock as m, createElementBlock as g, Fragment as k, unref as O, createVNode as o, withCtx as a, createCommentVNode as I, renderList as y, createElementVNode as S, toDisplayString as Y, createTextVNode as w, createBlock as P } from "vue";
-import { C as E, D as ue, S as H, a as ne } from "./index-DZJVaUh3.mjs";
-import { s as de, _ as re } from "./skuTable-YDBH_oRN.mjs";
+import { defineComponent as te, ref as k, computed as se, watch as I, resolveComponent as i, openBlock as m, createElementBlock as g, Fragment as S, unref as M, createVNode as o, withCtx as a, createCommentVNode as D, renderList as y, createElementVNode as h, toDisplayString as O, createTextVNode as w, createBlock as P } from "vue";
+import { C as E, D as ue, S as Y, a as ne } from "./index-CmKF2zdn.mjs";
+import { s as re, _ as de } from "./skuTable-DbNThlFG.mjs";
 const pe = { key: 0 }, ce = {
   key: 1,
   class: "w-full"
@@ -16,16 +16,12 @@ const pe = { key: 0 }, ce = {
       type: Object,
       default: () => {
       }
-    },
-    isDisabled: {
-      type: Boolean,
-      default: !0
     }
   },
   emits: ["getGoodsSku", "getFormData"],
-  setup(L, { emit: J }) {
-    var T, q, R;
-    const r = b({
+  setup(H, { emit: J }) {
+    var F, T, q;
+    const d = k({
       picUrl: "",
       salePrice: 0,
       marketPrice: 0,
@@ -34,41 +30,41 @@ const pe = { key: 0 }, ce = {
       volume: 0,
       stock: 0,
       skuCode: ""
-    }), t = b([]), C = b(), V = b([]), h = b([]), $ = b([]), v = L, U = J, F = se(() => t.value.filter(
+    }), t = k([]), C = k(), V = k([]), b = k([]), L = k([]), v = H, $ = J, U = se(() => t.value.filter(
       (e) => e.name && e.specValueList != null && e.specValueList.length
     ));
-    D(
+    I(
       v.form,
       (e) => e,
       {
         deep: !0,
         immediate: !0
       }
-    ), D(
-      r,
+    ), I(
+      d,
       (e) => {
-        U("getGoodsSku", e);
+        $("getGoodsSku", e);
       },
       {
         deep: !0,
         immediate: !0
       }
-    ), D(
-      F,
+    ), I(
+      U,
       (e) => e,
       {
         deep: !0,
         immediate: !0
       }
-    ), v.form.spuId && (v.form.specType === E.SPEC_TYPE.UNIFIED_SPEC ? r.value = (T = v.form.skuList) == null ? void 0 : T.results[0] : ($.value = (q = v.form.skuList) == null ? void 0 : q.results, (R = v.form.skuList) == null || R.results.forEach((e) => {
+    ), v.form.spuId && (v.form.specType === E.SPEC_TYPE.UNIFIED_SPEC ? d.value = (F = v.form.skuList) == null ? void 0 : F.results[0] : (L.value = (T = v.form.skuList) == null ? void 0 : T.results, (q = v.form.skuList) == null || q.results.forEach((e) => {
       var l;
       (l = e.specValues) == null || l.map((s) => {
         ue.specInfoDict.useValues().then((n) => {
-          const d = n.find((f) => s.specId === f.key);
-          if (d) {
+          const r = n.find((f) => s.specId === f.key);
+          if (r) {
             let f = {
               id: s.specId,
-              name: d.value,
+              name: r.value,
               specValueList: []
             };
             t.value.push(f);
@@ -82,7 +78,7 @@ const pe = { key: 0 }, ce = {
     })));
     function K(e) {
       t.value.forEach((l) => {
-        V.value = new H({ specId: l.id }), V.value.useValues().then((s) => {
+        V.value = new Y({ specId: l.id }), V.value.useValues().then((s) => {
           s.forEach((n) => {
             if (n.key === e) {
               let p = {
@@ -91,9 +87,9 @@ const pe = { key: 0 }, ce = {
               };
               l.specValueList.push(p);
             }
-            const d = /* @__PURE__ */ new Map();
+            const r = /* @__PURE__ */ new Map();
             l.specValueList = l.specValueList.filter(
-              (p) => !d.has(p.id) && d.set(p.id, p)
+              (p) => !r.has(p.id) && r.set(p.id, p)
             );
           });
         });
@@ -106,7 +102,7 @@ const pe = { key: 0 }, ce = {
       t.value[e].specValueList.splice(l, 1);
     }
     function X() {
-      h.value = new ne({ shopId: v.form.shopId }), h.value.useValues().then((e) => {
+      b.value = new ne({ shopId: v.form.shopId }), b.value.useValues().then((e) => {
         e.forEach((l) => {
           Array.isArray(t.value) && t.value.length > 0 && t.value.forEach((s) => {
             l.key === s.id && (l.disabled = !0);
@@ -115,7 +111,7 @@ const pe = { key: 0 }, ce = {
       });
     }
     function Z(e) {
-      let l = h.value.values.filter((n) => n.key === e), s = {
+      let l = b.value.values.filter((n) => n.key === e), s = {
         id: l[0].key,
         name: l[0].value,
         specValueList: []
@@ -123,7 +119,7 @@ const pe = { key: 0 }, ce = {
       t.value.push(s), C.value = "";
     }
     function z(e) {
-      V.value = new H({
+      V.value = new Y({
         specId: t.value[e].id
       }), V.value.useValues().then((l) => {
         l.map((s) => {
@@ -134,23 +130,23 @@ const pe = { key: 0 }, ce = {
       });
     }
     function x(e, l) {
-      var d, p;
+      var r, p;
       let s = V.value.values.filter((f) => f.key === e), n = {
         id: s[0].key,
         name: s[0].value
       };
-      (p = (d = t.value[l]) == null ? void 0 : d.specValueList) == null || p.push(n), t.value[l].specValueId = "";
+      (p = (r = t.value[l]) == null ? void 0 : r.specValueList) == null || p.push(n), t.value[l].specValueId = "";
     }
     function ee(e) {
-      U("getFormData", e);
+      $("getFormData", e);
     }
     return (e, l) => {
-      const s = i("el-input-number"), n = i("el-form-item"), d = i("el-col"), p = i("el-row"), f = i("Delete"), le = i("el-icon"), oe = i("el-tag"), B = i("el-button"), N = i("el-option"), j = i("el-select"), A = i("el-popover"), G = i("el-tab-pane"), M = i("el-tabs");
-      return m(), g(k, null, [
-        v.specType == O(E).SPEC_TYPE.UNIFIED_SPEC ? (m(), g("div", pe, [
+      const s = i("el-input-number"), n = i("el-form-item"), r = i("el-col"), p = i("el-row"), f = i("Delete"), le = i("el-icon"), oe = i("el-tag"), R = i("el-button"), N = i("el-option"), j = i("el-select"), A = i("el-popover"), B = i("el-tab-pane"), G = i("el-tabs");
+      return m(), g(S, null, [
+        v.specType == M(E).SPEC_TYPE.UNIFIED_SPEC ? (m(), g("div", pe, [
           o(p, null, {
             default: a(() => [
-              o(d, { span: 8 }, {
+              o(r, { span: 8 }, {
                 default: a(() => [
                   o(n, {
                     label: e.$t("goodsSpu.salePrice"),
@@ -158,8 +154,8 @@ const pe = { key: 0 }, ce = {
                   }, {
                     default: a(() => [
                       o(s, {
-                        modelValue: r.value.salePrice,
-                        "onUpdate:modelValue": l[0] || (l[0] = (u) => r.value.salePrice = u),
+                        modelValue: d.value.salePrice,
+                        "onUpdate:modelValue": l[0] || (l[0] = (u) => d.value.salePrice = u),
                         precision: 2,
                         step: 0,
                         min: 0.01,
@@ -173,7 +169,7 @@ const pe = { key: 0 }, ce = {
                 ]),
                 _: 1
               }),
-              o(d, { span: 8 }, {
+              o(r, { span: 8 }, {
                 default: a(() => [
                   o(n, {
                     label: e.$t("goodsSpu.marketPrice"),
@@ -181,8 +177,8 @@ const pe = { key: 0 }, ce = {
                   }, {
                     default: a(() => [
                       o(s, {
-                        modelValue: r.value.marketPrice,
-                        "onUpdate:modelValue": l[1] || (l[1] = (u) => r.value.marketPrice = u),
+                        modelValue: d.value.marketPrice,
+                        "onUpdate:modelValue": l[1] || (l[1] = (u) => d.value.marketPrice = u),
                         precision: 2,
                         step: 0,
                         min: 0.01,
@@ -196,7 +192,7 @@ const pe = { key: 0 }, ce = {
                 ]),
                 _: 1
               }),
-              o(d, { span: 8 }, {
+              o(r, { span: 8 }, {
                 default: a(() => [
                   o(n, {
                     label: e.$t("goodsSpu.costPrice"),
@@ -204,8 +200,8 @@ const pe = { key: 0 }, ce = {
                   }, {
                     default: a(() => [
                       o(s, {
-                        modelValue: r.value.costPrice,
-                        "onUpdate:modelValue": l[2] || (l[2] = (u) => r.value.costPrice = u),
+                        modelValue: d.value.costPrice,
+                        "onUpdate:modelValue": l[2] || (l[2] = (u) => d.value.costPrice = u),
                         precision: 2,
                         step: 0,
                         min: 0.01,
@@ -219,7 +215,7 @@ const pe = { key: 0 }, ce = {
                 ]),
                 _: 1
               }),
-              o(d, { span: 8 }, {
+              o(r, { span: 8 }, {
                 default: a(() => [
                   o(n, {
                     label: e.$t("goodsSpu.stock"),
@@ -227,8 +223,8 @@ const pe = { key: 0 }, ce = {
                   }, {
                     default: a(() => [
                       o(s, {
-                        modelValue: r.value.stock,
-                        "onUpdate:modelValue": l[3] || (l[3] = (u) => r.value.stock = u),
+                        modelValue: d.value.stock,
+                        "onUpdate:modelValue": l[3] || (l[3] = (u) => d.value.stock = u),
                         placeholder: e.$t("goodsSpu.stockRequired"),
                         class: "w-full",
                         controls: !1,
@@ -241,7 +237,7 @@ const pe = { key: 0 }, ce = {
                 ]),
                 _: 1
               }),
-              o(d, { span: 8 }, {
+              o(r, { span: 8 }, {
                 default: a(() => [
                   o(n, {
                     label: e.$t("goodsSpu.weight"),
@@ -249,8 +245,8 @@ const pe = { key: 0 }, ce = {
                   }, {
                     default: a(() => [
                       o(s, {
-                        modelValue: r.value.weight,
-                        "onUpdate:modelValue": l[4] || (l[4] = (u) => r.value.weight = u),
+                        modelValue: d.value.weight,
+                        "onUpdate:modelValue": l[4] || (l[4] = (u) => d.value.weight = u),
                         placeholder: e.$t("goodsSpu.weightRequired"),
                         class: "w-full",
                         controls: !1,
@@ -262,7 +258,7 @@ const pe = { key: 0 }, ce = {
                 ]),
                 _: 1
               }),
-              o(d, { span: 8 }, {
+              o(r, { span: 8 }, {
                 default: a(() => [
                   o(n, {
                     label: e.$t("goodsSpu.volume"),
@@ -270,8 +266,8 @@ const pe = { key: 0 }, ce = {
                   }, {
                     default: a(() => [
                       o(s, {
-                        modelValue: r.value.volume,
-                        "onUpdate:modelValue": l[5] || (l[5] = (u) => r.value.volume = u),
+                        modelValue: d.value.volume,
+                        "onUpdate:modelValue": l[5] || (l[5] = (u) => d.value.volume = u),
                         controls: !1,
                         placeholder: e.$t("goodsSpu.volumeRequired"),
                         class: "w-full",
@@ -286,19 +282,19 @@ const pe = { key: 0 }, ce = {
             ]),
             _: 1
           })
-        ])) : I("", !0),
-        v.specType == O(E).SPEC_TYPE.MULTI_SPEC ? (m(), g("div", ce, [
-          o(M, { type: "border-card" }, {
+        ])) : D("", !0),
+        v.specType == M(E).SPEC_TYPE.MULTI_SPEC ? (m(), g("div", ce, [
+          o(G, { type: "border-card" }, {
             default: a(() => [
-              o(G, { label: "商品规格" }, {
+              o(B, { label: "商品规格" }, {
                 default: a(() => [
-                  (m(!0), g(k, null, y(t.value, (u, _) => (m(), g("div", {
+                  (m(!0), g(S, null, y(t.value, (u, _) => (m(), g("div", {
                     class: "goods-spec",
                     key: _
                   }, [
-                    S("div", ie, [
-                      S("span", null, Y(u.name), 1),
-                      S("span", {
+                    h("div", ie, [
+                      h("span", null, O(u.name), 1),
+                      h("span", {
                         class: "goods-delete",
                         onClick: (c) => Q(_)
                       }, [
@@ -311,9 +307,9 @@ const pe = { key: 0 }, ce = {
                         l[7] || (l[7] = w("移除 "))
                       ], 8, me)
                     ]),
-                    S("div", fe, [
-                      S("div", ve, [
-                        (m(!0), g(k, null, y(t.value[_].specValueList, (c, ae) => (m(), P(oe, {
+                    h("div", fe, [
+                      h("div", ve, [
+                        (m(!0), g(S, null, y(t.value[_].specValueList, (c, ae) => (m(), P(oe, {
                           key: c,
                           closable: "",
                           type: "info",
@@ -321,7 +317,7 @@ const pe = { key: 0 }, ce = {
                           onClose: (ge) => W(_, ae)
                         }, {
                           default: a(() => [
-                            w(Y(c.name), 1)
+                            w(O(c.name), 1)
                           ]),
                           _: 2
                         }, 1032, ["onClose"]))), 128))
@@ -333,7 +329,7 @@ const pe = { key: 0 }, ce = {
                         onShow: (c) => z(_)
                       }, {
                         reference: a(() => [
-                          o(B, { class: "m-2" }, {
+                          o(R, { class: "m-2" }, {
                             default: a(() => l[8] || (l[8] = [
                               w("添加规格值")
                             ])),
@@ -349,7 +345,7 @@ const pe = { key: 0 }, ce = {
                             onChange: (c) => x(c, _)
                           }, {
                             default: a(() => [
-                              (m(!0), g(k, null, y(V.value.values, (c) => (m(), P(N, {
+                              (m(!0), g(S, null, y(V.value.values, (c) => (m(), P(N, {
                                 key: c.key,
                                 label: c.value,
                                 value: c.key,
@@ -370,16 +366,13 @@ const pe = { key: 0 }, ce = {
                     onShow: X
                   }, {
                     reference: a(() => [
-                      o(B, {
-                        class: "m-2",
-                        disabled: L.isDisabled
-                      }, {
+                      o(R, { class: "m-2" }, {
                         default: a(() => l[9] || (l[9] = [
                           w("添加规格")
                         ])),
                         _: 1,
                         __: [9]
-                      }, 8, ["disabled"])
+                      })
                     ]),
                     default: a(() => [
                       o(j, {
@@ -389,7 +382,7 @@ const pe = { key: 0 }, ce = {
                         onChange: Z
                       }, {
                         default: a(() => [
-                          (m(!0), g(k, null, y(h.value.values, (u) => (m(), P(N, {
+                          (m(!0), g(S, null, y(b.value.values, (u) => (m(), P(N, {
                             key: u.key,
                             label: u.value,
                             value: u.key,
@@ -407,27 +400,27 @@ const pe = { key: 0 }, ce = {
             ]),
             _: 1
           }),
-          o(M, { type: "border-card" }, {
+          o(G, { type: "border-card" }, {
             default: a(() => [
-              o(G, { label: "规格售价与库存" }, {
+              o(B, { label: "规格售价与库存" }, {
                 default: a(() => [
-                  t.value.length > 0 ? (m(), P(de, {
+                  t.value.length > 0 ? (m(), P(re, {
                     key: 0,
-                    specData: F.value,
-                    goodsSku: $.value,
+                    specData: U.value,
+                    goodsSku: L.value,
                     onGetFormData: ee
-                  }, null, 8, ["specData", "goodsSku"])) : I("", !0)
+                  }, null, 8, ["specData", "goodsSku"])) : D("", !0)
                 ]),
                 _: 1
               })
             ]),
             _: 1
           })
-        ])) : I("", !0)
+        ])) : D("", !0)
       ], 64);
     };
   }
-}), Se = /* @__PURE__ */ re(_e, [["__scopeId", "data-v-d3b23fe5"]]);
+}), he = /* @__PURE__ */ de(_e, [["__scopeId", "data-v-859a9f0c"]]);
 export {
-  Se as default
+  he as default
 };

package/dist/{skuTable-YDBH_oRN.mjs → skuTable-DbNThlFG.mjs}

@@ -1,5 +1,5 @@
 import { defineComponent as O, ref as C, computed as q, watch as $, resolveComponent as v, openBlock as _, createElementBlock as U, createElementVNode as g, createVNode as n, withCtx as d, createTextVNode as S, createCommentVNode as F, Fragment as M, renderList as G, createBlock as x, toDisplayString as D, unref as z } from "vue";
-import { D as K } from "./index-DZJVaUh3.mjs";
+import { D as K } from "./index-CmKF2zdn.mjs";
 import { fileApi as E } from "jmash-core";
 const H = (a, h) => {
   const s = a.__vccOpts || a;

package/dist/style.css

@@ -1 +1 @@
-.w-full{width:100%!important}.right-dis{margin-right:10px}.top-dis{margin-top:25px}.cell-item{display:flex;align-items:center;justify-content:flex-end}.el-descriptions__label{width:15%;text-align:right}.el-descriptions__content{width:35%}.title-set[data-v-84542ec3]{display:flex;align-items:center;font-size:14px;padding:0 0 10px}.goods-spec[data-v-d3b23fe5]{border:1px solid #ccc;margin-bottom:5px}.goods-title[data-v-d3b23fe5]{display:flex;align-items:center;border-bottom:1px solid #ccc;padding:10px 20px}.goods-title .goods-delete[data-v-d3b23fe5]{display:flex;align-items:center;margin-left:auto;color:red;font-size:14px}.goods-content[data-v-d3b23fe5]{padding:10px 20px}.goods-tag[data-v-d3b23fe5]{margin-bottom:10px}[data-v-f10f6f7e] .el-upload--picture-card{width:80px;height:80px;border-radius:0}[data-v-f10f6f7e] .el-upload-list--picture-card .el-upload-list__item{width:80px;height:80px}
+.w-full{width:100%!important}.right-dis{margin-right:10px}.top-dis{margin-top:25px}.cell-item{display:flex;align-items:center;justify-content:flex-end}.el-descriptions__label{width:15%;text-align:right}.el-descriptions__content{width:35%}.title-set[data-v-84542ec3]{display:flex;align-items:center;font-size:14px;padding:0 0 10px}.goods-spec[data-v-859a9f0c]{border:1px solid #ccc;margin-bottom:5px}.goods-title[data-v-859a9f0c]{display:flex;align-items:center;border-bottom:1px solid #ccc;padding:10px 20px}.goods-title .goods-delete[data-v-859a9f0c]{display:flex;align-items:center;margin-left:auto;color:red;font-size:14px}.goods-content[data-v-859a9f0c]{padding:10px 20px}.goods-tag[data-v-859a9f0c]{margin-bottom:10px}[data-v-f10f6f7e] .el-upload--picture-card{width:80px;height:80px;border-radius:0}[data-v-f10f6f7e] .el-upload-list--picture-card .el-upload-list__item{width:80px;height:80px}

package/dts/api/dict.d.ts

@@ -13,7 +13,7 @@ export declare class ShopInfoBizDict extends BizDict {
     useValues(): Promise<Entry[]>;
 }
 export declare class GoodsCategoryListBizLayDict extends BizLayDict {
-    useValues(excludeId?: string): Promise<LayEntry[]>;
+    useValues(): Promise<LayEntry[]>;
 }
 export declare class SpecInfoBizDict extends BizDict {
     useValues(): Promise<Entry[]>;

package/dts/api/goods-spu/types.d.ts

@@ -49,7 +49,7 @@ export interface GoodsSpuKeyList extends EntityKeyList {
 }
 export interface GoodsSpuCreateReq extends EntityCreateReq {
     shopId?: string;
-    categoryId?: string;
+    categoryId?: Array<string>;
     freightType?: string;
     freightAmount?: number;
     spuCode?: string;
@@ -67,7 +67,7 @@ export interface GoodsSpuCreateReq extends EntityCreateReq {
 export interface GoodsSpuUpdateReq extends EntityUpdateReq {
     spuId?: string;
     shopId?: string;
-    categoryId?: string;
+    categoryId?: Array<string>;
     freightType?: string;
     freightAmount?: number;
     spuCode?: string;

package/dts/utils/returnBizLay.d.ts

@@ -0,0 +1,2 @@
+import type { LayEntry } from 'jmash-core';
+export declare function returnBizLay(list: any, label: string, value: string): LayEntry[];

package/dts/views/goods/goods-spu/skuForm.vue.d.ts

@@ -7,10 +7,6 @@ declare const _default: import("vue").DefineComponent<globalThis.ExtractPropType
         type: ObjectConstructor;
         default: () => void;
     };
-    isDisabled: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     getGoodsSku: (...args: any[]) => void;
     getFormData: (...args: any[]) => void;
@@ -23,16 +19,11 @@ declare const _default: import("vue").DefineComponent<globalThis.ExtractPropType
         type: ObjectConstructor;
         default: () => void;
     };
-    isDisabled: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }>> & Readonly<{
     onGetGoodsSku?: ((...args: any[]) => any) | undefined;
     onGetFormData?: ((...args: any[]) => any) | undefined;
 }>, {
     form: Record<string, any>;
     specType: string;
-    isDisabled: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xyvcard-goods",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "private": false,
   "module": "dist/index.mjs",
   "types": "dts/index.d.ts",