xyvcard-goods 0.0.24 → 0.0.26

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

@@ -1,15 +1,15 @@
-import { defineComponent as O, openBlock as m, createElementBlock as S, createElementVNode as M, ref as v, watch as $, 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 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 { useI18n as K } from "vue-i18n";
-import { D as B, C as U } from "./index-jCpYt-EU.mjs";
-import { a as L } from "./index-C7oatDPl.mjs";
+import { D as $, C as U } from "./index-CMkWXcWe.mjs";
+import { a as B } from "./index-utNcRJx7.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({
   name: "Plus",
   __name: "plus",
-  setup(b) {
-    return (N, C) => (m(), S("svg", {
+  setup(S) {
+    return (b, N) => (m(), v("svg", {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 1024 1024"
     }, [
@@ -30,8 +30,8 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
     }
   },
   emits: ["getGoodsSku", "getFormData"],
-  setup(b, { emit: N }) {
-    const { t: C } = K(), P = v([]), d = v([
+  setup(S, { emit: b }) {
+    const { t: N } = K(), P = V([]), d = V([
       {
         salePrice: 0,
         skuId: "",
@@ -43,44 +43,45 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
         skuOptions: []
       }
     ]);
-    B.goodsSpuBizDict.useValues();
-    const j = N;
-    function F(s, e) {
-      s.picUrl = e;
+    $.goodsSpuBizDict.useValues();
+    const j = b;
+    function F(s, l) {
+      s.picUrl = l;
     }
-    const y = b;
-    $(
+    const y = S;
+    D(
       y.form,
       (s) => s,
       {
         deep: !0,
         immediate: !0
       }
-    ), y.form.spuId && L.findGroupList({ goodsId: y.form.spuId }).then(({ data: s }) => {
+    ), y.form.spuId && B.findGroupList({ goodsId: y.form.spuId }).then(({ data: s }) => {
       if (s && s.results.length > 0) {
         d.value = [];
-        const e = s.results.map(async (l) => {
+        const l = s.results.map(async (e) => {
+          console.log("item", e);
           const t = {
-            salePrice: l.salePrice || 0,
-            skuId: l.skuId || "",
-            spuId: l.spuId || "",
-            saleNum: l.saleNum || 0,
-            picUrl: l.picUrl || "",
+            salePrice: e.salePrice || 0,
+            skuId: e.skuId || "",
+            spuId: e.spuId || "",
+            saleNum: e.saleNum || 0,
+            picUrl: e.picUrl || "",
             specType: "",
             skuOptions: []
           };
-          return await T(l.spuId, t), t.specType === U.SPEC_TYPE.MULTI_SPEC && l.skuId && (t.skuId = l.skuId || "", t.salePrice = l.salePrice || 0, t.saleNum = l.saleNum || 0, t.picUrl = l.picUrl || "", D(l.skuId)), t;
+          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;
         });
-        Promise.all(e).then((l) => {
-          d.value = l;
+        Promise.all(l).then((e) => {
+          d.value = e;
         });
       }
     });
-    function A(s) {
-      const e = d.value.indexOf(s.row);
-      e !== 0 && d.value.splice(e, 1);
+    function L(s) {
+      const l = d.value.indexOf(s.row);
+      l !== 0 && d.value.splice(l, 1);
     }
-    function R() {
+    function A() {
       d.value.push({
         salePrice: 0,
         skuId: "",
@@ -92,44 +93,44 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
         skuOptions: []
       });
     }
-    const E = v({});
-    async function q(s) {
+    const C = V({});
+    async function R(s) {
       if (!P.value[s])
         try {
-          const { data: e } = await Q.findById({
+          const { data: l } = await Q.findById({
             specValueId: s
           });
-          return P.value[s] = e.valueName, e.valueName;
+          return P.value[s] = l.valueName, l.valueName;
         } catch {
         }
     }
-    async function T(s, e) {
-      var l, t, k;
-      if (e.skuId = "", e.skuOptions = [], e.picUrl = "", e.salePrice = 0, e.saleNum = 0, !s) {
-        e.skuId = "", e.picUrl = "", e.salePrice = 0, e.saleNum = 0, e.skuOptions = [];
+    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 = [];
         return;
       }
       try {
-        const { data: n } = await L.findById({ spuId: s });
-        if (e.specType = n.specType, e.specType === U.SPEC_TYPE.UNIFIED_SPEC && (e.picUrl = n.picUrls ? n.picUrls.split(",")[0] : "", e.salePrice = (l = n.skuList) == null ? void 0 : l.results[0].salePrice, e.saleNum = (t = n.skuList) == null ? void 0 : t.results[0].stock, e.skuId = (k = n.skuList) == null ? void 0 : k.results[0].skuId), e.specType === U.SPEC_TYPE.MULTI_SPEC && n.skuList) {
-          const f = n.skuList.results, _ = f.map((o) => o.specValues && Array.isArray(o.specValues) ? o.specValues.map(
+        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(
             (p) => p.specValueId
-          ) : []), V = _.flat().map((o) => q(o));
-          await Promise.all(V);
-          const I = _.map(
+          ) : []), k = I.flat().map((o) => R(o));
+          await Promise.all(k);
+          const _ = I.map(
             (o) => o.map((p) => P.value[p] || p)
           );
-          e.skuOptions = f.map((o, p) => ({
+          l.skuOptions = f.map((o, p) => ({
             key: o.skuId,
-            value: I[p].join(" "),
-            specInfo: I[p].join(" "),
+            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 && (E.value[o.skuId] = {
+            o.skuId && (C.value[o.skuId] = {
               ...o,
-              specInfo: I[p].join(" "),
+              specInfo: _[p].join(" "),
               spuPicUrls: n.picUrls
             });
           });
@@ -137,38 +138,38 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
       } catch {
       }
     }
-    function D(s) {
-      const e = d.value.find((l) => l.skuId === s);
-      if (e && s) {
-        const l = E.value[s];
-        if (l) {
-          const t = l.spuPicUrls ? l.spuPicUrls.split(",")[0] : "";
-          e.picUrl = l.picUrl || t, e.salePrice = l.salePrice, e.saleNum = l.stock, e.specInfo = l.specInfo;
+    function T(s) {
+      const l = d.value.find((e) => e.skuId === s);
+      if (l && s) {
+        const e = C.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 $(
+    return D(
       d,
       (s) => {
-        const e = s.filter((l) => l.spuId && l.skuId).map((l) => ({
-          salePrice: l.salePrice,
-          skuId: l.skuId,
-          spuId: l.spuId,
-          specInfo: l.specInfo,
-          saleNum: l.saleNum,
-          picUrl: l.picUrl
+        const l = s.filter((e) => e.spuId && e.skuId).map((e) => ({
+          salePrice: e.salePrice,
+          skuId: e.skuId,
+          spuId: e.spuId,
+          specInfo: e.specInfo,
+          saleNum: e.saleNum,
+          picUrl: e.picUrl
         }));
-        j("getGoodsSku", e), console.log("filteredValue", e);
+        j("getGoodsSku", l), console.log("filteredValue", l);
       },
       {
         deep: !0,
         immediate: !0
       }
-    ), (s, e) => {
-      const l = r("jmash-select"), t = r("el-table-column"), k = r("el-option"), n = r("el-select"), f = r("jmash-single-image-upload"), _ = r("el-input-number"), V = r("DeleteFilled"), I = r("el-icon"), o = r("el-table"), p = r("el-button"), z = r("el-row");
+    ), (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, {
         default: i(() => [
-          c(o, {
+          c(p, {
             data: d.value,
             border: "",
             style: { width: "100%" }
@@ -180,15 +181,15 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  c(l, {
+                  c(e, {
                     modelValue: a.spuId,
                     "onUpdate:modelValue": (u) => a.spuId = u,
-                    data: g(B).goodsSpuBizDict.values,
+                    data: g($).goodsSpuBizDict.values,
                     filterable: "",
                     clearable: "",
                     placeholder: s.$t("goodsSpu.spuNameRequireds"),
                     class: "w-full",
-                    onChange: (u) => T(a.spuId, a)
+                    onChange: (u) => E(a.spuId, a)
                   }, null, 8, ["modelValue", "onUpdate:modelValue", "data", "placeholder", "onChange"])
                 ]),
                 _: 1
@@ -198,15 +199,15 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  a.specType === g(U).SPEC_TYPE.UNIFIED_SPEC ? (m(), S("span", w, " 统一规格 ")) : (m(), h(n, {
+                  a.specType === g(U).SPEC_TYPE.UNIFIED_SPEC ? (m(), v("span", w, " 统一规格 ")) : (m(), h(f, {
                     key: 1,
                     modelValue: a.skuId,
                     "onUpdate:modelValue": (u) => a.skuId = u,
                     placeholder: s.$t("goodsSpu.specTypeRequired"),
-                    onChange: (u) => D(a.skuId)
+                    onChange: (u) => T(a.skuId)
                   }, {
                     default: i(() => [
-                      (m(!0), S(Y, null, G(a.skuOptions, (u) => (m(), h(k, {
+                      (m(!0), v(Y, null, G(a.skuOptions, (u) => (m(), h(n, {
                         key: u.key,
                         label: u.value,
                         value: u.key
@@ -224,7 +225,7 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  c(f, {
+                  c(I, {
                     "picture-url": a.picUrl,
                     onImageSrc: (u) => F(a, u),
                     width: 80,
@@ -239,7 +240,7 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  c(_, {
+                  c(k, {
                     modelValue: a.salePrice,
                     "onUpdate:modelValue": (u) => a.salePrice = u,
                     precision: 2,
@@ -257,7 +258,7 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 "header-align": "center"
               }, {
                 default: i(({ row: a }) => [
-                  c(_, {
+                  c(k, {
                     modelValue: a.saleNum,
                     "onUpdate:modelValue": (u) => a.saleNum = u,
                     placeholder: s.$t("goodsSpu.saleNumRequireds"),
@@ -275,15 +276,15 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
                 align: "center"
               }, {
                 default: i((a) => [
-                  a.$index !== 0 ? (m(), h(I, {
+                  a.$index !== 0 ? (m(), h(o, {
                     key: 0,
-                    onClick: (u) => A(a),
+                    onClick: (u) => L(a),
                     size: "18",
                     style: { cursor: "pointer", color: "inherit" },
                     class: "hover-blue"
                   }, {
                     default: i(() => [
-                      c(V)
+                      c(_)
                     ]),
                     _: 2
                   }, 1032, ["onClick"])) : H("", !0)
@@ -293,13 +294,13 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
             ]),
             _: 1
           }, 8, ["data"]),
-          c(p, {
+          c(q, {
             icon: g(Z),
             class: "addButton",
-            onClick: R
+            onClick: A
           }, {
             default: i(() => [
-              x(J(g(C)("common.add")), 1)
+              x(J(g(N)("common.add")), 1)
             ]),
             _: 1
           }, 8, ["icon"])
@@ -308,7 +309,7 @@ const w = { key: 0 }, ee = /* @__PURE__ */ O({
       });
     };
   }
-}), ne = /* @__PURE__ */ W(ee, [["__scopeId", "data-v-f953fc89"]]);
+}), ne = /* @__PURE__ */ W(ee, [["__scopeId", "data-v-3701de30"]]);
 export {
   ne as default
 };

package/dist/{skuTable-9JJqGeRx.mjs → skuTable-D4LGL7B5.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-jCpYt-EU.mjs";
+import { D as O } from "./index-CMkWXcWe.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-f953fc89]{margin-top:15px;margin-bottom:20px;width:100%}.hover-blue[data-v-f953fc89]:hover{color:#409eff!important}.position-center[data-v-05285e5f]{position:absolute;right:0;top:30%;transform:translateY(-30%)}.plus-position[data-v-05285e5f]{position:absolute;right:0;top:0;margin-top:8px}.position-center[data-v-3bb58ee1]{position:absolute;right:0;top:30%;transform:translateY(-30%)}.plus-position[data-v-3bb58ee1]{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-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}

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

@@ -78,6 +78,8 @@ export interface GoodsSpuCreateReq extends EntityCreateReq {
     groupInfos?: Array<GoodsGroupInfoCreateReq>;
     goodsType?: string;
     note?: string;
+    minPrice?: number;
+    maxPrice?: number;
 }
 export interface GoodsSpuUpdateReq extends EntityUpdateReq {
     spuId?: string;
@@ -102,6 +104,8 @@ export interface GoodsSpuUpdateReq extends EntityUpdateReq {
     groupInfos?: Array<GoodsGroupInfoCreateReq>;
     goodsType?: string;
     note?: string;
+    minPrice?: number;
+    maxPrice?: number;
 }
 export type GoodsSpuFormReq = GoodsSpuCreateReq | GoodsSpuUpdateReq;
 export interface GoodsSpuEnableKey {

package/dts/lang/goods/zh-cn.d.ts

@@ -63,6 +63,10 @@ declare const _default: {
         brandIdRequired: string;
         labelIds: string;
         labelIdsRequired: string;
+        minPrice: string;
+        minPriceRequired: string;
+        maxPrice: string;
+        maxPriceRequired: string;
     };
     goodsBrandInfo: {
         name: string;

package/package.json

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