xyvcard-goods 0.0.16 → 0.0.18

package/dist/{edit-CN1CKgoW.mjs → edit-CYk6B5NG.mjs}

@@ -1,6 +1,6 @@
-import { defineComponent as F, ref as y, watchEffect as M, computed as H, resolveComponent as p, openBlock as B, createElementBlock as P, Fragment as O, createVNode as e, withCtx as a, createElementVNode as V, reactive as D, unref as t, createBlock as W, createCommentVNode as Z, createTextVNode as x } from "vue";
-import { ElMessageBox as J, ElMessage as L } from "element-plus";
-import { fileApi as w, routerUtil as A } from "jmash-core";
+import { defineComponent as F, ref as y, watchEffect as M, computed as H, resolveComponent as p, openBlock as B, createElementBlock as P, Fragment as O, createVNode as e, withCtx as a, createElementVNode as V, reactive as L, unref as t, createBlock as W, createCommentVNode as Z, createTextVNode as x } from "vue";
+import { ElMessageBox as J, ElMessage as A } from "element-plus";
+import { fileApi as w, routerUtil as D } from "jmash-core";
 import { useI18n as j } from "vue-i18n";
 import { _ as K } from "./skuTable-DbNThlFG.mjs";
 import { useRouter as Q, useRoute as X } from "vue-router";
@@ -8,7 +8,7 @@ import { D as c, C as Y } from "./index-CmKF2zdn.mjs";
 import { goodsSpuApi as $ } from "./index.mjs";
 import { g as ee } from "./index-BHmGYIuc.mjs";
 import { WangEditor as le } from "xyvcard-cms";
