@kmkf-fe-packages/basic-components 0.8.9-alpha.1 → 0.8.9-alpha.5

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeHandle, useCallback } from 'react';
+import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeHandle } from 'react';
 import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Checkbox, Row, Col, Slider, Rate, Button, Form, Tabs, Modal, ConfigProvider, Pagination, Popover, Table } from 'antd';
 import { EyeOutlined, DeleteOutlined, InboxOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
@@ -9701,13 +9701,9 @@ var ItemList = function ItemList(props) {
 
 var columns = [{
   dataIndex: 'index',
-  title: '序号',
+  title: 'No',
   render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: '30px'
-      }
-    }, index + 1);
+    return /*#__PURE__*/React.createElement("span", null, index + 1);
   }
 }, {
   dataIndex: 'skuName',
@@ -9757,12 +9753,12 @@ var columns = [{
 var GoodsModal$1 = function GoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
-      open: function open() {
+      open: function open(shopCode) {
         setVisible(true);
         setPageNo(1);
         setSelect([]);
         setSelectIds([]);
-        queryItems();
+        queryItems(shopCode);
         getShopList();
       }
     };
@@ -9771,7 +9767,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     shopId = props.shopId,
     shopList = props.shopList,
     width = props.width,
-    shopCode = props.shopCode;
+    companyKey = props.companyKey;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -9826,44 +9822,49 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   /**
    * 查询商品
    */
-  var queryItems = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var params, res, products, newProducts;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          form.setFieldsValue({
-            shopId: shopCode
-          });
-          _context.prev = 1;
-          setLoading(true);
-          params = {
-            shopCode: shopCode
-          };
-          _context.next = 6;
-          return extendRequest('/qy/gdfw/product/bsListProduct', {
-            method: 'post',
-            data: params
-          });
-        case 6:
-          res = _context.sent;
-          products = res.data.products;
-          newProducts = (products || []).map(function (item, index) {
-            return _objectSpread2(_objectSpread2({}, item), {}, {
-              index: index + 1
+  var queryItems = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(shopCode) {
+      var params, res, products, newProducts;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            form.setFieldsValue({
+              shopId: shopCode
             });
-          });
-          setAllList(_toConsumableArray(newProducts));
-          initData(_toConsumableArray(newProducts));
-        case 11:
-          _context.prev = 11;
-          setLoading(false);
-          return _context.finish(11);
-        case 14:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[1,, 11, 14]]);
-  })), [shopCode]);
+            _context.prev = 1;
+            setLoading(true);
+            params = {
+              shopCode: shopCode
+            };
+            _context.next = 6;
+            return extendRequest('/qy/gdfw/product/bsListProduct', {
+              method: 'post',
+              data: params
+            });
+          case 6:
+            res = _context.sent;
+            products = res.data.products;
+            newProducts = (products || []).map(function (item, index) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                index: index + 1
+              });
+            });
+            setAllList(_toConsumableArray(newProducts));
+            initData(_toConsumableArray(newProducts));
+          case 11:
+            _context.prev = 11;
+            setLoading(false);
+            return _context.finish(11);
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1,, 11, 14]]);
+    }));
+    return function queryItems(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -9911,31 +9912,32 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var getShopList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _yield$request, success, data, _ref3, list;
+      var _yield$request, success, data, obj, list;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return extendRequest('/qy/gdfw/product/bsListProduct', {
-              method: 'post',
-              data: {
-                shopCode: 'DP007'
+            return extendRequest('/qy/diamond/getConfigInfo', {
+              method: 'get',
+              params: {
+                key: 'company-third-shop-info'
               }
             });
           case 2:
             _yield$request = _context2.sent;
             success = _yield$request.success;
             data = _yield$request.data;
+            obj = JSON.parse(data || '{}');
             if (success) {
-              list = (_ref3 = data.products || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (item, index) {
+              list = ((obj === null || obj === void 0 ? void 0 : obj[companyKey]) || []).map(function (item) {
                 return {
-                  label: "\u5E97\u94FA\u540D\u79F0".concat(index),
-                  value: index
+                  label: item.shopName,
+                  value: item.shopCode
                 };
               });
               setShopList(list);
             }
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -9947,6 +9949,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }();
   var onValuesChange = function onValuesChange(changedValues) {
     if (changedValues === null || changedValues === void 0 ? void 0 : changedValues['shopId']) {
+      queryItems(changedValues === null || changedValues === void 0 ? void 0 : changedValues.shopId);
       pubsub.publish('changeShopCode', {
         shopCode: changedValues.shopId
       });
@@ -10072,6 +10075,8 @@ var GoodItem = function GoodItem(props) {
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
     shopCode = props.shopCode,
+    _props$companyKey = props.companyKey,
+    companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
     onSelect = props.onSelect,
     onDelete = props.onDelete;
   var refModal = useRef();
@@ -10253,7 +10258,7 @@ var GoodItem = function GoodItem(props) {
     }));
   };
   var handleChangeGoods = function handleChangeGoods() {
-    refModal.current.open();
+    refModal.current.open(shopCode);
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
@@ -10293,7 +10298,7 @@ var GoodItem = function GoodItem(props) {
     shopList: shopList,
     shopId: shopId,
     maxLength: maxLength,
-    shopCode: shopCode
+    companyKey: companyKey
   }));
 };
 
@@ -10347,6 +10352,7 @@ var BsGoods = function BsGoods(props) {
       }
     });
     pubsub.subscribeOnce('changeShopCode', function (type, data) {
+      console.log(data);
       onChange(_objectSpread2(_objectSpread2({}, valueRef === null || valueRef === void 0 ? void 0 : valueRef.current), {}, {
         shopCode: data.shopCode
       }));

package/dist/index.js

@@ -9712,13 +9712,9 @@ var ItemList = function ItemList(props) {
 
 var columns = [{
   dataIndex: 'index',
-  title: '序号',
+  title: 'No',
   render: function render(val, record, index) {
-    return /*#__PURE__*/React__default['default'].createElement("div", {
-      style: {
-        width: '30px'
-      }
-    }, index + 1);
+    return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
   }
 }, {
   dataIndex: 'skuName',
@@ -9768,12 +9764,12 @@ var columns = [{
 var GoodsModal$1 = function GoodsModal(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
-      open: function open() {
+      open: function open(shopCode) {
         setVisible(true);
         setPageNo(1);
         setSelect([]);
         setSelectIds([]);
-        queryItems();
+        queryItems(shopCode);
         getShopList();
       }
     };
@@ -9782,7 +9778,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     shopId = props.shopId,
     shopList = props.shopList,
     width = props.width,
-    shopCode = props.shopCode;
+    companyKey = props.companyKey;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -9837,44 +9833,49 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   /**
    * 查询商品
    */
-  var queryItems = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var params, res, products, newProducts;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          form.setFieldsValue({
-            shopId: shopCode
-          });
-          _context.prev = 1;
-          setLoading(true);
-          params = {
-            shopCode: shopCode
-          };
-          _context.next = 6;
-          return extendRequest('/qy/gdfw/product/bsListProduct', {
-            method: 'post',
-            data: params
-          });
-        case 6:
-          res = _context.sent;
-          products = res.data.products;
-          newProducts = (products || []).map(function (item, index) {
-            return _objectSpread2(_objectSpread2({}, item), {}, {
-              index: index + 1
+  var queryItems = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(shopCode) {
+      var params, res, products, newProducts;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            form.setFieldsValue({
+              shopId: shopCode
             });
-          });
-          setAllList(_toConsumableArray(newProducts));
-          initData(_toConsumableArray(newProducts));
-        case 11:
-          _context.prev = 11;
-          setLoading(false);
-          return _context.finish(11);
-        case 14:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[1,, 11, 14]]);
-  })), [shopCode]);
+            _context.prev = 1;
+            setLoading(true);
+            params = {
+              shopCode: shopCode
+            };
+            _context.next = 6;
+            return extendRequest('/qy/gdfw/product/bsListProduct', {
+              method: 'post',
+              data: params
+            });
+          case 6:
+            res = _context.sent;
+            products = res.data.products;
+            newProducts = (products || []).map(function (item, index) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                index: index + 1
+              });
+            });
+            setAllList(_toConsumableArray(newProducts));
+            initData(_toConsumableArray(newProducts));
+          case 11:
+            _context.prev = 11;
+            setLoading(false);
+            return _context.finish(11);
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1,, 11, 14]]);
+    }));
+    return function queryItems(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -9922,31 +9923,32 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var getShopList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _yield$request, success, data, _ref3, list;
+      var _yield$request, success, data, obj, list;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return extendRequest('/qy/gdfw/product/bsListProduct', {
-              method: 'post',
-              data: {
-                shopCode: 'DP007'
+            return extendRequest('/qy/diamond/getConfigInfo', {
+              method: 'get',
+              params: {
+                key: 'company-third-shop-info'
               }
             });
           case 2:
             _yield$request = _context2.sent;
             success = _yield$request.success;
             data = _yield$request.data;
+            obj = JSON.parse(data || '{}');
             if (success) {
-              list = (_ref3 = data.products || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (item, index) {
+              list = ((obj === null || obj === void 0 ? void 0 : obj[companyKey]) || []).map(function (item) {
                 return {
-                  label: "\u5E97\u94FA\u540D\u79F0".concat(index),
-                  value: index
+                  label: item.shopName,
+                  value: item.shopCode
                 };
               });
               setShopList(list);
             }
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -9958,6 +9960,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }();
   var onValuesChange = function onValuesChange(changedValues) {
     if (changedValues === null || changedValues === void 0 ? void 0 : changedValues['shopId']) {
+      queryItems(changedValues === null || changedValues === void 0 ? void 0 : changedValues.shopId);
       pubsub__default['default'].publish('changeShopCode', {
         shopCode: changedValues.shopId
       });
@@ -10083,6 +10086,8 @@ var GoodItem = function GoodItem(props) {
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
     shopCode = props.shopCode,
+    _props$companyKey = props.companyKey,
+    companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
     onSelect = props.onSelect,
     onDelete = props.onDelete;
   var refModal = React.useRef();
@@ -10264,7 +10269,7 @@ var GoodItem = function GoodItem(props) {
     }));
   };
   var handleChangeGoods = function handleChangeGoods() {
-    refModal.current.open();
+    refModal.current.open(shopCode);
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
@@ -10304,7 +10309,7 @@ var GoodItem = function GoodItem(props) {
     shopList: shopList,
     shopId: shopId,
     maxLength: maxLength,
-    shopCode: shopCode
+    companyKey: companyKey
   }));
 };
 
@@ -10358,6 +10363,7 @@ var BsGoods = function BsGoods(props) {
       }
     });
     pubsub__default['default'].subscribeOnce('changeShopCode', function (type, data) {
+      console.log(data);
       onChange(_objectSpread2(_objectSpread2({}, valueRef === null || valueRef === void 0 ? void 0 : valueRef.current), {}, {
         shopCode: data.shopCode
       }));

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -15,6 +15,7 @@ interface BsGoodsProps {
     otherOperations: any;
     canUpdateNumber: boolean;
     shopCode: string;
+    companyKey: string;
     onChange: (val: any[]) => void;
     onSelect: (val: any[]) => void;
     onDelete: (val: any[]) => void;

package/dist/src/bs/component/GoodsModal.d.ts

@@ -5,6 +5,7 @@ interface GoodModelProps {
     shopList: any[];
     width?: string | number;
     shopCode?: string;
+    companyKey: string;
     onSubmit: (...args: any[]) => any;
 }
 declare const _default: React.ForwardRefExoticComponent<GoodModelProps & React.RefAttributes<unknown>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.8.9-alpha.1",
+  "version": "0.8.9-alpha.5",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^0.8.7-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.8.9-alpha.5",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ac4f58b96e2bde8340eefe7264e26a691078c729"
+  "gitHead": "7aad6296b89633808b2c665d6f40a5af8e5ebd7b"
 }