@chaoswise/business 0.0.14 → 0.0.16

package/lib/AggregateSearch/components/DropDown/index.js

@@ -213,8 +213,12 @@ var DropDown = function DropDown(props) {
     setHistoryList = _useState12[1];
   var _useState13 = useState(0),
     _useState14 = _slicedToArray(_useState13, 2),
-    height = _useState14[0],
-    setHeight = _useState14[1];
+    width = _useState14[0],
+    setWidth = _useState14[1];
+  var _useState15 = useState(0),
+    _useState16 = _slicedToArray(_useState15, 2),
+    height = _useState16[0],
+    setHeight = _useState16[1];
   var watcher = useRef(null);
   useEffect(function () {
     // 监听外壳容器变化
@@ -227,8 +231,10 @@ var DropDown = function DropDown(props) {
           var target = entry.target,
             _entry$contentRect = entry.contentRect,
             _entry$contentRect2 = _entry$contentRect === void 0 ? {} : _entry$contentRect,
+            _width = _entry$contentRect2.width,
             _height = _entry$contentRect2.height;
           if (target === containerWrapperRef.current) {
+            setWidth(_width);
             setHeight(_height);
           }
         }
@@ -579,7 +585,9 @@ var DropDown = function DropDown(props) {
     },
     overlayStyle: {
       top: Number(height + 2),
-      left: 0
+      left: 0,
+      minWidth: Number(width + 2),
+      maxWidth: Number(width + 2)
     } // 2是边框高度
   }, children);
 };

package/lib/AggregateSearch/components/SwitchBtn/index.js

@@ -18,7 +18,8 @@ var SwitchBtn = function SwitchBtn(_ref) {
     onClick: onClick
   }, /*#__PURE__*/React.createElement("img", {
     src: icon,
-    alt: ""
+    alt: "",
+    mode: mode
   })));
 };
 export default SwitchBtn;

package/lib/AggregateSearch/components/SwitchBtn/index.less

@@ -8,6 +8,7 @@
   border-radius: 0 2px 2px 0;
   display: flex;
   padding: 0 9px;
+  justify-content: center;
   align-items: flex-start;
   align-self: stretch; // 使得高度和父元素一致
   width: 35px;
@@ -15,6 +16,16 @@
     border-left-color: @input-hover-border-color;
   }
   img{
-    transform: translateY(8px);
+    transform: translateY(7px);
+    &[mode="tag"]{
+      transform: translateY(8px);
+    }
+  }
+}
+.aggregate-search-text-wrapper.syntax-error{
+  .aggregate-search-switch-btn{
+    &:hover{
+      border-left-color: @red-5;
+    }
   }
 }

package/lib/AggregateSearch/index.js

@@ -10,7 +10,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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); }); }; }
 import React, { useEffect, useRef, useState, useMemo } from "react";
 import PropTypes from "prop-types";
-import { textInit, getCursorPosition, getCursorNodeAndIndex, setCursorPosition, genHtmlAndSyntaxCheckResByString, checkSyntax } from "./utils";
+import { textInit, getCursorPosition, getCursorNodeAndIndex, setCursorPosition, genHtmlAndSyntaxCheckResByString, checkSyntax, cloneDomRemoveCloseBtn } from "./utils";
 import SwitchBtn from "./components/SwitchBtn";
 import DropDown from "./components/DropDown";
 import "./index.less";
@@ -71,6 +71,8 @@ var AggregateSearch = function AggregateSearch(_ref) {
     })) : _ref$onHistoryDelete,
     _ref$onHelpClick = _ref.onHelpClick,
     onHelpClick = _ref$onHelpClick === void 0 ? function () {} : _ref$onHelpClick,
+    _ref$onPressEnter = _ref.onPressEnter,
+    onPressEnter = _ref$onPressEnter === void 0 ? function () {} : _ref$onPressEnter,
     mode = _ref.mode,
     _ref$defaultMode = _ref.defaultMode,
     defaultMode = _ref$defaultMode === void 0 ? "tag" : _ref$defaultMode,
