xyvcard-goods 0.0.26 → 0.0.28

package/dist/{skuForm-DUR7U2Kn.mjs → skuForm-BsvKk2kD.mjs}

@@ -1,15 +1,15 @@
-import { defineComponent as O, openBlock as m, createElementBlock as v, createElementVNode as M, ref as V, watch as D, resolveComponent as r, createBlock as h, withCtx as i, createVNode as c, unref as g, Fragment as Y, renderList as G, createCommentVNode as H, createTextVNode as x, toDisplayString as J } from "vue";
+import { defineComponent as j, openBlock as m, createElementBlock as S, createElementVNode as M, ref as v, watch as B, resolveComponent as r, createBlock as h, withCtx as i, createVNode as c, unref as g, Fragment as Y, renderList as G, createCommentVNode as H, createTextVNode as x, toDisplayString as J } from "vue";
 import { useI18n as K } from "vue-i18n";
-import { D as $, C as U } from "./index-CMkWXcWe.mjs";
-import { a as B } from "./index-utNcRJx7.mjs";
+import { D as V, C as P } from "./index-COXyxAor.mjs";
+import { a as O } from "./index-B27GuULR.mjs";
 import { specValueApi as Q } from "xyvcard-shop";
 import { _ as W } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
 /*! Element Plus Icons Vue v2.3.1 */
