@chaoswise/ui 2.6.8 → 2.7.0

package/lib/CWRangePicker/utils/index.js

@@ -22,13 +22,6 @@ var ENUM_TimeUnit = {
   mo: ["Month", "Months", "月", "mo"],
   y: ["Year", "Years", "年", "years"]
 };
-var EnumTimeType = {
-  recently: "recentlyArray",
-  relative: "relativeArray",
-  absolute: "absoluteArray",
-  unixTimestamp: "unixTimestampArray",
-  other: "otherArray"
-};
 
 /**
  * 变换数据源格式
@@ -36,25 +29,27 @@ var EnumTimeType = {
  * @returns 重新编排组合的数据源
  */
 export var regroupDataSourceFn = function regroupDataSourceFn(dataSource) {
-  var recentlyArray = [];
-  var relativeArray = [];
-  var absoluteArray = [];
-  var unixTimestampArray = [];
-  var otherArray = [];
+  var EnumTimeTypeData = {
+    recently: [],
+    relative: [],
+    absolute: [],
+    unixTimestamp: [],
+    other: []
+  };
   var regroupDataSource = [];
   dataSource.forEach(function (item) {
-    if (EnumTimeType[item.type]) {
-      eval(EnumTimeType[item.type]).push(item);
+    if (Object.keys(EnumTimeTypeData).includes(item.type)) {
+      EnumTimeTypeData[item.type].push(item);
     } else {
-      eval(EnumTimeType["other"]).push(item);
+      EnumTimeTypeData["other"].push(item);
     }
   });
-  Object.entries(EnumTimeType).map(function (item) {
-    if (eval(item[1]).length) {
-      var newObj = {};
-      newObj.type = item[0];
-      newObj.timeList = eval(item[1]);
-      regroupDataSource.push(newObj);
+  Object.entries(EnumTimeTypeData).forEach(function (item) {
+    if (item[1].length) {
+      regroupDataSource.push({
+        type: item[0],
+        timeList: item[1]
+      });
     }
   });
   return regroupDataSource;
@@ -139,53 +134,27 @@ export var echoInputValue = function echoInputValue() {
   var locale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "zh_CN";
   var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "YYYY/MM/DD HH:mm:ss";
   var forceRenderTitle = arguments.length > 4 ? arguments[4] : undefined;
-  var isAutoRefresh = arguments.length > 5 ? arguments[5] : undefined;
-  var timeSpanBoundary = arguments.length > 6 ? arguments[6] : undefined;
-  var values = recordDateValue.value,
-    title = recordDateValue.title;
+  var timeSpanBoundary = arguments.length > 5 ? arguments[5] : undefined;
+  var isSpecialRelativeTime = arguments.length > 6 ? arguments[6] : undefined;
+  var _defaultValue = arguments.length > 7 ? arguments[7] : undefined;
+  var title = recordDateValue.title,
+    type = recordDateValue.type;
   var _judgeType = judgeType(recordDateValue),
-    _judgeType2 = _slicedToArray(_judgeType, 3),
+    _judgeType2 = _slicedToArray(_judgeType, 2),
     isRule = _judgeType2[0],
-    captureUnit = _judgeType2[1],
-    recordUnit = _judgeType2[2];
-  var value = [];
-  if (values) {
-    value = funcValueChangeArrayValue(values);
-  }
+    captureUnit = _judgeType2[1];
   if (forceRenderTitle) {
-    var _value2;
     if (title) return title;
-    if (isRule) {
-      return echoRecentlyTimeTitle(locale, captureUnit);
-    }
-    if (Array.isArray(value) && (_value2 = value) !== null && _value2 !== void 0 && _value2.length) {
-      return echoAbsoluteTimeTitle(value, format, true, timeSpanBoundary);
-    }
-    return "";
   }
-  if (!isRule && !values) return title || "Live Tail";
-  if (isAutoRefresh) {
-    var _value3;
-    if (isRule) {
-      if (isFoucs) {
-        return recordUnit;
-      }
-      return echoRecentlyTimeTitle(locale, captureUnit);
-    }
-    if (Array.isArray(value) && (_value3 = value) !== null && _value3 !== void 0 && _value3.length) {
-      return echoAbsoluteTimeTitle(value, format, true, timeSpanBoundary);
-    }
-  } else {
-    var _value4;
-    if (isRule) {
-      if (isFoucs) {
-        return recordUnit;
-      }
-      return echoRecentlyTimeTitle(locale, captureUnit);
-    }
-    if (Array.isArray(value) && (_value4 = value) !== null && _value4 !== void 0 && _value4.length) {
-      return echoAbsoluteTimeTitle(value, format, true, timeSpanBoundary);
-    }
+  if (!isRule && !_defaultValue) return title || "Live Tail";
+  if (type === "relative" && isSpecialRelativeTime && !isFoucs) {
+    return title;
+  }
+  if (isRule && !isFoucs) {
+    return echoRecentlyTimeTitle(locale, captureUnit);
+  }
+  if (Array.isArray(_defaultValue) && _defaultValue !== null && _defaultValue !== void 0 && _defaultValue.length) {
+    return echoAbsoluteTimeTitle(_defaultValue, format, true, timeSpanBoundary);
   }
 };
 

package/lib/CWSelect/index.less

@@ -3,7 +3,7 @@
 @import '../Antd4/select/style/index.less';
 @select-prefix-cls: ~'@{ant-prefix}-select';
 @tree-select-prefix-cls: ~'@{ant-prefix}-tree-select';
-@selection-item-padding: 20px;
+// @selection-item-padding: 20px;
 .cw-select-tag-dropdown{
     max-width:  200px;
     // 这两个一起会导致气泡下面有黑色padding
@@ -590,6 +590,98 @@
     border-right-width: @border-width-base !important;
 }
 
+
+// UI规范
+.@{select-prefix-cls}.@{select-prefix-cls}-sm {
+    &.@{select-prefix-cls}-single {
+        .@{select-prefix-cls}-selector{
+            height: @input-height-sm;
+            .@{select-prefix-cls}-selection-search-input{
+                height: @input-height-sm - 2px;
+                line-height: @input-height-sm - 2px;
+            }
+            .@{select-prefix-cls}-selection-placeholder,.@{select-prefix-cls}-selection-item{
+                height: @input-height-sm - 2px;
+                line-height: @input-height-sm - 2px;
+            }
+            .@{select-prefix-cls}-selection-search{
+                left: 7px;
+            }
+        }
+    }
+   
+    &.@{select-prefix-cls}-multiple {
+        .@{select-prefix-cls}-selector{
+            min-height: @input-height-sm;
+            // padding: 0 9px;
+            line-height: 22px;
+            .@{select-prefix-cls}-selection-search{
+                margin: 0;
+            }
+            .@{select-prefix-cls}-selection-search-input, .@{select-prefix-cls}-selection-search-mirror, .cw-select-selection-item{
+                height: @input-height-sm - 8px;
+                line-height: @input-height-sm - 10px;
+            }
+        }
+    }
+    .@{select-prefix-cls}-clear,
+    .@{select-prefix-cls}-arrow {
+      right: @control-padding-horizontal-sm;
+    }
+  }
+
+// UI规范
+.@{select-prefix-cls}.@{select-prefix-cls}-lg {
+    font-size: 14px; // 大号字体大小
+    &.@{select-prefix-cls}-single {
+        .@{select-prefix-cls}-selector{
+            height: @input-height-lg;
+            .@{select-prefix-cls}-selection-search-input{
+                height: @input-height-lg - 2px;
+                line-height: @input-height-lg - 2px;
+            }
+            .@{select-prefix-cls}-selection-placeholder,.@{select-prefix-cls}-selection-item{
+                height: @input-height-lg - 2px;
+                line-height: @input-height-lg - 2px;
+            }
+            .@{select-prefix-cls}-selection-search{
+                left: 11px;
+            }
+        }
+    }
+    &.@{select-prefix-cls}-multiple {
+        .@{select-prefix-cls}-selector{
+            min-height: @input-height-lg;
+            line-height: @input-height-lg - 2px;
+            .@{select-prefix-cls}-selection-search{
+                margin: 0;
+            }
+            .@{select-prefix-cls}-selection-search-input, .@{select-prefix-cls}-selection-search-mirror, .cw-select-selection-item{
+                height: @input-height-lg - 8px;
+                line-height: @input-height-lg - 8px;
+            }
+        }
+    }
+  }
+.cw-select-item-tooltip{
+    .@{ant-prefix}-tooltip-content{
+        .@{ant-prefix}-tooltip-inner{
+            .@{ant-prefix}-checkbox-wrapper{
+                display: none;
+            }
+        }
+    }
+}
+.cw-select-show-checkbox-empty{
+    display: flex;
+    justify-content: center;
+    padding: 9px 0;
+    align-items: center;
+    line-height: 20px;
+    color: @text-color-secondary;
+}
+
+
 .@{select-prefix-cls}-dropdown{
     margin: 0;
     color: @text-color;
@@ -654,7 +746,7 @@
         padding-left: @control-padding-horizontal;
     }
     .@{select-prefix-cls}-item-option-active:not(.@{select-prefix-cls}-item-option-disabled){
-        background-color: @component-background;
+        background-color: @select-item-active-bg;
     }
     .@{select-prefix-cls}-item-option.@{select-prefix-cls}-item-option-selected:not(.@{select-prefix-cls}-item-option-disabled){
         color: @select-selected-enable-color; // UI规范
@@ -723,93 +815,3 @@
         }
     }
 }
-
-// UI规范
-.@{select-prefix-cls}.@{select-prefix-cls}-sm {
-    &.@{select-prefix-cls}-single {
-        .@{select-prefix-cls}-selector{
-            height: @input-height-sm;
-            .@{select-prefix-cls}-selection-search-input{
-                height: @input-height-sm - 2px;
-                line-height: @input-height-sm - 2px;
-            }
-            .@{select-prefix-cls}-selection-placeholder,.@{select-prefix-cls}-selection-item{
-                height: @input-height-sm - 2px;
-                line-height: @input-height-sm - 2px;
-            }
-            .@{select-prefix-cls}-selection-search{
-                left: 7px;
-            }
-        }
-    }
-   
-    &.@{select-prefix-cls}-multiple {
-        .@{select-prefix-cls}-selector{
-            min-height: @input-height-sm;
-            // padding: 0 9px;
-            line-height: 22px;
-            .@{select-prefix-cls}-selection-search{
-                margin: 0;
-            }
-            .@{select-prefix-cls}-selection-search-input, .@{select-prefix-cls}-selection-search-mirror, .cw-select-selection-item{
-                height: @input-height-sm - 8px;
-                line-height: @input-height-sm - 10px;
-            }
-        }
-    }
-    .@{select-prefix-cls}-clear,
-    .@{select-prefix-cls}-arrow {
-      right: @control-padding-horizontal-sm;
-    }
-  }
-
-// UI规范
-.@{select-prefix-cls}.@{select-prefix-cls}-lg {
-    font-size: 14px; // 大号字体大小
-    &.@{select-prefix-cls}-single {
-        .@{select-prefix-cls}-selector{
-            height: @input-height-lg;
-            .@{select-prefix-cls}-selection-search-input{
-                height: @input-height-lg - 2px;
-                line-height: @input-height-lg - 2px;
-            }
-            .@{select-prefix-cls}-selection-placeholder,.@{select-prefix-cls}-selection-item{
-                height: @input-height-lg - 2px;
-                line-height: @input-height-lg - 2px;
-            }
-            .@{select-prefix-cls}-selection-search{
-                left: 11px;
-            }
-        }
-    }
-    &.@{select-prefix-cls}-multiple {
-        .@{select-prefix-cls}-selector{
-            min-height: @input-height-lg;
-            line-height: @input-height-lg - 2px;
-            .@{select-prefix-cls}-selection-search{
-                margin: 0;
-            }
-            .@{select-prefix-cls}-selection-search-input, .@{select-prefix-cls}-selection-search-mirror, .cw-select-selection-item{
-                height: @input-height-lg - 8px;
-                line-height: @input-height-lg - 8px;
-            }
-        }
-    }
-  }
-.cw-select-item-tooltip{
-    .@{ant-prefix}-tooltip-content{
-        .@{ant-prefix}-tooltip-inner{
-            .@{ant-prefix}-checkbox-wrapper{
-                display: none;
-            }
-        }
-    }
-}
-.cw-select-show-checkbox-empty{
-    display: flex;
-    justify-content: center;
-    padding: 9px 0;
-    align-items: center;
-    line-height: 20px;
-    color: @text-color-secondary;
-}

package/lib/QuickTransfer/index.js

@@ -36,7 +36,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
-import React, { useState, useEffect, Fragment, forwardRef, useMemo } from "react";
+import React, { useState, useEffect, Fragment, forwardRef, useMemo, useCallback } from "react";
 import { filterTreeByName, filterTree, filterTreeByNameTable, filterObj, getNotSelectKeys, getKeysAndTitle, getBottomKey, renderLeafNodetree, renderRelationNode, createTitle } from "./utils";
 import classnames from "classnames";
 import Drag from "./Drag";
@@ -257,21 +257,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
           return !i.disabled;
         }));
         setCheckValue(finalCheckValue);
-        var newData = [];
-        var listCheckedKeys_ = [];
-        dataSource.forEach(function (item, index) {
-          if (isMath(item.title, saveSearchValueLeft)) {
-            newData.push(dataSource[index]);
-          }
-        });
-        listCheckedKeys_ = newData.filter(function (item) {
-          return finalCheckValue.find(function (i) {
-            return i.key == item.key;
-          });
-        }).map(function (item) {
-          return item.key;
-        });
-        setListCheckedStyle(listCheckedKeys_, newData);
       }
       //回显table
       if (type === "table") {
@@ -287,19 +272,51 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
     }