-import oe from "./skuForm-BW2yrv5Z.mjs";
+import oe from "./skuForm-H9IDa7ys.mjs";
 const te = ["src"], se = /* @__PURE__ */ F({
   __name: "ImageUpload",
   props: {
@@ -27,14 +27,14 @@ const te = ["src"], se = /* @__PURE__ */ F({
   },
   emits: ["update:modelValue"],
   setup(I, { emit: i }) {
-    const { t: h } = j(), f = y(w.uploadUrl()), T = y(w.authHeader()), l = y(), b = y(!1), U = y(""), q = I, g = y([]);
+    const { t: h } = j(), f = y(w.uploadUrl()), T = y(w.authHeader()), o = y(), v = y(!1), U = y(""), q = I, g = y([]);
     M(() => {
       g.value = q.modelValue.split(",").filter(Boolean);
     });
     const R = H(
       () => g.value.map((u) => ({ url: w.imageUrl(u), status: "success", uid: u }))
     ), C = (u) => {
-      U.value = u.url, b.value = !0;
+      U.value = u.url, v.value = !0;
     }, E = (u) => {
       const m = u.size / 1024 / 1024 < 2;
       ["image/jpeg", "image/png", "image/gif", "image/jpg"].includes(u.type) && !m && J.confirm(h("file.imageLtRequired"), h("file.warning"), {
@@ -45,17 +45,17 @@ const te = ["src"], se = /* @__PURE__ */ F({
       }).catch(() => (g.value.splice(-1, 1), r(), !1));
     }, s = (u) => {
       g.value = g.value.filter((m) => w.imageUrl(m) !== u.url), r();
-    }, o = (u) => {
+    }, l = (u) => {
       g.value.push(u.fileSrc), r();
     }, d = i, r = () => {
       d("update:modelValue", g.value.join(","));
     };
     return (u, m) => {
-      const S = p("Plus"), v = p("el-icon"), k = p("el-upload"), N = p("el-dialog");
+      const S = p("Plus"), b = p("el-icon"), k = p("el-upload"), N = p("el-dialog");
       return B(), P(O, null, [
         e(k, {
           ref_key: "uploadImageRef",
-          ref: l,
+          ref: o,
           "file-list": R.value,
           "onUpdate:fileList": m[0] || (m[0] = (_) => R.value = _),
           action: f.value,
@@ -64,11 +64,11 @@ const te = ["src"], se = /* @__PURE__ */ F({
           "list-type": I.listType,
           "on-preview": C,
           "before-upload": E,
-          "on-success": o,
+          "on-success": l,
           "on-remove": s
         }, {
           default: a(() => [
-            e(v, null, {
+            e(b, null, {
               default: a(() => [
                 e(S)
               ]),
@@ -78,8 +78,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
           _: 1
         }, 8, ["file-list", "action", "headers", "limit", "list-type"]),
         e(N, {
-          modelValue: b.value,
-          "onUpdate:modelValue": m[1] || (m[1] = (_) => b.value = _),
+          modelValue: v.value,
+          "onUpdate:modelValue": m[1] || (m[1] = (_) => v.value = _),
           fullscreen: !0
         }, {
           default: a(() => [
@@ -101,9 +101,9 @@ const te = ["src"], se = /* @__PURE__ */ F({
       c.goodsCategoryListBizLayDict.values,
       "=>goodsCategoryListBizLayDict "
     );
-    let l = D({
+    let o = L({
       requestId: Math.random() * 10 + "",
-      updateMask: "spuName,categoryId,spuCode,freightType,freightAmount,picUrls,shelf,saleNum,sellPoint,specType,description",
+      updateMask: "spuName,categoryIds,spuCode,freightType,freightAmount,picUrls,shelf,saleNum,sellPoint,specType,description",
       skuSpecValues: [],
       freightType: c.freightTypeEnum.values[0].key,
       freightAmount: 0,
@@ -111,15 +111,15 @@ const te = ["src"], se = /* @__PURE__ */ F({
       specType: c.specTypeEnum.values[0].key
       // shopId: Dict.shopInfoBizDict.values[0]?.key,
     });
-    const b = (s, o, d) => {
+    const v = (s, l, d) => {
       var u;
-      const r = (u = l.picUrls) == null ? void 0 : u.split(",").filter(Boolean);
+      const r = (u = o.picUrls) == null ? void 0 : u.split(",").filter(Boolean);
       if (r != null && r.length) {
         if ((r == null ? void 0 : r.length) < 3)
           return d(new Error(i("goodsSpu.imageListsError")));
         d();
       } else return d(new Error(i("goodsSpu.picUrlsRequired")));
-    }, U = D({
+    }, U = L({
       // shopId: [
       //   {
       //     required: true,
@@ -134,7 +134,7 @@ const te = ["src"], se = /* @__PURE__ */ F({
           trigger: "blur"
         }
       ],
-      categoryId: [
+      categoryIds: [
         {
           required: !0,
           message: i("goodsSpu.categoryIdRequired"),
@@ -164,7 +164,7 @@ const te = ["src"], se = /* @__PURE__ */ F({
       ],
       picUrls: [
         {
-          validator: b,
+          validator: v,
           trigger: "change"
         }
       ],
@@ -184,51 +184,51 @@ const te = ["src"], se = /* @__PURE__ */ F({
       ]
     }), q = y(!1);
     function g(s) {
-      l.skuSpecValues.push(s), l.skuSpecValues = l.skuSpecValues.slice(-1);
+      o.skuSpecValues.push(s), o.skuSpecValues = o.skuSpecValues.slice(-1);
     }
     function R(s) {
-      s.forEach((o) => {
+      s.forEach((l) => {
         var d;
-        l.specId = (d = o.specValues) == null ? void 0 : d.map((r) => r.specId), l.skuSpecValues.push(o);
-      }), l.skuSpecValues = l.skuSpecValues.slice(-s.length);
+        o.specId = (d = l.specValues) == null ? void 0 : d.map((r) => r.specId), o.skuSpecValues.push(l);
+      }), o.skuSpecValues = o.skuSpecValues.slice(-s.length);
     }
     f.query.spuId && $.findById({ spuId: f.query.spuId }).then(({ data: s }) => {
-      Object.assign(l, s), q.value = !0, ee.findById({ spuId: f.query.spuId }).then(({ data: o }) => {
-        l.ensureIds = o.ensures;
+      Object.assign(o, s), q.value = !0, ee.findById({ spuId: f.query.spuId }).then(({ data: l }) => {
+        o.ensureIds = l.ensures;
       });
     });
     const C = async () => {
       var s;
-      await ((s = T.value) == null ? void 0 : s.validate((o) => {
-        o && (f.query.spuId ? $.update(l).then((d) => {
-          d.status === 200 && (L({
+      await ((s = T.value) == null ? void 0 : s.validate((l) => {
+        l && (f.query.spuId ? $.update(o).then((d) => {
+          d.status === 200 && (A({
             message: i("common.submitSuccess"),
             type: "success"
-          }), A.closeTagView(f.fullPath, h, !1));
-        }) : $.create(l).then((d) => {
-          d.status === 200 && (L({
+          }), D.closeTagView(f.fullPath, h, !1));
+        }) : $.create(o).then((d) => {
+          d.status === 200 && (A({
             message: i("common.submitSuccess"),
             type: "success"
-          }), A.closeTagView(f.fullPath, h, !1));
+          }), D.closeTagView(f.fullPath, h, !1));
         }));
       }));
     };
     function E(s) {
-      s === "FREIGHT_FREE" && (l.freightAmount = 0);
+      s === "FREIGHT_FREE" && (o.freightAmount = 0);
     }
-    return (s, o) => {
-      const d = p("el-input"), r = p("el-form-item"), u = p("el-col"), m = p("el-tree-select"), S = p("jmash-enum-radio"), v = p("el-input-number"), k = ae, N = p("jmash-dict-checkbox"), _ = p("el-row"), G = p("el-button"), z = p("el-form");
+    return (s, l) => {
+      const d = p("el-input"), r = p("el-form-item"), u = p("el-col"), m = p("el-tree-select"), S = p("jmash-enum-radio"), b = p("el-input-number"), k = ae, N = p("jmash-dict-checkbox"), _ = p("el-row"), G = p("el-button"), z = p("el-form");
       return B(), P("div", ue, [
         V("div", re, [
           e(z, {
             ref_key: "goodsSpuFormRef",
             ref: T,
-            model: t(l),
+            model: t(o),
             "label-width": "120px",
             rules: U
           }, {
             default: a(() => [
-              o[14] || (o[14] = V("div", { class: "title-content" }, "基本信息", -1)),
+              l[14] || (l[14] = V("div", { class: "title-content" }, "基本信息", -1)),
               e(_, null, {
                 default: a(() => [
                   e(u, { span: 12 }, {
@@ -239,8 +239,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
                       }, {
                         default: a(() => [
                           e(d, {
-                            modelValue: t(l).spuName,
-                            "onUpdate:modelValue": o[0] || (o[0] = (n) => t(l).spuName = n),
+                            modelValue: t(o).spuName,
+                            "onUpdate:modelValue": l[0] || (l[0] = (n) => t(o).spuName = n),
                             placeholder: s.$t("goodsSpu.spuNameRequired"),
                             maxlength: "60",
                             "show-word-limit": "",
@@ -256,12 +256,12 @@ const te = ["src"], se = /* @__PURE__ */ F({
                     default: a(() => [
                       e(r, {
                         label: s.$t("goodsSpu.categoryId"),
-                        prop: "categoryId"
+                        prop: "categoryIds"
                       }, {
                         default: a(() => [
                           e(m, {
-                            modelValue: t(l).categoryId,
-                            "onUpdate:modelValue": o[1] || (o[1] = (n) => t(l).categoryId = n),
+                            modelValue: t(o).categoryIds,
+                            "onUpdate:modelValue": l[1] || (l[1] = (n) => t(o).categoryIds = n),
                             data: t(c).goodsCategoryListBizLayDict.values,
                             multiple: "",
                             "render-after-expand": !1,
@@ -283,8 +283,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
                       }, {
                         default: a(() => [
                           e(d, {
-                            modelValue: t(l).spuCode,
-                            "onUpdate:modelValue": o[2] || (o[2] = (n) => t(l).spuCode = n),
+                            modelValue: t(o).spuCode,
+                            "onUpdate:modelValue": l[2] || (l[2] = (n) => t(o).spuCode = n),
                             placeholder: s.$t("goodsSpu.spuCodeRequired"),
                             maxlength: "15",
                             "show-word-limit": "",
@@ -304,8 +304,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
                       }, {
                         default: a(() => [
                           e(S, {
-                            modelValue: t(l).freightType,
-                            "onUpdate:modelValue": o[3] || (o[3] = (n) => t(l).freightType = n),
+                            modelValue: t(o).freightType,
+                            "onUpdate:modelValue": l[3] || (l[3] = (n) => t(o).freightType = n),
                             data: t(c).freightTypeEnum.values,
                             onChange: E
                           }, null, 8, ["modelValue", "data"])
@@ -322,10 +322,10 @@ const te = ["src"], se = /* @__PURE__ */ F({
                         prop: "freightAmount"
                       }, {
                         default: a(() => [
-                          e(v, {
-                            modelValue: t(l).freightAmount,
-                            "onUpdate:modelValue": o[4] || (o[4] = (n) => t(l).freightAmount = n),
-                            readonly: t(l).freightType === "FREIGHT_FREE",
+                          e(b, {
+                            modelValue: t(o).freightAmount,
+                            "onUpdate:modelValue": l[4] || (l[4] = (n) => t(o).freightAmount = n),
+                            readonly: t(o).freightType === "FREIGHT_FREE",
                             precision: 2,
                             step: 0.1,
                             controls: !1,
@@ -348,12 +348,12 @@ const te = ["src"], se = /* @__PURE__ */ F({
                         default: a(() => [
                           V("div", ne, [
                             e(k, {
-                              modelValue: t(l).picUrls,
-                              "onUpdate:modelValue": o[5] || (o[5] = (n) => t(l).picUrls = n),
+                              modelValue: t(o).picUrls,
+                              "onUpdate:modelValue": l[5] || (l[5] = (n) => t(o).picUrls = n),
                               limit: 6,
                               "list-type": "picture-card"
                             }, null, 8, ["modelValue"]),
-                            o[12] || (o[12] = V("div", { class: "red-color" }, " 推荐尺寸：100*100或同比例图片，最少上传3张 ", -1))
+                            l[12] || (l[12] = V("div", { class: "red-color" }, " 推荐尺寸：100*100或同比例图片，最少上传3张 ", -1))
                           ])
                         ]),
                         _: 1
@@ -369,8 +369,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
                       }, {
                         default: a(() => [
                           e(S, {
-                            modelValue: t(l).shelf,
-                            "onUpdate:modelValue": o[6] || (o[6] = (n) => t(l).shelf = n),
+                            modelValue: t(o).shelf,
+                            "onUpdate:modelValue": l[6] || (l[6] = (n) => t(o).shelf = n),
                             data: t(c).shelfDict.values
                           }, null, 8, ["modelValue", "data"])
                         ]),
@@ -386,9 +386,9 @@ const te = ["src"], se = /* @__PURE__ */ F({
                         prop: "saleNum"
                       }, {
                         default: a(() => [
-                          e(v, {
-                            modelValue: t(l).saleNum,
-                            "onUpdate:modelValue": o[7] || (o[7] = (n) => t(l).saleNum = n),
+                          e(b, {
+                            modelValue: t(o).saleNum,
+                            "onUpdate:modelValue": l[7] || (l[7] = (n) => t(o).saleNum = n),
                             placeholder: s.$t("goodsSpu.saleNumRequired"),
                             class: "w-full",
                             min: 0,
@@ -409,8 +409,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
                       }, {
                         default: a(() => [
                           e(d, {
-                            modelValue: t(l).sellPoint,
-                            "onUpdate:modelValue": o[8] || (o[8] = (n) => t(l).sellPoint = n),
+                            modelValue: t(o).sellPoint,
+                            "onUpdate:modelValue": l[8] || (l[8] = (n) => t(o).sellPoint = n),
                             placeholder: s.$t("goodsSpu.sellPointRequired"),
                             maxlength: "250",
                             "show-word-limit": "",
@@ -432,8 +432,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
                       }, {
                         default: a(() => [
                           e(N, {
-                            modelValue: t(l).ensureIds,
-                            "onUpdate:modelValue": o[9] || (o[9] = (n) => t(l).ensureIds = n),
+                            modelValue: t(o).ensureIds,
+                            "onUpdate:modelValue": l[9] || (l[9] = (n) => t(o).ensureIds = n),
                             "type-code": t(Y).DICT_GOODS_ENSURE
                           }, null, 8, ["modelValue", "type-code"])
                         ]),
@@ -445,7 +445,7 @@ const te = ["src"], se = /* @__PURE__ */ F({
                 ]),
                 _: 1
               }),
-              o[15] || (o[15] = V("div", { class: "title-content" }, "商品规格", -1)),
+              l[15] || (l[15] = V("div", { class: "title-content" }, "商品规格", -1)),
               e(_, null, {
                 default: a(() => [
                   e(u, { span: 24 }, {
@@ -456,8 +456,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
                       }, {
                         default: a(() => [
                           e(S, {
-                            modelValue: t(l).specType,
-                            "onUpdate:modelValue": o[10] || (o[10] = (n) => t(l).specType = n),
+                            modelValue: t(o).specType,
+                            "onUpdate:modelValue": l[10] || (l[10] = (n) => t(o).specType = n),
                             data: t(c).specTypeEnum.values
                           }, null, 8, ["modelValue", "data"])
                         ]),
@@ -468,16 +468,15 @@ const te = ["src"], se = /* @__PURE__ */ F({
                   }),
                   !t(f).query.spuId || q.value ? (B(), W(oe, {
                     key: 0,
-                    "spec-type": t(l).specType,
-                    form: t(l),
-                    isDisabled: !t(l).shopId,
+                    "spec-type": t(o).specType,
+                    form: t(o),
                     onGetGoodsSku: g,
                     onGetFormData: R
-                  }, null, 8, ["spec-type", "form", "isDisabled"])) : Z("", !0)
+                  }, null, 8, ["spec-type", "form"])) : Z("", !0)
                 ]),
                 _: 1
               }),
-              o[16] || (o[16] = V("div", { class: "title-content" }, "商品详情", -1)),
+              l[16] || (l[16] = V("div", { class: "title-content" }, "商品详情", -1)),
               e(_, null, {
                 default: a(() => [
                   e(u, { span: 24 }, {
@@ -488,8 +487,8 @@ const te = ["src"], se = /* @__PURE__ */ F({
                       }, {
                         default: a(() => [
                           e(t(le), {
-                            modelValue: t(l).description,
-                            "onUpdate:modelValue": o[11] || (o[11] = (n) => t(l).description = n),
+                            modelValue: t(o).description,
+                            "onUpdate:modelValue": l[11] || (l[11] = (n) => t(o).description = n),
                             style: { width: "100%" }
                           }, null, 8, ["modelValue"])
                         ]),
@@ -504,7 +503,7 @@ const te = ["src"], se = /* @__PURE__ */ F({
                         type: "primary",
                         onClick: C
                       }, {
-                        default: a(() => o[13] || (o[13] = [
+                        default: a(() => l[13] || (l[13] = [
                           x("保存")
                         ])),
                         _: 1,

package/dist/{goodsList-C2113q3G.mjs → goodsList-0TMcPn_Q.mjs}

@@ -1,4 +1,4 @@
-import { _ as f } from "./goodsList.vue_vue_type_script_setup_true_lang-C7lnUpja.mjs";
+import { _ as f } from "./goodsList.vue_vue_type_script_setup_true_lang-Cd7-ryQA.mjs";
 export {
   f as default
 };

package/dist/{goodsList.vue_vue_type_script_setup_true_lang-C7lnUpja.mjs → goodsList.vue_vue_type_script_setup_true_lang-Cd7-ryQA.mjs}

@@ -282,7 +282,7 @@ const be = { class: "app-container" }, Ce = { class: "search-container" }, Pe =
                     ]),
                     _: 1
                   }),
-                  t(L, { span: 6 }, {
+                  t(L, { span: 12 }, {
                     default: o(() => [
                       t(S, { class: "search-btn" }, {
                         default: o(() => [
@@ -526,7 +526,9 @@ const be = { class: "app-container" }, Ce = { class: "search-container" }, Pe =
               onSortChange: ae
             }, {
               categoryId: o((e) => [
-                b("span", null, u(s(T).goodsCategoryListBizLayDict.getValue(e.data.row.categoryId)), 1)
+                b("span", null, u(s(T).goodsCategoryListBizLayDict.getValue(
+                  e.data.row.categoryId
+                )), 1)
               ]),
               picUrls: o((e) => [
                 b("span", null, [

package/dist/{index-DO2m_h7R.mjs → index-nSAowuoJ.mjs}

@@ -1,7 +1,7 @@
 import { defineComponent as b, ref as S, onMounted as A, resolveComponent as p, openBlock as t, createElementBlock as c, createVNode as V, withCtx as m, Fragment as C, renderList as P, unref as h, createBlock as i, createCommentVNode as y } from "vue";
 import { useRoute as L } from "vue-router";
 import { D as _, C as l } from "./index-CmKF2zdn.mjs";
-import { _ as k } from "./goodsList.vue_vue_type_script_setup_true_lang-C7lnUpja.mjs";
+import { _ as k } from "./goodsList.vue_vue_type_script_setup_true_lang-Cd7-ryQA.mjs";
 const N = { class: "app-container" }, x = /* @__PURE__ */ b({
   __name: "index",
   setup(g) {

package/dist/index.mjs

@@ -62,7 +62,7 @@ function Ps(e) {
   let s = e.global.getLocaleMessage("en");
   s = Tt(s, xs), e.global.setLocaleMessage("zh-cn", t), e.global.setLocaleMessage("en", s);
 }
-const Ns = () => import("./edit-CN1CKgoW.mjs"), Ws = () => import("./info-D6MWRZ1y.mjs"), Fs = [
+const Ns = () => import("./edit-CYk6B5NG.mjs"), Ws = () => import("./info-D6MWRZ1y.mjs"), Fs = [
   {
     path: "/rawgoods",
     component: Ys,
@@ -2806,7 +2806,7 @@ class Ii {
     });
   }
 }
-const Hi = new Ii(), Ui = /* @__PURE__ */ Object.assign({ "./views/goods/goods-category/edit.vue": () => import("./edit-E57LIt5x.mjs"), "./views/goods/goods-category/index.vue": () => import("./index-CnyW3rxw.mjs"), "./views/goods/goods-spu/edit.vue": () => import("./edit-CN1CKgoW.mjs"), "./views/goods/goods-spu/goodsList.vue": () => import("./goodsList-C2113q3G.mjs"), "./views/goods/goods-spu/index.vue": () => import("./index-DO2m_h7R.mjs"), "./views/goods/goods-spu/info.vue": () => import("./info-D6MWRZ1y.mjs"), "./views/goods/goods-spu/skuForm.vue": () => import("./skuForm-BW2yrv5Z.mjs"), "./views/goods/goods-spu/skuTable.vue": () => import("./skuTable-DbNThlFG.mjs").then((e) => e.a) }), Ei = {
+const Hi = new Ii(), Ui = /* @__PURE__ */ Object.assign({ "./views/goods/goods-category/edit.vue": () => import("./edit-E57LIt5x.mjs"), "./views/goods/goods-category/index.vue": () => import("./index-CnyW3rxw.mjs"), "./views/goods/goods-spu/edit.vue": () => import("./edit-CYk6B5NG.mjs"), "./views/goods/goods-spu/goodsList.vue": () => import("./goodsList-0TMcPn_Q.mjs"), "./views/goods/goods-spu/index.vue": () => import("./index-nSAowuoJ.mjs"), "./views/goods/goods-spu/info.vue": () => import("./info-D6MWRZ1y.mjs"), "./views/goods/goods-spu/skuForm.vue": () => import("./skuForm-H9IDa7ys.mjs"), "./views/goods/goods-spu/skuTable.vue": () => import("./skuTable-DbNThlFG.mjs").then((e) => e.a) }), Ei = {
   install(e) {
     Os(Ui, 7), Ps(bs), Ts(Fs), e.use(Ci);
   }

package/dist/{skuForm-BW2yrv5Z.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-CmKF2zdn.mjs";
-import { s as de, _ as re } from "./skuTable-DbNThlFG.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/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/goods-spu/types.d.ts

@@ -63,6 +63,7 @@ export interface GoodsSpuCreateReq extends EntityCreateReq {
     specType?: string;
     specId?: Array<string>;
     skuSpecValues: Array<GoodsSkuModel>;
+    categoryIds?: Array<string>;
 }
 export interface GoodsSpuUpdateReq extends EntityUpdateReq {
     spuId?: string;
@@ -81,6 +82,7 @@ export interface GoodsSpuUpdateReq extends EntityUpdateReq {
     ensureIds?: Array<string>;
     specId?: Array<string>;
     skuSpecValues: Array<GoodsSkuModel>;
+    categoryIds?: Array<string>;
 }
 export type GoodsSpuFormReq = GoodsSpuCreateReq | GoodsSpuUpdateReq;
 export interface GoodsSpuEnableKey {

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.16",
+  "version": "0.0.18",
   "private": false,
   "module": "dist/index.mjs",
   "types": "dts/index.d.ts",