-var X = /* @__PURE__ */ O({
+var X = /* @__PURE__ */ j({
   name: "Plus",
   __name: "plus",
-  setup(S) {
-    return (b, N) => (m(), v("svg", {
+  setup(b) {
+    return (C, E) => (m(), S("svg", {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 1024 1024"
     }, [
@@ -20,7 +20,7 @@ var X = /* @__PURE__ */ O({
     ]));
   }
 }), Z = X;
-const w = { key: 0 }, ee = /* @__PURE__ */ O({
+const w = { key: 0 }, ee = /* @__PURE__ */ j({
   __name: "skuForm",
   props: {
     form: {
@@ -30,8 +30,8 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
     }
   },
   emits: ["getGoodsSku", "getFormData"],
-  setup(S, { emit: b }) {
-    const { t: N } = K(), P = V([]), d = V([
+  setup(b, { emit: C }) {
+    const { t: E } = K(), U = v([]), d = v([
       {
         salePrice: 0,
         skuId: "",
@@ -43,45 +43,45 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
         skuOptions: []
       }
     ]);
-    $.goodsSpuBizDict.useValues();
-    const j = b;
-    function F(s, l) {
+    V.goodsSpuBizDict.useValues();
+    const F = C;
+    function L(s, l) {
       s.picUrl = l;
     }
-    const y = S;
-    D(
+    const y = b;
+    B(
       y.form,
       (s) => s,
       {
         deep: !0,
         immediate: !0
       }
-    ), y.form.spuId && B.findGroupList({ goodsId: y.form.spuId }).then(({ data: s }) => {
+    ), y.form.spuId && O.findGroupList({ goodsId: y.form.spuId }).then(({ data: s }) => {
       if (s && s.results.length > 0) {
         d.value = [];
         const l = s.results.map(async (e) => {
-          console.log("item", e);
           const t = {
             salePrice: e.salePrice || 0,
             skuId: e.skuId || "",
             spuId: e.spuId || "",
             saleNum: e.saleNum || 0,
             picUrl: e.picUrl || "",
+            skuName: e.skuName || "",
             specType: "",
             skuOptions: []
           };
-          return await E(e.spuId, t), t.saleNum = e.saleNum || 0, t.specType === U.SPEC_TYPE.MULTI_SPEC && e.skuId && (t.skuId = e.skuId || "", t.salePrice = e.salePrice || 0, t.saleNum = e.saleNum || 0, t.picUrl = e.picUrl || "", T(e.skuId)), t;
+          return await D(e.spuId, t), t.saleNum = e.saleNum || 0, t.salePrice = e.salePrice || 0, t.specType === P.SPEC_TYPE.MULTI_SPEC && e.skuId && (t.skuId = e.skuId || "", t.salePrice = e.salePrice || 0, t.saleNum = e.saleNum || 0, t.picUrl = e.picUrl || "", $(e.skuId)), t;
         });
         Promise.all(l).then((e) => {
           d.value = e;
         });
       }
     });
-    function L(s) {
+    function A(s) {
       const l = d.value.indexOf(s.row);
       l !== 0 && d.value.splice(l, 1);
     }
-    function A() {
+    function R() {
       d.value.push({
         salePrice: 0,
         skuId: "",
@@ -93,62 +93,62 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
         skuOptions: []
       });
     }
-    const C = V({});
-    async function R(s) {
-      if (!P.value[s])
+    const T = v({});
+    async function z(s) {
+      if (!U.value[s])
         try {
           const { data: l } = await Q.findById({
             specValueId: s
           });
-          return P.value[s] = l.valueName, l.valueName;
+          return U.value[s] = l.valueName, l.valueName;
         } catch {
         }
     }
-    async function E(s, l) {
-      var e, t;
-      if (l.skuId = "", l.skuOptions = [], l.picUrl = "", l.salePrice = 0, l.saleNum = 0, !s) {
-        l.skuId = "", l.picUrl = "", l.salePrice = 0, l.saleNum = 0, l.skuOptions = [];
+    async function D(s, l) {
+      var e, t, k;
+      if (l.skuId = "", l.skuOptions = [], l.picUrl = "", l.salePrice = 0, l.saleNum = 0, l.skuName = "", !s) {
+        l.skuId = "", l.picUrl = "", l.salePrice = 0, l.saleNum = 0, l.skuName = ((e = V.goodsSpuBizDict.values.find((o) => o.key === s)) == null ? void 0 : e.value) ?? "", l.skuOptions = [];
         return;
       }
       try {
-        const { data: n } = await B.findById({ spuId: s });
-        if (l.specType = n.specType, l.specType === U.SPEC_TYPE.UNIFIED_SPEC && (l.picUrl = n.picUrls ? n.picUrls.split(",")[0] : "", l.salePrice = (e = n.skuList) == null ? void 0 : e.results[0].salePrice, l.skuId = (t = n.skuList) == null ? void 0 : t.results[0].skuId), l.specType === U.SPEC_TYPE.MULTI_SPEC && n.skuList) {
-          const f = n.skuList.results, I = f.map((o) => o.specValues && Array.isArray(o.specValues) ? o.specValues.map(
+        const { data: o } = await O.findById({ spuId: s });
+        if (l.specType = o.specType, l.specType === P.SPEC_TYPE.UNIFIED_SPEC && (l.picUrl = o.picUrls ? o.picUrls.split(",")[0] : "", l.salePrice = (t = o.skuList) == null ? void 0 : t.results[0].salePrice, l.skuId = (k = o.skuList) == null ? void 0 : k.results[0].skuId, l.skuName = o.spuName), l.specType === P.SPEC_TYPE.MULTI_SPEC && o.skuList) {
+          const f = o.skuList.results, _ = f.map((u) => u.specValues && Array.isArray(u.specValues) ? u.specValues.map(
             (p) => p.specValueId
-          ) : []), k = I.flat().map((o) => R(o));
-          await Promise.all(k);
-          const _ = I.map(
-            (o) => o.map((p) => P.value[p] || p)
+          ) : []), N = _.flat().map((u) => z(u));
+          await Promise.all(N);
+          const I = _.map(
+            (u) => u.map((p) => U.value[p] || p)
           );
-          l.skuOptions = f.map((o, p) => ({
-            key: o.skuId,
-            value: _[p].join(" "),
-            specInfo: _[p].join(" "),
-            picUrl: o.picUrl || (n.picUrls ? n.picUrls.split(",")[0] : ""),
-            salePrice: o.salePrice,
-            stock: o.stock
-          })), f.forEach((o, p) => {
-            o.skuId && (C.value[o.skuId] = {
-              ...o,
-              specInfo: _[p].join(" "),
-              spuPicUrls: n.picUrls
+          l.skuOptions = f.map((u, p) => ({
+            key: u.skuId,
+            value: I[p].join(" "),
+            specInfo: I[p].join(" "),
+            picUrl: u.picUrl || (o.picUrls ? o.picUrls.split(",")[0] : ""),
+            salePrice: u.salePrice,
+            stock: u.stock
+          })), f.forEach((u, p) => {
+            u.skuId && (T.value[u.skuId] = {
+              ...u,
+              specInfo: I[p].join(" "),
+              spuPicUrls: o.picUrls
             });
           });
         }
       } catch {
       }
     }
-    function T(s) {
+    function $(s) {
       const l = d.value.find((e) => e.skuId === s);
       if (l && s) {
-        const e = C.value[s];
+        const e = T.value[s];
         if (e) {
           const t = e.spuPicUrls ? e.spuPicUrls.split(",")[0] : "";
           l.picUrl = e.picUrl || t, l.salePrice = e.salePrice, l.specInfo = e.specInfo;
         }
       }
     }
-    return D(
+    return B(
       d,
       (s) => {
         const l = s.filter((e) => e.spuId && e.skuId).map((e) => ({
@@ -157,19 +157,20 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
           spuId: e.spuId,
           specInfo: e.specInfo,
           saleNum: e.saleNum,
-          picUrl: e.picUrl
+          picUrl: e.picUrl,
+          skuName: e.skuName
         }));
-        j("getGoodsSku", l), console.log("filteredValue", l);
+        F("getGoodsSku", l);
       },
       {
         deep: !0,
         immediate: !0
       }
     ), (s, l) => {
-      const e = r("jmash-select"), t = r("el-table-column"), n = r("el-option"), f = r("el-select"), I = r("jmash-single-image-upload"), k = r("el-input-number"), _ = r("DeleteFilled"), o = r("el-icon"), p = r("el-table"), q = r("el-button"), z = r("el-row");
-      return m(), h(z, null, {
+      const e = r("jmash-select"), t = r("el-table-column"), k = r("el-option"), o = r("el-select"), f = r("jmash-single-image-upload"), _ = r("el-input-number"), N = r("DeleteFilled"), I = r("el-icon"), u = r("el-table"), p = r("el-button"), q = r("el-row");
+      return m(), h(q, null, {
         default: i(() => [
-          c(p, {
+          c(u, {
             data: d.value,
             border: "",
             style: { width: "100%" }
@@ -183,13 +184,13 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 default: i(({ row: a }) => [
                   c(e, {
                     modelValue: a.spuId,
-                    "onUpdate:modelValue": (u) => a.spuId = u,
-                    data: g($).goodsSpuBizDict.values,
+                    "onUpdate:modelValue": (n) => a.spuId = n,
+                    data: g(V).goodsSpuBizDict.values,
                     filterable: "",
                     clearable: "",
                     placeholder: s.$t("goodsSpu.spuNameRequireds"),
                     class: "w-full",
-                    onChange: (u) => E(a.spuId, a)
+                    onChange: (n) => D(a.spuId, a)
                   }, null, 8, ["modelValue", "onUpdate:modelValue", "data", "placeholder", "onChange"])
                 ]),
                 _: 1
@@ -199,18 +200,18 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  a.specType === g(U).SPEC_TYPE.UNIFIED_SPEC ? (m(), v("span", w, " 统一规格 ")) : (m(), h(f, {
+                  a.specType === g(P).SPEC_TYPE.UNIFIED_SPEC ? (m(), S("span", w, " 统一规格 ")) : (m(), h(o, {
                     key: 1,
                     modelValue: a.skuId,
-                    "onUpdate:modelValue": (u) => a.skuId = u,
+                    "onUpdate:modelValue": (n) => a.skuId = n,
                     placeholder: s.$t("goodsSpu.specTypeRequired"),
-                    onChange: (u) => T(a.skuId)
+                    onChange: (n) => $(a.skuId)
                   }, {
                     default: i(() => [
-                      (m(!0), v(Y, null, G(a.skuOptions, (u) => (m(), h(n, {
-                        key: u.key,
-                        label: u.value,
-                        value: u.key
+                      (m(!0), S(Y, null, G(a.skuOptions, (n) => (m(), h(k, {
+                        key: n.key,
+                        label: n.value,
+                        value: n.key
                       }, null, 8, ["label", "value"]))), 128))
                     ]),
                     _: 2
@@ -225,9 +226,9 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  c(I, {
+                  c(f, {
                     "picture-url": a.picUrl,
-                    onImageSrc: (u) => F(a, u),
+                    onImageSrc: (n) => L(a, n),
                     width: 80,
                     type: "trans"
                   }, null, 8, ["picture-url", "onImageSrc"])
@@ -240,9 +241,9 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  c(k, {
+                  c(_, {
                     modelValue: a.salePrice,
-                    "onUpdate:modelValue": (u) => a.salePrice = u,
+                    "onUpdate:modelValue": (n) => a.salePrice = n,
                     precision: 2,
                     min: 0,
                     placeholder: s.$t("goodsSpu.salePriceV1Required"),
@@ -258,9 +259,9 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  c(k, {
+                  c(_, {
                     modelValue: a.saleNum,
-                    "onUpdate:modelValue": (u) => a.saleNum = u,
+                    "onUpdate:modelValue": (n) => a.saleNum = n,
                     placeholder: s.$t("goodsSpu.saleNumRequireds"),
                     class: "w-full",
                     controls: !1,
@@ -276,15 +277,15 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 align: "center"
               }, {
                 default: i((a) => [
-                  a.$index !== 0 ? (m(), h(o, {
+                  a.$index !== 0 ? (m(), h(I, {
                     key: 0,
-                    onClick: (u) => L(a),
+                    onClick: (n) => A(a),
                     size: "18",
                     style: { cursor: "pointer", color: "inherit" },
                     class: "hover-blue"
                   }, {
                     default: i(() => [
-                      c(_)
+                      c(N)
                     ]),
                     _: 2
                   }, 1032, ["onClick"])) : H("", !0)
@@ -294,13 +295,13 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
             ]),
             _: 1
           }, 8, ["data"]),
-          c(q, {
+          c(p, {
             icon: g(Z),
             class: "addButton",
-            onClick: A
+            onClick: R
           }, {
             default: i(() => [
-              x(J(g(N)("common.add")), 1)
+              x(J(g(E)("common.add")), 1)
             ]),
             _: 1
           }, 8, ["icon"])
@@ -309,7 +310,7 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
       });
     };
   }
-}), ne = /* @__PURE__ */ W(ee, [["__scopeId", "data-v-3701de30"]]);
+}), ne = /* @__PURE__ */ W(ee, [["__scopeId", "data-v-dc82ad15"]]);
 export {
   ne as default
 };

package/dist/{skuForm-B_8WQCr3.mjs → skuForm-CU0a2ltJ.mjs}

@@ -1,6 +1,6 @@
 import { defineComponent as te, ref as S, computed as se, watch as $, resolveComponent as i, openBlock as m, createElementBlock as g, Fragment as b, unref as M, createVNode as o, withCtx as a, createCommentVNode as I, renderList as P, createElementVNode as k, toDisplayString as O, createTextVNode as y, createBlock as w } from "vue";
-import { C as D, D as ue, S as Y, a as ne } from "./index-CMkWXcWe.mjs";
-import re from "./skuTable-D4LGL7B5.mjs";
+import { C as D, D as ue, S as Y, a as ne } from "./index-COXyxAor.mjs";
+import re from "./skuTable-DgDGWX-n.mjs";
 import { _ as de } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
 const pe = { key: 0 }, ce = {
   key: 1,

package/dist/{skuTable-D4LGL7B5.mjs → skuTable-DgDGWX-n.mjs}

@@ -1,5 +1,5 @@
 import { defineComponent as T, ref as C, computed as F, watch as $, resolveComponent as g, openBlock as P, createElementBlock as b, createElementVNode as u, createVNode as a, withCtx as d, createTextVNode as y, createCommentVNode as M, Fragment as G, renderList as K, createBlock as z, toDisplayString as D, unref as x } from "vue";
-import { D as O } from "./index-CMkWXcWe.mjs";
+import { D as O } from "./index-COXyxAor.mjs";
 import { fileApi as E } from "jmash-core";
 import { _ as H } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
 function J(n, h = [], o) {

package/dist/style.css

@@ -1 +1 @@
-@charset "UTF-8";.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%}[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}.title-set[data-v-6fc718ce]{display:flex;align-items:center;font-size:14px;padding:0 0 10px}.goods-spec[data-v-e6aa4b01]{border:1px solid #ccc;margin-bottom:5px}.goods-title[data-v-e6aa4b01]{display:flex;align-items:center;border-bottom:1px solid #ccc;padding:10px 20px}.goods-title .goods-delete[data-v-e6aa4b01]{display:flex;align-items:center;margin-left:auto;color:red;font-size:14px}.goods-content[data-v-e6aa4b01]{padding:10px 20px}.goods-tag[data-v-e6aa4b01]{margin-bottom:10px}.addButton[data-v-3701de30]{margin-top:15px;margin-bottom:20px;width:100%}.hover-blue[data-v-3701de30]:hover{color:#409eff!important}.position-center[data-v-6e6f248a]{position:absolute;right:0;top:30%;transform:translateY(-30%)}.plus-position[data-v-6e6f248a]{position:absolute;right:0;top:0;margin-top:8px}.position-center[data-v-7789ee13]{position:absolute;right:0;top:30%;transform:translateY(-30%)}.plus-position[data-v-7789ee13]{position:absolute;right:0;top:0;margin-top:8px}
+@charset "UTF-8";.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%}[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}.title-set[data-v-6fc718ce]{display:flex;align-items:center;font-size:14px;padding:0 0 10px}.goods-spec[data-v-e6aa4b01]{border:1px solid #ccc;margin-bottom:5px}.goods-title[data-v-e6aa4b01]{display:flex;align-items:center;border-bottom:1px solid #ccc;padding:10px 20px}.goods-title .goods-delete[data-v-e6aa4b01]{display:flex;align-items:center;margin-left:auto;color:red;font-size:14px}.goods-content[data-v-e6aa4b01]{padding:10px 20px}.goods-tag[data-v-e6aa4b01]{margin-bottom:10px}.addButton[data-v-dc82ad15]{margin-top:15px;margin-bottom:20px;width:100%}.hover-blue[data-v-dc82ad15]:hover{color:#409eff!important}.position-center[data-v-6e6f248a]{position:absolute;right:0;top:30%;transform:translateY(-30%)}.plus-position[data-v-6e6f248a]{position:absolute;right:0;top:0;margin-top:8px}.position-center[data-v-7789ee13]{position:absolute;right:0;top:30%;transform:translateY(-30%)}.plus-position[data-v-7789ee13]{position:absolute;right:0;top:0;margin-top:8px}

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

@@ -36,6 +36,8 @@ export interface GoodsSpuModel extends EntityModel {
     brandId?: string;
     labelIds?: Array<string>;
     groupInfos?: Array<GoodsGroupInfoCreateReq>;
+    minPrice?: number;
+    maxPrice?: number;
 }
 export interface GoodsSpuList extends EntityList {
     results: Array<GoodsSpuModel>;
@@ -128,6 +130,7 @@ export interface GoodsSkuCreateReq {
     skuId?: string;
     status?: boolean;
     specIds?: string;
+    saleNum?: number;
 }
 export interface SkuSpecValue {
     specId: string;
@@ -170,6 +173,7 @@ export interface GoodsGroupInfoCreateReq {
     saleNum?: number;
     salePrice?: number;
     specType?: string;
+    skuName?: string;
     skuOptions?: {
         key: string;
         value: string;

package/package.json

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