@@ -210,6 +212,7 @@ var AggregateSearch = function AggregateSearch(_ref) {
     setVisible = _useDropDown.setVisible;
   var onInput = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(e) {
+      var cloneDomRemoveCloseBtnDom;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -219,9 +222,10 @@ var AggregateSearch = function AggregateSearch(_ref) {
             }
             return _context7.abrupt("return");
           case 2:
-            handleValueChange(e.target.innerText);
-            onChange(e.target.innerText);
-          case 4:
+            cloneDomRemoveCloseBtnDom = cloneDomRemoveCloseBtn(e.target);
+            handleValueChange(cloneDomRemoveCloseBtnDom.innerText);
+            onChange(cloneDomRemoveCloseBtnDom.innerText);
+          case 5:
           case "end":
             return _context7.stop();
         }
@@ -241,7 +245,9 @@ var AggregateSearch = function AggregateSearch(_ref) {
   useEffect(function () {
     var handleClick = function handleClick(e) {
       // 可编辑文本框边框线e.target !== containerWrapperRef.current
-      if (container.current && !container.current.contains(e.target) && e.target !== containerWrapperRef.current) {
+      // e.target 为svg图标时，className为SVGAnimatedString类型(object)
+      var isClickClose = e.target.className && typeof e.target.className === "string" ? e.target.className.includes("tag-box-item-close") : false;
+      if (container.current && (!container.current.contains(e.target) || isClickClose) && e.target !== containerWrapperRef.current) {
         setVisible(false);
         setContentEditable(false);
       } else {
@@ -249,6 +255,18 @@ var AggregateSearch = function AggregateSearch(_ref) {
         setContentEditable(true);
         (_container$current = container.current) === null || _container$current === void 0 || _container$current.focus();
       }
+      if (isClickClose) {
+        var CloseTagWrapper = e.target.parentNode;
+        var nextSiblingWrappr = CloseTagWrapper.nextSibling;
+        if (nextSiblingWrappr) {
+          // 将下个文本元素的第一个空格去掉
+          nextSiblingWrappr.nodeValue = nextSiblingWrappr.nodeValue.replace(/(^\s{1})/, "");
+        }
+        ;
+        container.current.removeChild(CloseTagWrapper);
+        handleValueChange(container.current.innerText);
+        onChange(container.current.innerText);
+      }
     };
     document.addEventListener("click", handleClick);
     return function () {
@@ -274,7 +292,10 @@ var AggregateSearch = function AggregateSearch(_ref) {
     if (keyCode === 13) {
       // 回车阻止默认的换行行为
       e.preventDefault();
-      onChange(e.target.innerText);
+      var cloneDomRemoveCloseBtnDom = cloneDomRemoveCloseBtn(e.target);
+      onChange(cloneDomRemoveCloseBtnDom.innerText);
+      onPressEnter(cloneDomRemoveCloseBtnDom.innerText);
+      setContentEditable(false);
       setVisible(false);
     }
   };
@@ -330,8 +351,9 @@ var AggregateSearch = function AggregateSearch(_ref) {
     onCompositionEnd: function onCompositionEnd(e) {
       isComposing.current = false;
       // 输入中文结束再触发一次，保证文本框对应内容与当前返回值一致，选项效果不会丢失
-      handleValueChange(e.target.innerText);
-      onChange(e.target.innerText);
+      var cloneDomRemoveCloseBtnDom = cloneDomRemoveCloseBtn(e.target);
+      handleValueChange(cloneDomRemoveCloseBtnDom.innerText);
+      onChange(cloneDomRemoveCloseBtnDom.innerText);
     },
     onCompositionStart: function onCompositionStart() {
       return isComposing.current = true;
@@ -367,6 +389,10 @@ AggregateSearch.propTypes = {
    * 文本内容变化的回调，(value) => {}
    */
   onChange: PropTypes.func,
+  /**
+   * 文本内容回车变化的回调，(value) => {}
+   */
+  onPressEnter: PropTypes.func,
   /**
    * 可生成标签对模式下触发搜索标签key的回调，需要返回promise，async(value)=>[],参数为当前光标所在标签的key值：需要该值请求下拉列表key值数据
    */

package/lib/AggregateSearch/index.less

@@ -23,10 +23,12 @@
   position: relative;
   border: @border-width-base @border-style-base @input-border-color;
   border-radius: @border-radius-base;
+
   // 聚焦样式修改
   &:focus-within {
     .active();
   }
+
   &:hover {
     .hover();
   }
@@ -35,6 +37,7 @@
   &:focus-visible {
     outline: none;
   }
+
   .aggregate-search-input {
     position: relative;
     padding: 0 10px;
@@ -44,16 +47,20 @@
     line-height: 26px;
     // border-radius: @border-radius-base 0 0 @border-radius-base;
     outline: none;
+
     &:empty:before {
       content: attr(data-placeholder);
       font-size: 12px;
       color: rgba(0, 0, 0, 0.45);
       line-height: 20px;
     }
-    &:empty + .close-all-icon{
+
+    &:empty+.close-all-icon {
       display: none;
     }
-    &:not(.syntax-error):focus:before { // 需要排除掉syntax-error的样式不然报错内容丢失
+
+    &:not(.syntax-error):focus:before {
+      // 需要排除掉syntax-error的样式不然报错内容丢失
       content: ""; // 不能为none，否则placeholder不显示
     }
 
@@ -68,13 +75,66 @@
       margin-right: 2px;
       padding-right: 5px;
 
+      .tag-box-item-close {
+        position: absolute;
+        height: 20px;
+        line-height: 20px;
+        display: none;
+        top: -1px;
+        right: -10px;
+        width: 12px;
+        border: @border-width-base @border-style-base #E3E3E3;
+        border-left: none;
+        z-index: 10;
+        background: #fff;
+        border-radius: 0 @border-radius-base @border-radius-base 0;
+
+        &::before,
+        &::after {
+          content: ''; // content为x时，样式突兀
+          width: 0.5px;
+          height: 8px;
+          background: @text-color-show;
+          position: absolute;
+          top: 5.5px;
+          right: 6px;
+          left: auto;
+        }
+
+        &::before {
+          transform: rotate(45deg);
+        }
+
+        &::after {
+          transform: rotate(-45deg);
+        }
+      }
+      &:hover {
+        border-color: @primary-5;
+        .tag-box-item-close {
+          display: inline-block;
+          border-color: @primary-5;
+          &:hover {
+            cursor: pointer;
+            &::before,
+            &::after {
+              background: @primary-5;
+            }
+          }
+
+        }
+      }
+      &:not(.syntax-error):not(&:hover):has(.tag-con-keyword_AND_OR:nth-child(1)):has(.tag-box-item-close:nth-child(2)) {
+        border-color: transparent;
+      }
+
       .tag-con {
         display: inline-block;
         height: 18px;
         line-height: 18px;
 
         &:first-child {
-          padding-left:5px;
+          padding-left: 5px;
         }
       }
 
@@ -98,13 +158,11 @@
         color: #FA8C16;
         padding-left: 2px;
       }
-      &:not(.syntax-error):has(.tag-con-keyword_AND_OR:only-child){
-        border-color: transparent;
-      }
     }
   }
-  &.aggregate-search-text-wrapper{
-    .aggregate-search-input{
+
+  &.aggregate-search-text-wrapper {
+    .aggregate-search-input {
       line-height: 20px;
       padding-top: 3px;
       padding-bottom: 3px;
@@ -115,8 +173,9 @@
 
 .syntax-error {
   // 语法错误，高亮样式
-  border: @border-width-base @border-style-base @red-5 !important;
+  border: @border-width-base @border-style-base @red-5  !important;
   box-shadow: none !important;
+
   &:hover {
 
     // 伪类展示属性值
@@ -137,4 +196,15 @@
       min-width: 100px;
     }
   }
+  &:hover {
+    .tag-box-item-close {
+      border-color: @red-5 !important;
+      &:hover {
+        &::before,
+        &::after {
+          background: @red-5 !important;
+        }
+      }
+    }
+  }
 }

package/lib/AggregateSearch/utils/index.js

@@ -75,22 +75,41 @@ export var checkSyntax = function checkSyntax(value) {
   });
 };
 
-// 以空格分隔内容，但是不包括()内和NOT后的空格
+// 以空格分隔内容，但是不包括()内和NOT后的空格和双引号内的空格
 var splitBySpace = function splitBySpace(str) {
   var res = [];
   var temp = "";
-  var isBracket = false;
+  var isBracket = false; // 括号内不分割
+  var isQuote = false; //   引号内不分割
+  var isSquareBracket = false; //  方括号内不分割
+  var isOpenBracket = false; // 花括号内不分割
+
   for (var i = 0; i < str.length; i++) {
     var _char = str[i];
     // 检测当前字符与前面的字符拼接是否为 "NOT "
     var isNot = "".concat(temp).concat(_char).toUpperCase() === "NOT ";
+    if (['"'].includes(_char)) {
+      isQuote = !isQuote;
+    }
+    if (["["].includes(_char)) {
+      isSquareBracket = true;
+    }
+    if (["]"].includes(_char)) {
+      isSquareBracket = false;
+    }
+    if (["{"].includes(_char)) {
+      isOpenBracket = true;
+    }
+    if (["}"].includes(_char)) {
+      isOpenBracket = false;
+    }
     if (["("].includes(_char)) {
       isBracket = true;
     }
     if ([")"].includes(_char)) {
       isBracket = false;
     }
-    if (_char === " " && !isBracket && !isNot) {
+    if (_char === " " && !isBracket && !isNot && !isQuote && !isSquareBracket && !isOpenBracket) {
       res.push(temp);
       // '1 2 3 4' ==> ['1', ' ', '3', ' ', '4']
       res.push(" ");
@@ -190,7 +209,7 @@ export var genHtmlAndSyntaxCheckResByString = function genHtmlAndSyntaxCheckResB
     if (!html.trim()) {
       return html;
     }
-    return "<span class=\"tag-box\" data-attr=\"tag-box\" id=\"".concat(tagId, "\">").concat(html, "</span>");
+    return "<span class=\"tag-box\" data-attr=\"tag-box\" id=\"".concat(tagId, "\">").concat(html, "<span class=\"tag-box-item-close\" contenteditable=\"false\"></span></span>");
   }).join("");
   return htmlString;
 };
@@ -361,4 +380,13 @@ export function isObjectEqual(obj1, obj2) {
     }
   }
   return true;
-}
+}
+// 将节点克隆并将标签里面所有的关闭按钮节点移出
+export var cloneDomRemoveCloseBtn = function cloneDomRemoveCloseBtn(node) {
+  var cloneNode = node.cloneNode(true);
+  var closeBtns = cloneNode.querySelectorAll(".tag-box-item-close");
+  closeBtns.forEach(function (item) {
+    item.remove();
+  });
+  return cloneNode;
+};

package/lib/PropertyControlViewer/components/DoImage.js

@@ -3,6 +3,11 @@ import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
 import "antd/es/upload/style";
 import _Upload from "antd/es/upload";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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); }); }; }
@@ -67,7 +72,12 @@ var DoImage = function DoImage(_ref) {
     className: "ci-detail-image"
   }, /*#__PURE__*/React.createElement(_Upload, {
     listType: "picture-card",
-    fileList: list || [],
+    fileList: (list === null || list === void 0 ? void 0 : list.map(function (v) {
+      var arr = v.url.split('.');
+      return _objectSpread(_objectSpread({}, v), {}, {
+        type: "image/" + arr[arr.length - 1]
+      });
+    })) || [],
     onPreview: handlePreview,
     showUploadList: {
       showRemoveIcon: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/business",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "业务组件库",
   "keywords": [
     "ui",
@@ -72,11 +72,12 @@
   },
   "dependencies": {
     "@chaoswise/intl": "^1.2.2",
-    "@chaoswise/request": "^1.0.6",
-    "@chaoswise/ui": "^2.3.17",
     "antlr4": "4.9.2",
     "react-copy-to-clipboard": "^5.1.0"
   },
+  "peerDependencies": {
+    "@chaoswise/ui": ">=2.0.0"
+  },
   "author": "cloudwiser",
   "homepage": "",
   "main": "lib/index.js",
@@ -105,5 +106,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "171db246c257509be1a0752ff5f3cd7558b48500"
+  "gitHead": "a7e3496c6e269a7d920121fafaac8ed4fc38d50c"
 }

package/lib/AggregateSearch/components/CloseAllIcon/assets/Close-Circle-Fill.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Icon/Fill/Close-Circle-Fill</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="聚合搜索框" transform="translate(-1278.000000, -2867.000000)">
-            <rect fill="#FFFFFF" x="0" y="0" width="1920" height="3346"></rect>
-            <g id="7" opacity="0.800000012" transform="translate(120.000000, 2665.000000)">
-                <g id="搜索框备份-2" transform="translate(0.000000, 194.000000)">
-                    <path d="M1214.00697,0.5 C1214.41913,0.5 1214.7922,0.667699564 1215.06223,0.938862019 C1215.33288,1.21063804 1215.5,1.58624721 1215.5,2.00138927 L1215.5,2.00138927 L1215.5,45.9986107 C1215.5,46.4131621 1215.33227,46.7885021 1215.0616,47.0603047 C1214.79133,47.3317133 1214.41826,47.5 1214.00697,47.5 L1214.00697,47.5 L1.99303181,47.5 C1.58086837,47.5 1.20779551,47.3323004 0.937765379,47.061138 C0.667124252,46.789362 0.5,46.4137528 0.5,45.9986107 L0.5,45.9986107 L0.5,2.00138927 C0.5,1.58683787 0.667729281,1.2114979 0.938396858,0.939695326 C1.20867209,0.668286734 1.58174111,0.5 1.99303181,0.5 L1.99303181,0.5 L1214.00697,0.5 Z" id="Rectangle-26-Copy-23备份" stroke="#FF4D4F" fill="#FFFFFF"></path>
-                    <g id="Icon/Fill/Close-Circle-Fill" transform="translate(1158.000000, 8.000000)" fill="#000000">
-                        <rect id="矩形" fill-rule="nonzero" opacity="0" x="0" y="0" width="12" height="12"></rect>
-                        <path d="M6,0.75 C3.10078125,0.75 0.75,3.10078125 0.75,6 C0.75,8.89921875 3.10078125,11.25 6,11.25 C8.89921875,11.25 11.25,8.89921875 11.25,6 C11.25,3.10078125 8.89921875,0.75 6,0.75 Z M7.93828125,7.99453125 L7.16484375,7.99101563 L6,6.60234375 L4.83632812,7.98984375 L4.06171875,7.99335937 C4.01015625,7.99335937 3.96796875,7.95234375 3.96796875,7.89960937 C3.96796875,7.87734375 3.97617188,7.85625 3.99023438,7.83867187 L5.51484375,6.02226562 L3.99023438,4.20703125 C3.97617188,4.18945312 3.96796875,4.16835937 3.96796875,4.14609375 C3.96796875,4.09453125 4.01015625,4.05234375 4.06171875,4.05234375 L4.83632813,4.05585938 L6,5.44453125 L7.16367187,4.05703125 L7.93710937,4.05351563 C7.98867187,4.05351563 8.03085937,4.09453125 8.03085937,4.14726563 C8.03085937,4.16953125 8.02265625,4.190625 8.00859375,4.20820313 L6.48632812,6.0234375 L8.00976562,7.83984375 C8.02382813,7.85742188 8.03203125,7.87851562 8.03203125,7.90078125 C8.03203125,7.95234375 7.98984375,7.99453125 7.93828125,7.99453125 Z" id="形状" fill-opacity="0.25"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>