@jetlinks-web/components 3.0.1-rc → 3.0.1

package/lib/Search/setting.js

@@ -3,22 +3,47 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.typeOptions = exports.termType = exports.optionsMapKey = exports.componentType = exports.basicSearch = exports.TermTypeMap = void 0;
-require("vue");
-require("./typing");
+exports.typeOptions = exports.termType = exports.searchProps = exports.optionsMapKey = exports.componentType = exports.componentProps = exports.TermTypeMap = void 0;
+var _antDesignVue = require("ant-design-vue");
+var _util = require("./util");
 var optionsMapKey = exports.optionsMapKey = Symbol('searchOptionsMap');
-var basicSearch = exports.basicSearch = {
-  columns: {
-    type: Array,
-    default: function _default() {
-      return [];
-    },
-    required: true
-  },
-  type: {
-    type: String,
-    default: 'advanced'
-  }
+var searchProps = exports.searchProps = function searchProps() {
+  return {
+    columns: {
+      type: Array,
+      default: function _default() {
+        return [];
+      },
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'terms',
+      required: true
+    },
+    mode: {
+      type: String,
+      default: 'default'
+    },
+    column: {
+      type: Number,
+      default: 4
+    },
+    labelWidth: {
+      type: Number,
+      default: 40
+    },
+    resetText: {
+      type: String
+    },
+    submitText: {
+      type: String
+    },
+    align: {
+      type: String,
+      default: 'value'
+    }
+  };
 };
 var typeOptions = exports.typeOptions = function typeOptions(locale) {
   return [{
@@ -100,4 +125,97 @@ var componentType = exports.componentType = {
   tree: 'tree',
   select: 'select',
   component: 'component'
+};
+var componentProps = exports.componentProps = function componentProps(record) {
+  var type = record.type;
+  switch (type) {
+    case 'string':
+    case componentType.input:
+      return {
+        type: type,
+        name: _antDesignVue.Input
+      };
+    case componentType.inputNumber:
+      return {
+        type: type,
+        name: _antDesignVue.InputNumber
+      };
+    case componentType.password:
+      return {
+        type: type,
+        name: _antDesignVue.InputPassword
+      };
+    case componentType.time:
+      return {
+        type: type,
+        name: _antDesignVue.TimePicker,
+        props: {
+          valueFormat: 'HH:mm:ss'
+        }
+      };
+    case componentType.date:
+      return {
+        type: type,
+        name: _antDesignVue.DatePicker,
+        props: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss'
+        }
+      };
+    case componentType.timeRange:
+      return {
+        type: type,
+        name: _antDesignVue.TimeRangePicker,
+        props: {
+          valueFormat: 'HH:mm:ss'
+        }
+      };
+    case componentType.rangePicker:
+      return {
+        type: type,
+        name: _antDesignVue.RangePicker,
+        props: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          showTime: true
+        }
+      };
+    case componentType.treeSelect:
+      return {
+        type: type,
+        name: _antDesignVue.TreeSelect,
+        props: {
+          showSearch: true,
+          height: 350,
+          fieldNames: {
+            label: 'name',
+            value: 'id'
+          },
+          filterTreeNode: function filterTreeNode(v, option) {
+            return (0, _util.filterTreeSelectNode)(v, option);
+          }
+        }
+      };
+    case componentType.select:
+      return {
+        type: type,
+        name: _antDesignVue.Select,
+        props: {
+          showSearch: true,
+          // mode: isBtw ? 'multiple' : 'combobox',
+          filterOption: function filterOption(v, option) {
+            return (0, _util.filterSelectNode)(v, option, 'label');
+          },
+          style: {
+            width: '100%',
+            minWidth: '80px'
+          }
+        }
+      };
+    case componentType.component:
+      return {
+        type: type,
+        name: record.components
+      };
+    default:
+      return {};
+  }
 };

package/lib/Search/style/index.js

@@ -1,4 +1,11 @@
 "use strict";
 
-require("./Search.less");
-require("./Item.less");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _styleRegister = _interopRequireDefault(require("../../style/styleRegister"));
+var _search = require("./search");
+var _item = require("./item");
+var _default = exports.default = (0, _styleRegister.default)([_search.genSearchStyle, _item.genItemStyle]);

package/lib/Search/style/item.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.genItemStyle = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var genItemStyle = exports.genItemStyle = function genItemStyle(config) {
+  var componentCls = config.componentCls;
+  return (0, _defineProperty2.default)({}, "".concat(componentCls, "-item"), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
+    display: 'flex',
+    gap: '16px',
+    alignItems: 'center'
+  }, "".concat(componentCls, "-item--type"), {
+    width: '90px',
+    minWidth: '0',
+    '> span': {
+      lineHeight: '34px',
+      fontWeight: 'bold'
+    }
+  }), "".concat(componentCls, "-item--column"), {
+    width: '130px',
+    minWidth: '0'
+  }), "".concat(componentCls, "-item--termType"), {
+    width: '110px',
+    minWidth: '0'
+  }), "".concat(componentCls, "-item--label"), {
+    minWidth: '40px'
+  }), "".concat(componentCls, "-item--value"), {
+    display: 'flex',
+    width: '0',
+    flexGrow: 1
+  }));
+};

