linkmore-design 1.0.100 → 1.1.1

package/lib/LeftTable/index.js

@@ -96,7 +96,7 @@ var LeftSide = function LeftSide(props) {
       onHeaderClick = _props$onHeaderClick === void 0 ? function () {} : _props$onHeaderClick,
       _props$bottomNode = props.bottomNode,
       bottomNode = _props$bottomNode === void 0 ? null : _props$bottomNode,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded); // 带有删除的树
+      rest = (0, _objectWithoutProperties2.default)(props, _excluded); // 带有删除的
 
   if (modeType === 'edit' && treeData.category) {
     treeData.category = traverse(treeData.category);
@@ -108,8 +108,12 @@ var LeftSide = function LeftSide(props) {
   }),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       useTree = _useState2[0],
-      setTree = _useState2[1]; // 左侧树分类变化事件
+      setTree = _useState2[1];
 
+  (0, _react.useEffect)(function () {
+    useTree.treeData = treeData.category;
+    setTree((0, _objectSpread2.default)({}, useTree));
+  }, [treeData]); // 左侧树分类变化事件
 
   var getTreeTypeChange = function getTreeTypeChange(value) {
     var title = treeType.data.find(function (v) {

package/lib/LmEditTable/sortableItemCol.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export default function SortableItem(props: any): JSX.Element;

package/lib/LmFilter/LmFilter.js

@@ -43,6 +43,8 @@ var LmFilter = function LmFilter(_ref, ref) {
     // 是否启用自定义筛选
     enableClear: true,
     // 是否展示一件清空
+    enableAutoString: true,
+    // 是否自动将筛选结构值转换为字符串
     size: 'middle',
     // 尺寸
     searchKey: 'search',

package/lib/LmFilter/filterFns/index.d.ts

@@ -0,0 +1,60 @@
+export declare const initLocalization: (props: any) => {
+    searchFilter: any;
+    searchQuery: {};
+    basicFilter: any;
+    basicQuery: {};
+    customFilter: any;
+    customQuery: {};
+};
+declare const useCoreOptions: ({ state, dispatch, props }: {
+    state: any;
+    dispatch: any;
+    props: any;
+}) => {
+    CoreMethods: {
+        onQuery: ({ complexFilter, type, basicFilter, basicQuery, searchFilter, searchQuery, customFilter, }?: {
+            complexFilter?: {};
+            type?: string;
+            basicFilter?: any;
+            basicQuery?: any;
+            searchFilter?: any;
+            searchQuery?: any;
+            customFilter?: any;
+        }) => void;
+        setCustomFilter: (val: any) => void;
+        setSearchFilter: (itemValue: any) => void;
+    };
+    RefMethods: {
+        getState: () => any;
+        getBasicFilter: () => any;
+        getFilterValue: ({ field, type }: {
+            field: any;
+            type: any;
+        }) => any;
+        getFilterQuery: (originData?: any) => {
+            fuzzyFilter: any;
+            basicFilter: {};
+            fuzzyQuery: {
+                filters: {
+                    conditions: any[];
+                }[];
+            };
+            globalQuery: {
+                filters: {
+                    conditions: any[];
+                }[];
+            };
+            filterQuery: {
+                filters: {
+                    conditions: any[];
+                }[];
+            };
+            type: string;
+        };
+        setFilterValue: (itemValue: any, item: any) => void;
+        setFilterFieldValue: (field: any, value: any) => void;
+        setLocalization: (localization?: any) => void;
+        onClearChange: () => void;
+    };
+};
+export default useCoreOptions;

package/lib/LmFilter/filterFns/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -13,15 +11,13 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 
 var _utils = require("../utils");
 
 // 初始化查询结构
 var initLocalization = function initLocalization(props) {
-  var _globalQuery$filters, _globalQuery$filters$, _fuzzyQuery$filters, _fuzzyQuery$filters$, _filterQuery$filters, _filterQuery$filters$;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
 
   var localization = props.localization,
       dataSource = props.dataSource,
@@ -40,17 +36,15 @@ var initLocalization = function initLocalization(props) {
   var searchQuery = {}; // 模糊查询结构
 
   var customFilter = (customOptions === null || customOptions === void 0 ? void 0 : customOptions.find(function (v) {
-    var _localization$customF;
+    var _a;
 
-    return (v === null || v === void 0 ? void 0 : v.value) === (localization === null || localization === void 0 ? void 0 : (_localization$customF = localization.customFilter) === null || _localization$customF === void 0 ? void 0 : _localization$customF.value);
+    return (v === null || v === void 0 ? void 0 : v.value) === ((_a = localization === null || localization === void 0 ? void 0 : localization.customFilter) === null || _a === void 0 ? void 0 : _a.value);
   })) || {};
   var customQuery = {}; // 自定义筛选存储结构
   // 一级查询
 
-  if (globalQuery === null || globalQuery === void 0 ? void 0 : (_globalQuery$filters = globalQuery.filters) === null || _globalQuery$filters === void 0 ? void 0 : (_globalQuery$filters$ = _globalQuery$filters[0]) === null || _globalQuery$filters$ === void 0 ? void 0 : _globalQuery$filters$.conditions) {
-    var _globalQuery$filters2, _globalQuery$filters3;
-
-    var globalQueryArr = (globalQuery === null || globalQuery === void 0 ? void 0 : (_globalQuery$filters2 = globalQuery.filters) === null || _globalQuery$filters2 === void 0 ? void 0 : (_globalQuery$filters3 = _globalQuery$filters2[0]) === null || _globalQuery$filters3 === void 0 ? void 0 : _globalQuery$filters3.conditions) || [];
+  if ((_b = (_a = globalQuery === null || globalQuery === void 0 ? void 0 : globalQuery.filters) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.conditions) {
+    var globalQueryArr = ((_d = (_c = globalQuery === null || globalQuery === void 0 ? void 0 : globalQuery.filters) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.conditions) || [];
     customQuery = globalQueryArr.reduce(function (pre, cur) {
       var checkedValue = cur.value; // 选中的数据
       // 查找该数据是否展示
@@ -65,11 +59,9 @@ var initLocalization = function initLocalization(props) {
 
 
   if ((0, _utils.getIsHas)(searchFilter)) {
-    var _Object$keys;
-
-    searchQuery = (_Object$keys = Object.keys(searchFilter)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.reduce(function (pre, cur) {
+    searchQuery = (_e = Object.keys(searchFilter)) === null || _e === void 0 ? void 0 : _e.reduce(function (pre, cur) {
       if ((0, _utils.getIsHas)(searchFilter[cur])) {
-        pre[cur] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, searchConfig), {}, {
+        pre[cur] = Object.assign(Object.assign({}, searchConfig), {
           fieldName: cur,
           value: [searchFilter[cur]]
         });
@@ -77,10 +69,8 @@ var initLocalization = function initLocalization(props) {
 
       return pre;
     }, {});
-  } else if (fuzzyQuery === null || fuzzyQuery === void 0 ? void 0 : (_fuzzyQuery$filters = fuzzyQuery.filters) === null || _fuzzyQuery$filters === void 0 ? void 0 : (_fuzzyQuery$filters$ = _fuzzyQuery$filters[0]) === null || _fuzzyQuery$filters$ === void 0 ? void 0 : _fuzzyQuery$filters$.conditions) {
-    var _fuzzyQuery$filters2, _fuzzyQuery$filters2$;
-
-    var fuzzyQueryArr = (fuzzyQuery === null || fuzzyQuery === void 0 ? void 0 : (_fuzzyQuery$filters2 = fuzzyQuery.filters) === null || _fuzzyQuery$filters2 === void 0 ? void 0 : (_fuzzyQuery$filters2$ = _fuzzyQuery$filters2[0]) === null || _fuzzyQuery$filters2$ === void 0 ? void 0 : _fuzzyQuery$filters2$.conditions) || []; // 初始化基础查询缓存
+  } else if ((_g = (_f = fuzzyQuery === null || fuzzyQuery === void 0 ? void 0 : fuzzyQuery.filters) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.conditions) {
+    var fuzzyQueryArr = ((_j = (_h = fuzzyQuery === null || fuzzyQuery === void 0 ? void 0 : fuzzyQuery.filters) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.conditions) || []; // 初始化基础查询缓存
 
     searchFilter = fuzzyQueryArr.reduce(function (pre, cur) {
       var checkedValue = cur.value; // 选中的数据
@@ -96,9 +86,7 @@ var initLocalization = function initLocalization(props) {
 
 
   if ((0, _utils.getIsHas)(basicFilter)) {
-    var _Object$keys2;
-
-    basicQuery = (_Object$keys2 = Object.keys(basicFilter)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.reduce(function (pre, cur) {
+    basicQuery = (_k = Object.keys(basicFilter)) === null || _k === void 0 ? void 0 : _k.reduce(function (pre, cur) {
       var item = dataSource.find(function (v) {
         if (cur === v.field) {
           return v.show || typeof v.show !== 'boolean';
@@ -116,22 +104,18 @@ var initLocalization = function initLocalization(props) {
       }
 
       if ((0, _utils.getIsHas)(basicFilter[cur]) && !!item) {
-        var _item, _item2;
-
         pre[cur] = {
           fieldName: cur,
-          fieldType: ((_item = item) === null || _item === void 0 ? void 0 : _item.valueType) || 'string',
+          fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
           value: Array.isArray(basicFilter[cur]) ? basicFilter[cur] : [basicFilter[cur]],
-          operator: ((_item2 = item) === null || _item2 === void 0 ? void 0 : _item2.operator) || 'equal'
+          operator: (item === null || item === void 0 ? void 0 : item.operator) || 'equal'
         };
       }
 
       return pre;
     }, {});
-  } else if (filterQuery === null || filterQuery === void 0 ? void 0 : (_filterQuery$filters = filterQuery.filters) === null || _filterQuery$filters === void 0 ? void 0 : (_filterQuery$filters$ = _filterQuery$filters[0]) === null || _filterQuery$filters$ === void 0 ? void 0 : _filterQuery$filters$.conditions) {
-    var _filterQuery$filters2, _filterQuery$filters3;
-
-    var filterQueryArr = (filterQuery === null || filterQuery === void 0 ? void 0 : (_filterQuery$filters2 = filterQuery.filters) === null || _filterQuery$filters2 === void 0 ? void 0 : (_filterQuery$filters3 = _filterQuery$filters2[0]) === null || _filterQuery$filters3 === void 0 ? void 0 : _filterQuery$filters3.conditions) || []; // 初始化基础查询缓存
+  } else if ((_m = (_l = filterQuery === null || filterQuery === void 0 ? void 0 : filterQuery.filters) === null || _l === void 0 ? void 0 : _l[0]) === null || _m === void 0 ? void 0 : _m.conditions) {
+    var filterQueryArr = ((_p = (_o = filterQuery === null || filterQuery === void 0 ? void 0 : filterQuery.filters) === null || _o === void 0 ? void 0 : _o[0]) === null || _p === void 0 ? void 0 : _p.conditions) || []; // 初始化基础查询缓存
 
     basicFilter = filterQueryArr.reduce(function (pre, cur) {
       var checkedValue = cur.value; // 选中的数据
@@ -182,12 +166,13 @@ var useCoreOptions = function useCoreOptions(_ref) {
       dataSource = props.dataSource,
       searchKey = props.searchKey,
       searchConfig = props.searchConfig,
-      customOptions = props.customOptions; // 转换一级查询结构 object => array
+      customOptions = props.customOptions,
+      enableAutoString = props.enableAutoString; // 转换一级查询结构 object => array
 
   var tranformGlobalQuery = (0, _react.useCallback)(function (obj) {
-    var _Object$keys3;
+    var _a;
 
-    var nArr = ((_Object$keys3 = Object.keys(obj)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.reduce(function (pre, cur) {
+    var nArr = ((_a = Object.keys(obj)) === null || _a === void 0 ? void 0 : _a.reduce(function (pre, cur) {
       var item = dataSource.find(function (v) {
         return cur === v.field;
       });
@@ -209,14 +194,14 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [dataSource]); // 转行查询结构
 
   var tranformQuery = (0, _react.useCallback)(function (_ref2) {
-    var _Object$keys4, _Object$keys5;
-
-    var _ref2$customFilter = _ref2.customFilter,
-        customFilter = _ref2$customFilter === void 0 ? {} : _ref2$customFilter,
+    var customFilter = _ref2.customFilter,
         _ref2$searchQuery = _ref2.searchQuery,
         searchQuery = _ref2$searchQuery === void 0 ? {} : _ref2$searchQuery,
         _ref2$basicQuery = _ref2.basicQuery,
         basicQuery = _ref2$basicQuery === void 0 ? {} : _ref2$basicQuery;
+
+    var _a, _b;
+
     var globalQuery = {
       filters: [{
         conditions: tranformGlobalQuery(customFilter === null || customFilter === void 0 ? void 0 : customFilter.data)
@@ -224,14 +209,14 @@ var useCoreOptions = function useCoreOptions(_ref) {
     };
     var fuzzyQuery = {
       filters: [{
-        conditions: (_Object$keys4 = Object.keys(searchQuery)) === null || _Object$keys4 === void 0 ? void 0 : _Object$keys4.map(function (k) {
+        conditions: (_a = Object.keys(searchQuery)) === null || _a === void 0 ? void 0 : _a.map(function (k) {
           return searchQuery[k];
         })
       }]
     };
     var filterQuery = {
       filters: [{
-        conditions: (_Object$keys5 = Object.keys(basicQuery)) === null || _Object$keys5 === void 0 ? void 0 : _Object$keys5.map(function (k) {
+        conditions: (_b = Object.keys(basicQuery)) === null || _b === void 0 ? void 0 : _b.map(function (k) {
           return basicQuery[k];
         })
       }]
@@ -260,6 +245,8 @@ var useCoreOptions = function useCoreOptions(_ref) {
         _ref3$customFilter = _ref3.customFilter,
         customFilter = _ref3$customFilter === void 0 ? state.customFilter || {} : _ref3$customFilter;
 
+    var _a;
+
     if (type === 'custom') {
       dispatch({
         type: 'changeCustomFilter',
@@ -354,10 +341,8 @@ var useCoreOptions = function useCoreOptions(_ref) {
     }
 
     if (type === 'complex') {
-      var _Object$keys6;
-
       // eslint-disable-next-line no-shadow
-      var _basicQuery = (_Object$keys6 = Object.keys(complexFilter)) === null || _Object$keys6 === void 0 ? void 0 : _Object$keys6.reduce(function (pre, cur) {
+      var _basicQuery = (_a = Object.keys(complexFilter)) === null || _a === void 0 ? void 0 : _a.reduce(function (pre, cur) {
         var item = dataSource.find(function (v) {
           return cur === v.field;
         });
@@ -446,7 +431,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [tranformQuery, state]); // 清除事件
 
   var onClearChange = (0, _react.useCallback)(function () {
-    var _props$onClearChange;
+    var _a;
 
     var params = {
       searchFilter: {},
@@ -456,7 +441,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
       basicQuery: {},
       type: 'clear'
     };
-    (_props$onClearChange = props.onClearChange) === null || _props$onClearChange === void 0 ? void 0 : _props$onClearChange.call(props, params);
+    (_a = props.onClearChange) === null || _a === void 0 ? void 0 : _a.call(props, params);
     onQuery(params);
   }, [onQuery]); // 根据字段查找过滤的数据, 不存在时返回默认值
 
@@ -508,14 +493,16 @@ var useCoreOptions = function useCoreOptions(_ref) {
     var field = item.field;
 
     if (field) {
-      // 基础查询数据(受控数据)
-      var basicFilter = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.basicFilter), {}, (0, _defineProperty2.default)({}, field, itemValue)); // 外部查询数据结构
+      // 将结果转换为字符串
+      var stringValue = enableAutoString ? String(itemValue) : itemValue; // 基础查询数据(受控数据)
+
+      var basicFilter = Object.assign(Object.assign({}, state.basicFilter), (0, _defineProperty2.default)({}, field, stringValue)); // 外部查询数据结构
 
-      var basicQuery = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.basicQuery), {}, (0, _defineProperty2.default)({}, field, {
+      var basicQuery = Object.assign(Object.assign({}, state.basicQuery), (0, _defineProperty2.default)({}, field, {
         fieldName: field,
         fieldType: item.valueType || 'string',
         type: item.type,
-        value: Array.isArray(itemValue) ? itemValue : [itemValue],
+        value: Array.isArray(stringValue) ? stringValue : [stringValue],
         operator: item.operator || 'equal'
       })); // 数据清除时不返回结构体
 
@@ -543,7 +530,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
   var setLocalization = (0, _react.useCallback)(function () {
     var localization = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : props.localization;
 
-    var _initLocalization = initLocalization((0, _objectSpread4.default)((0, _objectSpread4.default)({}, props), {}, {
+    var _initLocalization = initLocalization(Object.assign(Object.assign({}, props), {
       localization: localization
     })),
         searchFilter = _initLocalization.searchFilter,
@@ -579,18 +566,18 @@ var useCoreOptions = function useCoreOptions(_ref) {
     });
   }, [props]); // 模糊查询结构
 
-  var setSearchFilter = (0, _react.useCallback)(function (itemValue, item) {
+  var setSearchFilter = (0, _react.useCallback)(function (itemValue) {
     var searchFilter = searchKey === null || searchKey === void 0 ? void 0 : searchKey.reduce(function (pre, cur) {
       pre[cur] = itemValue;
       return pre;
-    }, (0, _objectSpread4.default)({}, state.searchFilter));
+    }, Object.assign({}, state.searchFilter));
     var searchQuery = searchKey === null || searchKey === void 0 ? void 0 : searchKey.reduce(function (pre, cur) {
-      pre[cur] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, searchConfig), {}, {
+      pre[cur] = Object.assign(Object.assign({}, searchConfig), {
         fieldName: cur,
         value: [itemValue]
       });
       return pre;
-    }, (0, _objectSpread4.default)({}, state.searchQuery)); // 数据清除时不返回结构体
+    }, Object.assign({}, state.searchQuery)); // 数据清除时不返回结构体
 
     if (!(0, _utils.getIsHas)(itemValue)) {
       searchFilter = {};