-  }, [targetKeys, dataSource, saveSearchValueLeft]);
-  //触发前端自定义搜索
+  }, [targetKeys, dataSource]);
   useEffect(function () {
-    if (searchValueLeft !== undefined) {
-      handleSearch(searchValueLeft);
+    // 左侧受控值绑定
+    if (searchValueLeft !== undefined && searchValueLeft !== saveSearchValueLeft) {
       // 初始化搜索结果
       setSaveSearchValueLeft(searchValueLeft);
     }
-    if (searchValueRight !== undefined) {
+  }, [searchValueLeft, saveSearchValueLeft]);
+  useEffect(function () {
+    // 右侧受控值绑定
+    if (searchValueRight !== undefined && searchValueRight !== saveSearchValueRight) {
       // 初始化搜索结果
       setSaveSearchValueRight(searchValueRight);
     }
-  }, [searchValueLeft, searchValueRight]);
+  }, [searchValueRight, saveSearchValueRight]);
+
+  // 左侧搜索框输入触发
+  var handleSearch = useCallback(function (searchValue) {
+    var newData = [];
+    var listCheckedKeys_ = [];
+    if (type === "list") {
+      dataSource.forEach(function (item, index) {
+        if (isMath(item.title, searchValue)) {
+          newData.push(dataSource[index]);
+        }
+      });
+      listCheckedKeys_ = newData.filter(function (item) {
+        return checkValue.find(function (i) {
+          return i.key == item.key;
+        });
+      }).map(function (item) {
+        return item.key;
+      });
+      setData(newData);
+      setListCheckedStyle(listCheckedKeys_, newData);
+    }
+    if (type === "table") {
+      newData = filterTreeByNameTable(dataSource, searchValue, searchColumns ? searchColumns : newSearchColumns);
+      setData(newData);
+    }
+  }, [dataSource, checkValue]);
+  useEffect(function () {
+    handleSearch(saveSearchValueLeft);
+  }, [handleSearch, saveSearchValueLeft]);
+
   //获取左侧列表选中的key
   useEffect(function () {
     if (getTargetKeys) {
@@ -347,35 +364,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     setIndeterminate(!!listCheckedKeys.length && listCheckedKeys.length < dataSource.length);
     setCheckAll(listCheckedKeys.length === dataSource.length);
   };
-  // 左侧搜索框输入触发
-  var handleSearch = function handleSearch(searchValue) {
-    var newData = [];
-    var listCheckedKeys_ = [];
-    if (type === "list") {
-      dataSource.forEach(function (item, index) {
-        if (isMath(item.title, searchValue)) {
-          newData.push(dataSource[index]);
-        }
-      });
-      listCheckedKeys_ = newData.filter(function (item) {
-        return checkValue.find(function (i) {
-          return i.key == item.key;
-        });
-      }).map(function (item) {
-        return item.key;
-      });
-      setData(newData);
-      setListCheckedStyle(listCheckedKeys_, newData);
-    }
-    // if (type === "tree") {
-    //     newData = filterTree(dataSource, searchValue);
-    //     setData(newData);
-    // }
-    if (type === "table") {
-      newData = filterTreeByNameTable(dataSource, searchValue, searchColumns ? searchColumns : newSearchColumns);
-      setData(newData);
-    }
-  };
 
   //type为list 左侧列表选中触发的事件
   var onChangeChecked = function onChangeChecked(e, value) {
@@ -595,17 +583,15 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
   var showSearchChange = function showSearchChange(e) {
     onSearchChange && onSearchChange(e);
     onLeftSearchChange && onLeftSearchChange(e);
-    // 保存搜索结果
-    if (searchValueLeft === undefined) {
-      handleSearch(e.target.value);
-      setSaveSearchValueLeft(e.target.value);
-    }
+    // 保存搜索结果,实时保存不然受控模式中文会有问题
+    // if (searchValueLeft === undefined) {
+    setSaveSearchValueLeft(e.target.value);
+    //     handleSearch(e.target.value);
+    // }
   };
   var showSearchChangeRight = function showSearchChangeRight(e) {
     onRightSearchChange(e);
-    if (searchValueRight === undefined) {
-      setSaveSearchValueRight(e.target.value);
-    }
+    setSaveSearchValueRight(e.target.value);
   };
   // 全选状态改变触发
   var onCheckAllChange = function onCheckAllChange(e) {

package/lib/SearchBar/OutSearch.js

@@ -67,7 +67,11 @@ function OutSearch(_ref) {
     }, isFunc ? getFieldDecorator(child.components(form).props.id, child.formAttribute && child.formAttribute)(child.components(form)) : getFieldDecorator(child.components.props.id, child.formAttribute && child.formAttribute)(child.components));
   };
   return /*#__PURE__*/React.createElement(_Form, {
-    className: "cw-searchbar-outform"
+    className: "cw-searchbar-outform",
+    onSubmit: function onSubmit(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    }
   }, /*#__PURE__*/React.createElement(_Row, {
     type: "flex",
     className: "cw-search-main",

package/lib/SearchBar/index.js

@@ -452,7 +452,11 @@ var SearchBar = function SearchBar(props) {
       marginLeft: "8px"
     }
   })) : null)), /*#__PURE__*/React.createElement(_Form, {
-    layout: "vertical"
+    layout: "vertical",
+    onSubmit: function onSubmit(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    }
   }, /*#__PURE__*/React.createElement(_Row, {
     className: "cw-search-expand",
     style: {

package/lib/SingleSpa/import-html/process-tpl.js

@@ -6,14 +6,14 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { getInlineCode, isModuleScriptSupported } from './utils';
 var ALL_SCRIPT_REGEX = /(<script[\s\S]*?>)[\s\S]*?<\/script>/gi;
-var SCRIPT_TAG_REGEX = /<(script)\s+((?!type=('|")text\/ng\x2Dtemplate\3)[\s\S])*?>[\s\S]*?<\/\1>/i;
+var SCRIPT_TAG_REGEX = /<(script)\s+((?!type=('|")text\/ng-template\3)[^])*?>[^]*?<\/\1>/i;
 var SCRIPT_SRC_REGEX = /.*\ssrc=('|")?([^>'"\s]+)/;
 var SCRIPT_TYPE_REGEX = /.*\stype=('|")?([^>'"\s]+)/;
 var SCRIPT_ENTRY_REGEX = /.*\sentry\s*.*/;
 var SCRIPT_ASYNC_REGEX = /.*\sasync\s*.*/;
 var SCRIPT_NO_MODULE_REGEX = /.*\snomodule\s*.*/;
 var SCRIPT_MODULE_REGEX = /.*\stype=('|")?module('|")?\s*.*/;
-var LINK_TAG_REGEX = /<(link)\s+[\s\S]*?>/ig;
+var LINK_TAG_REGEX = /<(link)\s+[^]*?>/ig;
 var LINK_PRELOAD_OR_PREFETCH_REGEX = /\srel=('|")?(preload|prefetch)\1/;
 var LINK_HREF_REGEX = /.*\shref=('|")?([^>'"\s]+)/;
 var LINK_AS_FONT = /.*\sas=('|")?font\1.*/;
@@ -21,9 +21,9 @@ var STYLE_TAG_REGEX = /<style[^>]*>[\s\S]*?<\/style>/gi;
 var STYLE_TYPE_REGEX = /\s+rel=('|")?stylesheet\1.*/;
 var STYLE_HREF_REGEX = /.*\shref=('|")?([^>'"\s]+)/;
 var HTML_COMMENT_REGEX = /<!--([\s\S]*?)-->/g;
-var LINK_IGNORE_REGEX = /<link(\s+|\s+[\s\S]+\s+)ignore(\s*|\s+[\s\S]*|=[\s\S]*)>/i;
-var STYLE_IGNORE_REGEX = /<style(\s+|\s+[\s\S]+\s+)ignore(\s*|\s+[\s\S]*|=[\s\S]*)>/i;
-var SCRIPT_IGNORE_REGEX = /<script(\s+|\s+[\s\S]+\s+)ignore(\s*|\s+[\s\S]*|=[\s\S]*)>/i;
+var LINK_IGNORE_REGEX = /<link(\s+|\s+[^]+\s+)ignore(\s*|\s+[^]*|=[^]*)>/i;
+var STYLE_IGNORE_REGEX = /<style(\s+|\s+[^]+\s+)ignore(\s*|\s+[^]*|=[^]*)>/i;
+var SCRIPT_IGNORE_REGEX = /<script(\s+|\s+[^]+\s+)ignore(\s*|\s+[^]*|=[^]*)>/i;
 function hasProtocol(url) {
   return url.startsWith('//') || url.startsWith('http://') || url.startsWith('https://');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.6.8",
+  "version": "2.7.0",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -149,5 +149,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "9862a1d4a1f6556dd1fb953637e9bec805b4ea9a"
+  "gitHead": "98a698c55784d5f5c66170f949f6d1b41bca1563"
 }