package/lib/Search/style/search.js

@@ -0,0 +1,140 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.genSearchStyle = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var genSearchStyle = exports.genSearchStyle = function genSearchStyle(config) {
+  var componentCls = config.componentCls,
+    token = config.token;
+  return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(componentCls, "-warp"), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
+    padding: '24px',
+    backgroundColor: '#fff',
+    marginBottom: '24px',
+    '.pack-up': (0, _defineProperty2.default)({}, "".concat(componentCls, "-items"), {
+      flex: '1 1 auto',
+      '.left': {
+        minWidth: '380px',
+        maxWidth: '580px'
+      }
+    }),
+    '&.senior': (0, _defineProperty2.default)({}, "> ".concat(componentCls, "-content"), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
+      display: 'flex'
+    }, "".concat(componentCls, "-footer"), (0, _defineProperty2.default)({
+      display: 'flex',
+      gap: '64px',
+      position: 'relative',
+      '.more-btn': {
+        '.more-text': {
+          paddingRight: '24px'
+        },
+        '.more-icon': {
+          transition: 'transform 0.3s',
+          transform: 'rotateZ(90deg)',
+          fontSize: '14px',
+          '&.more-up': {
+            transform: 'rotateZ(-90deg)'
+          }
+        }
+      },
+      '&.expand': {
+        marginTop: '16px',
+        width: '100%',
+        justifyContent: 'space-between'
+      }
+    }, "".concat(componentCls, "-footer--btns"), {
+      display: 'flex',
+      gap: '12px'
+    })), '.items-expand', {
+      display: 'flex',
+      gap: '16px',
+      '.left,& .right': {
+        minWidth: 0,
+        flex: '1 1 0'
+      },
+      '.left-items, & .right-items': {
+        display: 'flex',
+        gap: '16px',
+        flexDirection: 'column'
+      },
+      '.center': {
+        display: 'flex',
+        flexDirection: 'column',
+        justifyContent: 'center'
+      },
+      '&.vertical': {
+        flexDirection: 'column',
+        '.center': {
+          flexDirection: 'row',
+          justifyContent: 'center'
+        }
+      }
+    }), '&.senior-expand', {
+      flexDirection: 'column'
+    }), '&.small', (0, _defineProperty2.default)({
+      gap: '12px'
+    }, "".concat(componentCls, "-footre"), {
+      gap: '4px'
+    })))
+  }, "".concat(componentCls, "-content"), {
+    '&.simple': (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(componentCls, "-footer--btns"), {
+      display: 'flex'
+    }), "".concat(componentCls, "-item"), (0, _defineProperty2.default)({
+      gap: '8px'
+    }, "".concat(componentCls, "-item--label"), {
+      textAlign: 'right'
+    }))
+  }), '.no-radius', {
+    borderRadius: 0,
+    borderColor: '#f1f1f1'
+  }), '.search-history-warp', {
+    position: 'relative',
+    '.search-history-button': {
+      paddingRight: '32px'
+    },
+    '.search-history-button-icon': {
+      position: 'absolute',
+      width: '24px',
+      height: '18px',
+      right: '6px',
+      top: '8px',
+      color: '#fff',
+      lineHeight: '18px',
+      textAlign: 'center',
+      fontWeight: 'bold',
+      '> span': {
+        fontSize: '14px'
+      }
+    }
+  })), '.search-history-empty', {
+    padding: '12px 12px 6px 12px',
+    backgroundColor: '#fff'
+  }), '.search-history-items', {
+    width: '120px',
+    maxHeight: '300px',
+    overflowY: 'auto',
+    '.search-history-item': {
+      display: 'flex',
+      padding: '4px 0px 4px 4px',
+      alignItems: 'center',
+      gap: '4px',
+      '&:hover': {
+        backgroundColor: '#f1f1f1'
+      },
+      '.history-item--title': {
+        width: 'calc(100% - 30px)',
+        cursor: 'pointer'
+      },
+      '.delete': {
+        padding: '0 6px',
+        flex: '0 0 28px'
+      }
+    }
+  }), '.search-history-list-pop', {
+    '.ant-popover-inner-content': {
+      padding: 0
+    }
+  });
+};

