@titaui/pc 1.10.21 → 1.10.22

package/lib/components/dynamic/constant.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.OkrRiskMapping = exports.ObjectType = exports.ObjTypeMapText = exports.EStatusStatus2ClassType = exports.EObjType = exports.EFeedType = void 0;
+exports.OkrRiskMapping = exports.ObjectType = exports.ObjTypeMapText = exports.EStatusStatus2ClassType = exports.EShareType = exports.EObjType = exports.EFeedType = void 0;
 
 var _getLocale = require("../../utils/getLocale");
 
@@ -57,6 +57,15 @@ exports.EFeedType = EFeedType;
   EFeedType[EFeedType["PlanCommunication"] = 103] = "PlanCommunication";
 })(EFeedType || (exports.EFeedType = EFeedType = {}));
 
+var EShareType;
+exports.EShareType = EShareType;
+
+(function (EShareType) {
+  EShareType[EShareType["CommonShare"] = 0] = "CommonShare";
+  EShareType[EShareType["ShareToDynamic"] = 1] = "ShareToDynamic";
+  EShareType[EShareType["BiShare"] = 3] = "BiShare";
+})(EShareType || (exports.EShareType = EShareType = {}));
+
 var EObjType;
 exports.EObjType = EObjType;
 

package/lib/components/dynamic/dynamic-item/dynamic-chart/index.js

@@ -13,7 +13,11 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _supersetCharts = _interopRequireDefault(require("../../../superset-charts"));
 
-var _dynamicShareContent = _interopRequireDefault(require("../dynamic-share-content"));
+var _dynamicLeftQuoto = _interopRequireDefault(require("../../img/dynamic-left-quoto.svg"));
+
+var _dynamicRightQuoto = _interopRequireDefault(require("../../img/dynamic-right-quoto.svg"));
+
+var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
 
 var _context = require("../../context");
 
@@ -92,14 +96,27 @@ var DynamicChart = function DynamicChart(_ref) {
         color: "#89919f"
       }
     }, "\u63A8\u9001\u4E86\u6D88\u606F")
-  })), /*#__PURE__*/_react["default"].createElement(_dynamicShareContent["default"], {
-    prefix: prefixCls,
-    content: data.content,
-    contentRef: contentRef
-  }), /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefixCls, "__content")
+  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
+    className: (0, _classnames["default"])("".concat(prefixCls, "__content-quoto"), "".concat(prefixCls, "__content-quoto--left")),
+    src: _dynamicLeftQuoto["default"],
+    alt: "left"
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    ref: contentRef
+  }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
+    htmlText: data.content
+  }), /*#__PURE__*/_react["default"].createElement("img", {
+    className: (0, _classnames["default"])("".concat(prefixCls, "__content-quoto"), "".concat(prefixCls, "__content-quoto--right")),
+    src: _dynamicRightQuoto["default"],
+    alt: "right"
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefixCls, "__charts")
   }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], {
-    chartId: data.biId
+    chartId: data.biId,
+    layout: "feed-card",
+    width: 800,
+    height: 400
   })));
 };
 

package/lib/components/dynamic/dynamic-item/index.js

@@ -242,8 +242,8 @@ var DynamicItem = function DynamicItem(_ref) {
         });
 
       case _constant.EFeedType.Share:
-        if (data.shareType === 0) {
-          // TODO 需要后端新增shareType
+        if (data.shareType === _constant.EShareType.CommonShare) {
+          // 兼容一些 缺失shareType的 图表类型分享 过两天就会撤掉
           if (data.biId) {
             return /*#__PURE__*/_react["default"].createElement(_dynamicChart["default"], {
               data: data,
@@ -257,11 +257,14 @@ var DynamicItem = function DynamicItem(_ref) {
             hasDynamicOpereateAuth: hasDynamicOpereateAuth,
             dynamicShareIsShowToping: dynamicShareIsShowToping
           });
-        } // if (data.shareType === ) {
-        //   // 图表类型分享
-        //   return <DynamicChart data={data} onDeleteFeed={onDeleteFeed} />;
-        // }
+        }
 
+        if (data.shareType === _constant.EShareType.BiShare) {
+          return /*#__PURE__*/_react["default"].createElement(_dynamicChart["default"], {
+            data: data,
+            onDeleteFeed: onDeleteFeed
+          });
+        }
 
         return /*#__PURE__*/_react["default"].createElement(_dynamicShareToDynamic["default"], {
           data: data

package/lib/components/superset-charts/components/index.js

@@ -11,10 +11,14 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _init = require("../init");
 
+var _excluded = ["chartId"];
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -27,16 +31,17 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 var lazyOnce = (0, _init.lazyLoad)();
 
-var Chart = function Chart(_ref) {
+var Chart = function Chart(props) {
   var _window, _window$SupersetChart;
 
-  var chartId = _ref.chartId,
-      _ref$height = _ref.height,
-      height = _ref$height === void 0 ? 300 : _ref$height,
-      _ref$width = _ref.width,
-      width = _ref$width === void 0 ? 800 : _ref$width;
+  var chartId = props.chartId,
+      restProps = _objectWithoutProperties(props, _excluded);
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -44,20 +49,15 @@ var Chart = function Chart(_ref) {
       setLoading = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    var _lazyOnce;
-
-    (_lazyOnce = lazyOnce()) === null || _lazyOnce === void 0 ? void 0 : _lazyOnce.then(function () {
+    lazyOnce === null || lazyOnce === void 0 ? void 0 : lazyOnce.then(function () {
       setLoading(false);
     });
   }, []); // @ts-ignore
 
   var Chart = (_window = window) === null || _window === void 0 ? void 0 : (_window$SupersetChart = _window.SupersetChart) === null || _window$SupersetChart === void 0 ? void 0 : _window$SupersetChart.SupersetChart;
-  return /*#__PURE__*/_react["default"].createElement("div", null, Chart && !loading && chartId && /*#__PURE__*/_react["default"].createElement(Chart, {
-    id: chartId,
-    height: height,
-    width: width,
-    layout: "feed-card"
-  }));
+  return /*#__PURE__*/_react["default"].createElement("div", null, Chart && !loading && chartId && /*#__PURE__*/_react["default"].createElement(Chart, _extends({
+    id: chartId
+  }, restProps)));
 };
 
 var _default = Chart;

package/lib/components/superset-charts/init/index.js

@@ -12,6 +12,10 @@ var _useGetAssets = require("./use-get-assets");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function SingleInsert() {
   var instance;
   return function insert(assets) {
@@ -27,16 +31,31 @@ function SingleInsert() {
   };
 }
 
-var lazyLoad = function lazyLoad() {
-  var Single;
-  (0, _useGetAssets.getAssets)().then(function (res) {
-    Single = SingleInsert()(res);
-  });
-  return function () {
-    return Single;
-  }; // return () => {
-  //   return Single
-  // }
-};
+var lazyLoad = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var assets;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return (0, _useGetAssets.getAssets)();
+
+          case 2:
+            assets = _context.sent;
+            return _context.abrupt("return", SingleInsert()(assets));
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function lazyLoad() {
+    return _ref.apply(this, arguments);
+  };
+}();
 
 exports.lazyLoad = lazyLoad;

package/lib/components/superset-charts/init/use-get-assets.js

@@ -3,26 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transMetasToTableData = exports.getAssetsVersion = exports.getAssetsUri = exports.getAssets = exports.domain = exports["default"] = void 0;
-
-var _react = require("react");
+exports.transMetasToTableData = exports.getAssetsVersion = exports.getAssetsUri = exports.getAssets = exports.domain = void 0;
 
 var _axios = _interopRequireDefault(require("../utils/axios"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -92,7 +78,9 @@ exports.getAssetsUri = getAssetsUri;
 
 var getAssets = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var versionRes, assets, assetsUri;
+    var _JSON$parse$;
+
+    var res, cacheAssets, cacheVersion, resVersion, assetsUri;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -101,25 +89,27 @@ var getAssets = /*#__PURE__*/function () {
             return getAssetsVersion();
 
           case 2:
-            versionRes = _context.sent;
-            assets = localStorage.getItem("".concat(storageKey, "version"));
+            res = _context.sent;
+            cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
+            cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
+            resVersion = res[0].version;
 
-            if (!assets) {
-              _context.next = 6;
+            if (!(cacheAssets !== null && cacheVersion === resVersion)) {
+              _context.next = 8;
               break;
             }
 
-            return _context.abrupt("return", JSON.parse(assets));
-
-          case 6:
-            _context.next = 8;
-            return getAssetsUri(versionRes[0].version);
+            return _context.abrupt("return", JSON.parse(cacheAssets));
 
           case 8:
+            _context.next = 10;
+            return getAssetsUri(resVersion);
+
+          case 10:
             assetsUri = _context.sent;
             return _context.abrupt("return", assetsUri);
 
-          case 10:
+          case 12:
           case "end":
             return _context.stop();
         }
@@ -132,62 +122,4 @@ var getAssets = /*#__PURE__*/function () {
   };
 }();
 
-exports.getAssets = getAssets;
-
-var useInsertAssets = function useInsertAssets() {
-  var _useState = (0, _react.useState)([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      assetsUri = _useState2[0],
-      setAssetsUri = _useState2[1];
-
-  (0, _react.useEffect)(function () {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-      var versionRes, assets, cacheVersion, uri;
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return getAssetsVersion();
-
-            case 2:
-              versionRes = _context2.sent;
-              assets = localStorage.getItem("".concat(storageKey, "version"));
-              cacheVersion = "";
-
-              if (assets !== null) {
-                cacheVersion = JSON.parse(assets)[0].version;
-              }
-
-              if (!(assets !== null && assets === cacheVersion)) {
-                _context2.next = 10;
-                break;
-              }
-
-              setAssetsUri(JSON.parse(assets));
-              _context2.next = 14;
-              break;
-
-            case 10:
-              _context2.next = 12;
-              return getAssetsUri(versionRes[0].version);
-
-            case 12:
-              uri = _context2.sent;
-              setAssetsUri(uri);
-
-            case 14:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }))();
-  }, []);
-  return {
-    assetsUri: assetsUri
-  };
-};
-
-var _default = useInsertAssets;
-exports["default"] = _default;
+exports.getAssets = getAssets;

package/lib/index.js

@@ -417,7 +417,7 @@ Object.defineProperty(exports, "StatusTime", {
     return _statusTime["default"];
   }
 });
-Object.defineProperty(exports, "SupersetChart", {
+Object.defineProperty(exports, "SupersetCharts", {
   enumerable: true,
   get: function get() {
     return _supersetCharts["default"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.21",
+  "version": "1.10.22",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",

package/lib/components/dynamic/dynamic-item/dynamic-share-content/index.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _dynamicLeftQuoto = _interopRequireDefault(require("../../img/dynamic-left-quoto.svg"));
-
-var _dynamicRightQuoto = _interopRequireDefault(require("../../img/dynamic-right-quoto.svg"));
-
-var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var DynamicShareContent = function DynamicShareContent(_ref) {
-  var prefix = _ref.prefix,
-      content = _ref.content,
-      contentRef = _ref.contentRef;
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__content")
-  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
-    className: (0, _classnames["default"])("".concat(prefix, "__content-quoto"), "".concat(prefix, "__content-quoto--left")),
-    src: _dynamicLeftQuoto["default"],
-    alt: "left"
-  })), /*#__PURE__*/_react["default"].createElement("div", {
-    ref: contentRef
-  }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
-    htmlText: content
-  }), /*#__PURE__*/_react["default"].createElement("img", {
-    className: (0, _classnames["default"])("".concat(prefix, "__content-quoto"), "".concat(prefix, "__content-quoto--right")),
-    src: _dynamicRightQuoto["default"],
-    alt: "right"
-  })));
-};
-
-var _default = DynamicShareContent;
-exports["default"] = _default;