package/lib/Search/util.js

@@ -4,12 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termsToValue = exports.termsParamsFormat = exports.hasExpand = exports.handleQData = exports.handleParamsToString = exports.handleLikeValue = exports.getTermTypes = exports.getTermTypeFn = exports.getTermOptions = exports.filterTreeSelectNode = exports.filterSelectNode = exports.compatibleOldTerms = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+exports.termsParamsFormat = exports.hasExpand = exports.handleLikeValue = exports.getTermTypes = exports.getTermTypeFn = exports.getTermOptions = exports.getItemDefaultValue = exports.filterTreeSelectNode = exports.filterSelectNode = exports.compatibleOldTerms = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodashEs = require("lodash");
 var _setting = require("./setting");
-require("./typing");
 /**
  * 处理like，nlike特殊值
  * @param v
@@ -29,8 +28,8 @@ var handleLikeValue = exports.handleLikeValue = function handleLikeValue(v) {
   return v;
 };
 var handleItemValue = function handleItemValue(item, columnOptionMap) {
-  var _item = columnOptionMap.get(item.column);
-  if (!_item) return item;
+  var _item = columnOptionMap[item.column].search;
+  if (_item === null || _item === '' || _item === undefined) return item;
   if (_item.rename) {
     item.column = _item.rename;
   }
@@ -40,26 +39,16 @@ var handleItemValue = function handleItemValue(item, columnOptionMap) {
   if (['like', 'nlike'].includes(item.termType) && !!item.value) {
     item.value = "%".concat(handleLikeValue(item.value), "%");
   }
+  if (_item.handleTerms && (0, _lodashEs.isFunction)(_item.handleTerms)) {
+    return _item.handleTerms(item);
+  }
   return item;
 };
 var isEmpty = function isEmpty(v) {
   return v === undefined || v === null || v === '' || (0, _lodashEs.isArray)(v) && v.length === 0;
 };
-var handleArrayToTerms = function handleArrayToTerms(terms, columnOptionMap) {
-  return terms.map(function (item) {
-    if (item.terms) {
-      var filterTerms = item.terms.filter(function (filterItem) {
-        return filterItem && !isEmpty(filterItem.value) && filterItem.termType !== undefined && filterItem.column !== undefined;
-      });
-      item.terms = filterTerms.map(function (result) {
-        return handleItemValue(result, columnOptionMap);
-      });
-    }
-    return item;
-  }).filter(function (item) {
-    var _item$terms;
-    return (_item$terms = item.terms) === null || _item$terms === void 0 ? void 0 : _item$terms.length;
-  });
+var isFilterItem = function isFilterItem(item) {
+  return !isEmpty(item.value) && item.column !== undefined;
 };
 /**
  * 处理为外部使用
@@ -68,26 +57,50 @@ var handleArrayToTerms = function handleArrayToTerms(terms, columnOptionMap) {
  */
 var termsParamsFormat = exports.termsParamsFormat = function termsParamsFormat(terms, columnOptionMap) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'adv';
-  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'terms';
+  var dataFormat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'terms';
   // 过滤掉terms中value无效的item
-  var cloneParams = (0, _lodashEs.cloneDeep)(terms);
-  if (searchType === 'terms') {
-    return type === 'adv' ? {
-      terms: handleArrayToTerms(cloneParams.terms, columnOptionMap)
-    } : cloneParams.filter(function (item) {
-      return item && !isEmpty(item.value) && item.column !== undefined;
-    }).map(function (item) {
-      return handleItemValue(item, columnOptionMap);
-    });
-  } else if (searchType == 'object') {
-    var result = {};
-    cloneParams.filter(function (item) {
-      return item && item.value !== undefined && item.value !== '';
-    }).forEach(function (item) {
-      (0, _extends3.default)(result, (0, _defineProperty2.default)({}, item.column, item.value));
-    });
-    return result;
+  var cloneParams = (0, _lodashEs.cloneDeep)(terms.terms);
+  var handleParamsValue = cloneParams.map(function (item) {
+    return (0, _lodashEs.omit)(handleItemValue(item, columnOptionMap), ['_span']);
+  });
+  var filterParams = handleParamsValue.filter(isFilterItem);
+  if (dataFormat === 'terms') {
+    // terms格式
+    // 过滤，并处理值
+    if (type === 'adv') {
+      if (cloneParams.length > 1) {
+        // 拓展开
+        var array_A = handleParamsValue.slice(0, 3).filter(isFilterItem);
+        var array_B = handleParamsValue.slice(3, 6).filter(isFilterItem);
+        var _terms = [];
+        if (array_A.length > 0) {
+          _terms.push({
+            terms: array_A
+          });
+        }
+        if (array_B.length > 0) {
+          _terms.push({
+            terms: array_B,
+            type: handleParamsValue[3].type
+          });
+        }
+        return {
+          terms: _terms
+        };
+      }
+      return {
+        terms: [{
+          terms: filterParams
+        }]
+      };
+    }
+    return filterParams;
   }
+  // dataFormat === 'object'
+  return filterParams.reduce(function (pre, item) {
+    pre[item.column] = item;
+    return pre;
+  }, {});
 };
 /**
  * TreeSelect过滤
@@ -111,21 +124,6 @@ var filterSelectNode = exports.filterSelectNode = function filterSelectNode(valu
   var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'label';
   return (_option$key = option[key]) === null || _option$key === void 0 ? void 0 : _option$key.includes(value);
 };
-var handleQData = exports.handleQData = function handleQData(terms) {
-  // 排序, null 往后放
-  terms.terms.forEach(function (a) {
-    for (var i = 0; i < a.terms.length; i++) {
-      for (var j = 0; j < a.terms.length - i - 1; j++) {
-        if (!a.terms[j] && a.terms[j + 1]) {
-          var temp = a.terms[j];
-          a.terms[j] = a.terms[j + 1];
-          a.terms[j + 1] = temp;
-        }
-      }
-    }
-  });
-  return terms;
-};
 var hasExpand = exports.hasExpand = function hasExpand(terms) {
   var itemCount = 0;
   terms.forEach(function (a) {
@@ -137,62 +135,59 @@ var hasExpand = exports.hasExpand = function hasExpand(terms) {
   });
   return itemCount >= 2;
 };
-var compatibleOldTerms = exports.compatibleOldTerms = function compatibleOldTerms(q) {
-  var _terms = [{
-    terms: [null, null, null]
-  }, {
-    terms: [null, null, null],
-    type: 'and'
-  }];
+function shouldExpand(a, b) {
+  var isAFirstHasValue = a[0] !== null && a[0] !== undefined;
+  var isARestNull = a.slice(1).every(function (item) {
+    return item === null || item === undefined;
+  });
+  var isBAllNull = b.every(function (item) {
+    return item === null || item === undefined;
+  });
+  return !(isAFirstHasValue && isARestNull && isBAllNull);
+}
+var compatibleOldTerms = exports.compatibleOldTerms = function compatibleOldTerms(q, columnsMap, defaultCacheValues) {
   try {
-    var _terms$terms;
     var terms = JSON.parse(q || '{}');
-    (_terms$terms = terms.terms) === null || _terms$terms === void 0 ? void 0 : _terms$terms.forEach(function (a, aIndex) {
-      var _a$terms;
-      a === null || a === void 0 ? void 0 : (_a$terms = a.terms) === null || _a$terms === void 0 ? void 0 : _a$terms.forEach(function (b, bIndex) {
-        _terms[aIndex].terms[bIndex] = b;
-      });
-      if (a.type) {
-        _terms[aIndex].type = a.type;
+    if (terms.terms.length === 2) {
+      var expand = shouldExpand(terms.terms[0].terms, terms.terms[1].terms);
+      var _terms = [];
+      if (!expand) {
+        _terms = [terms.terms[0].terms[0]];
+      } else {
+        _terms = [].concat((0, _toConsumableArray2.default)(terms.terms[0].terms), (0, _toConsumableArray2.default)(terms.terms[1].terms));
+        // 重新
+        var arr = Object.values(columnsMap);
+        for (var i = 0; i < _terms.length; i++) {
+          if (_terms[i] === null) {
+            var indexIn = i % arr.length;
+            var obj = getItemDefaultValue(arr[indexIn], defaultCacheValues);
+            if (i === 3) {
+              obj.type = terms.terms[1].type;
+            }
+            _terms[i] = obj;
+          }
+        }
       }
-    });
-    return {
-      terms: _terms
-    };
+      return {
+        terms: _terms,
+        expand: expand
+      };
+    } else {
+      var hasTermsKey = Reflect.has(terms.terms[0], 'terms'); // 兼容历史数据
+      return {
+        terms: hasTermsKey ? terms.terms[0].terms : terms.terms,
+        expand: terms.terms.length > 1
+      };
+    }
   } catch (e) {
     console.warn('[Pro Search Error] > ', e);
     return {
-      terms: _terms
+      terms: [],
+      expand: false
     };
   }
 };
-var handleParamsToString = exports.handleParamsToString = function handleParamsToString() {
-  var terms = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'and';
-  var _terms = [{
-    terms: [null, null, null]
-  }, {
-    terms: [null, null, null],
-    type: type
-  }];
-  var termsIndex = 0;
-  var termsStar = 0;
-  terms.forEach(function (item, index) {
-    if (index > 2) {
-      termsIndex = 1;
-      termsStar = 4;
-    }
-    _terms[termsIndex].terms[index - termsStar] = item;
-  });
-  return JSON.stringify({
-    terms: _terms
-  });
-};
 var getTermTypeFn = exports.getTermTypeFn = function getTermTypeFn(type) {
-  // if (column?.includes('id') && type === 'string') {
-  //     // 默认id为 eq
-  //     return 'eq';
-  // }
   switch (type) {
     case 'select':
     case 'treeSelect':
@@ -209,11 +204,14 @@ var getTermTypeFn = exports.getTermTypeFn = function getTermTypeFn(type) {
   }
 };
 var getTermTypes = exports.getTermTypes = function getTermTypes(types, locale) {
-  return (0, _setting.termType)(locale).filter(function (item) {
-    return types.includes(item.value);
+  var termTypes = (0, _setting.termType)(locale);
+  return types.map(function (code) {
+    return termTypes.find(function (item) {
+      return item.value === code;
+    });
   });
 };
-var getTermOptions = exports.getTermOptions = function getTermOptions(type, column, locale) {
+var getTermOptions = exports.getTermOptions = function getTermOptions(type, locale) {
   var keys = [];
   switch (type) {
     case 'select':
@@ -232,7 +230,7 @@ var getTermOptions = exports.getTermOptions = function getTermOptions(type, colu
       keys = ['eq', 'not', 'gt', 'lt', 'gte', 'lte'];
       break;
     default:
-      keys = ['like', 'nlike'];
+      keys = ['like', 'nlike', 'eq', 'not'];
       // column?.includes('id') && type === 'string'
       //     ? ['eq']
       //     : ['like', 'nlike'];
@@ -240,24 +238,18 @@ var getTermOptions = exports.getTermOptions = function getTermOptions(type, colu
   }
   return keys.length ? getTermTypes(keys, locale) : (0, _setting.termType)(locale);
 };
-var termsToValue = exports.termsToValue = function termsToValue(targetItem, searchItems) {
-  if (['like', 'nlike'].includes(targetItem.termType) && !!targetItem.value) {
-    if (targetItem.value.startsWith('%') && targetItem.value.endsWith('%')) {
-      targetItem.value = targetItem.value.slice(1, -1);
-    }
-  }
-  // 处理重命名
-  var searchItem = searchItems.filter(function (item) {
-    return item.rename;
-  }).find(function (item) {
-    if (item.rename === targetItem.column) {
-      targetItem.column = item.column;
-      return true;
-    }
-    return item.column === targetItem.column;
-  });
-  if (!targetItem.termType) {
-    targetItem.termType = getTermTypeFn(searchItem.type);
-  }
-  return targetItem;
+/**
+ * 获取单项默认值，仅初始化使用
+ * @param record
+ * @param defaultCacheValues
+ */
+var getItemDefaultValue = exports.getItemDefaultValue = function getItemDefaultValue(record, defaultCacheValues) {
+  var defaultValue = (0, _objectSpread2.default)({}, defaultCacheValues[record.dataIndex]);
+  return {
+    column: record.dataIndex,
+    termType: defaultValue.defaultTermType || getTermTypeFn(record.search.type),
+    value: defaultValue.defaultValue,
+    type: 'or',
+    _span: record.search.span
+  };
 };