fan-standard-comp 4.1.37 → 4.1.39

package/es/FormComp/Uploader/index.js

@@ -488,13 +488,14 @@ var Uploader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var renderButton = function renderButton() {
       if (fileType === 'image' || fileType === 'svg' || fileType === 'video') {
         return /*#__PURE__*/React.createElement("div", {
-          className: 'spec-uploader-control'
+          className: "spec-uploader-control ".concat(otherProps.disabled || viewOnly ? 'spec-uploader-control-disabled' : '')
         }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("div", {
           className: "ant-upload-text"
         }, (lang === null || lang === void 0 ? void 0 : lang['field.upload.select']) || '点击选择'));
       }
       return /*#__PURE__*/React.createElement(Button, {
-        className: 'spec-uploader-button'
+        className: 'spec-uploader-button',
+        disabled: otherProps.disabled || viewOnly
       }, /*#__PURE__*/React.createElement(PlusOutlined, null), (lang === null || lang === void 0 ? void 0 : lang['field.upload.select']) || '点击选择');
     };
     if (maxCountLimit && uploaderFileList.length === maxCountLimit) {
@@ -504,7 +505,7 @@ var Uploader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, " ", children, " ");
     }
     return /*#__PURE__*/React.createElement(React.Fragment, null, renderButton());
-  }, [fileType, children, uploaderFileList, maxCountLimit]);
+  }, [fileType, children, uploaderFileList, maxCountLimit, otherProps.disabled, viewOnly]);
   var RenderUpload = function RenderUpload() {
     return /*#__PURE__*/React.createElement(Upload, _extends({
       customRequest: function customRequest(options) {

package/es/StandardFilter/index.js

@@ -347,7 +347,14 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (Object.prototype.hasOwnProperty.call(formValues, false)) {
       delete formValues.false; // 自定义结构会莫名的出来一个false字段
     }
-    calculateHideCount(filterForm, reFormItemGroup); // 更新当前表单数量，排除被隐藏的值
+    // calculateHideCount(filterForm, reFormItemGroup)
+    // 更新当前表单数量，排除被隐藏的值
+    if (collapseable && filterFormLayout === "horizontal") {
+      updateGroupByCollapsed(formItemGroup, formValues).then(function (groups) {
+        setReFormItemGroup(groups);
+        calculateHideCount(filterForm, groups);
+      });
+    }
     if (getFormFields) getFormFields(formValues, _objectSpread({
       current: filterForm
     }, filterForm));
@@ -412,6 +419,9 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
     return isHide || false;
   };
+  /**
+   * 更新折叠状态
+   * */
   var updateGroupByCollapsed = function updateGroupByCollapsed(groups, formValues) {
     var showItemNumber = columnNumberAndSize.columnNumber - 1;
     return new Promise(function (resolve, reject) {

package/es/StandardList/SortableItem.js

@@ -11,7 +11,7 @@ import { CSS } from '@dnd-kit/utilities';
 import classNames from "classnames";
 import { Checkbox } from "antd";
 import ButtonGroup from "../ButtonGroup";
-import { HolderOutlined, MoreOutlined } from "@ant-design/icons";
+import { DragOutlined, MoreOutlined } from "@ant-design/icons";
 
 // 拖拽项组件
 var SortableItem = function SortableItem(itemProps) {
@@ -72,7 +72,7 @@ var SortableItem = function SortableItem(itemProps) {
     className: 'spec-standard-list-selections-label'
   }, sortable && handle ? /*#__PURE__*/React.createElement("span", _extends({
     className: 'spec-standard-list-selections-label-sortable'
-  }, listeners), handleRender || /*#__PURE__*/React.createElement(HolderOutlined, null)) : '', multiple && checkable && /*#__PURE__*/React.createElement(Checkbox, {
+  }, listeners), handleRender || /*#__PURE__*/React.createElement(DragOutlined, null)) : '', multiple && checkable && /*#__PURE__*/React.createElement(Checkbox, {
     disabled: item[optionName === null || optionName === void 0 ? void 0 : optionName.disabled] || item.disabled || disabled,
     checked: (selectedKeys || []).includes(item[optionName === null || optionName === void 0 ? void 0 : optionName.value] || (item === null || item === void 0 ? void 0 : item.value)),
     onChange: function onChange(evt) {

package/es/utils/getParentNodes.js

@@ -328,8 +328,9 @@ export var filterTreeNodes = function filterTreeNodes(list, nodeKey) {
   var result = [];
   var filterList = _toConsumableArray(list);
   filterList.forEach(function (item) {
+    var _item, _item$toLowerCase;
     var nItem = null;
-    if (item[params.keyParam || 'name'].toLowerCase().includes(nodeKey === null || nodeKey === void 0 ? void 0 : nodeKey.toLowerCase())) {
+    if ((((_item = item[params.keyParam || 'name']) === null || _item === void 0 || (_item$toLowerCase = _item.toLowerCase) === null || _item$toLowerCase === void 0 ? void 0 : _item$toLowerCase.call(_item)) || '').includes(nodeKey === null || nodeKey === void 0 ? void 0 : nodeKey.toLowerCase())) {
       nItem = _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, params.childrenParam || 'children', []));
     }
     if (item[params.childrenParam || 'children'] && item[params.childrenParam || 'children'].length) {

package/es/utils/urlUtils.js

@@ -84,7 +84,7 @@ export var transSearchByColumn = function transSearchByColumn(params) {
   Object.keys(paramOrders).forEach(function (oItem) {
     orders.push({
       column: oItem,
-      asc: paramOrders[oItem] === 'descend'
+      asc: paramOrders[oItem] === 'ascend'
     });
   });
   paramsKeys[transOptionName || 'orders'] = orders.length ? orders : undefined;

package/lib/FormComp/Uploader/index.js

@@ -497,13 +497,14 @@ var Uploader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var renderButton = function renderButton() {
       if (fileType === 'image' || fileType === 'svg' || fileType === 'video') {
         return /*#__PURE__*/_react.default.createElement("div", {
-          className: 'spec-uploader-control'
+          className: "spec-uploader-control ".concat(otherProps.disabled || viewOnly ? 'spec-uploader-control-disabled' : '')
         }, /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null), /*#__PURE__*/_react.default.createElement("div", {
           className: "ant-upload-text"
         }, (lang === null || lang === void 0 ? void 0 : lang['field.upload.select']) || '点击选择'));
       }
       return /*#__PURE__*/_react.default.createElement(_antd.Button, {
-        className: 'spec-uploader-button'
+        className: 'spec-uploader-button',
+        disabled: otherProps.disabled || viewOnly
       }, /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null), (lang === null || lang === void 0 ? void 0 : lang['field.upload.select']) || '点击选择');
     };
     if (maxCountLimit && uploaderFileList.length === maxCountLimit) {
@@ -513,7 +514,7 @@ var Uploader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, " ", children, " ");
     }
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderButton());
-  }, [fileType, children, uploaderFileList, maxCountLimit]);
+  }, [fileType, children, uploaderFileList, maxCountLimit, otherProps.disabled, viewOnly]);
   var RenderUpload = function RenderUpload() {
     return /*#__PURE__*/_react.default.createElement(_antd.Upload, _extends({
       customRequest: function customRequest(options) {

package/lib/StandardFilter/index.js

@@ -355,7 +355,14 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     if (Object.prototype.hasOwnProperty.call(formValues, false)) {
       delete formValues.false; // 自定义结构会莫名的出来一个false字段
     }
-    calculateHideCount(filterForm, reFormItemGroup); // 更新当前表单数量，排除被隐藏的值
+    // calculateHideCount(filterForm, reFormItemGroup)
+    // 更新当前表单数量，排除被隐藏的值
+    if (collapseable && filterFormLayout === "horizontal") {
+      updateGroupByCollapsed(formItemGroup, formValues).then(function (groups) {
+        setReFormItemGroup(groups);
+        calculateHideCount(filterForm, groups);
+      });
+    }
     if (getFormFields) getFormFields(formValues, _objectSpread({
       current: filterForm
     }, filterForm));
@@ -420,6 +427,9 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     }
     return isHide || false;
   };
+  /**
+   * 更新折叠状态
+   * */
   var updateGroupByCollapsed = function updateGroupByCollapsed(groups, formValues) {
     var showItemNumber = columnNumberAndSize.columnNumber - 1;
     return new Promise(function (resolve, reject) {

package/lib/StandardList/SortableItem.js

@@ -78,7 +78,7 @@ var SortableItem = function SortableItem(itemProps) {
     className: 'spec-standard-list-selections-label'
   }, sortable && handle ? /*#__PURE__*/_react.default.createElement("span", _extends({
     className: 'spec-standard-list-selections-label-sortable'
-  }, listeners), handleRender || /*#__PURE__*/_react.default.createElement(_icons.HolderOutlined, null)) : '', multiple && checkable && /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
+  }, listeners), handleRender || /*#__PURE__*/_react.default.createElement(_icons.DragOutlined, null)) : '', multiple && checkable && /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
     disabled: item[optionName === null || optionName === void 0 ? void 0 : optionName.disabled] || item.disabled || disabled,
     checked: (selectedKeys || []).includes(item[optionName === null || optionName === void 0 ? void 0 : optionName.value] || (item === null || item === void 0 ? void 0 : item.value)),
     onChange: function onChange(evt) {

package/lib/utils/getParentNodes.js

@@ -334,8 +334,9 @@ var filterTreeNodes = exports.filterTreeNodes = function filterTreeNodes(list, n
   var result = [];
   var filterList = _toConsumableArray(list);
   filterList.forEach(function (item) {
+    var _item, _item$toLowerCase;
     var nItem = null;
-    if (item[params.keyParam || 'name'].toLowerCase().includes(nodeKey === null || nodeKey === void 0 ? void 0 : nodeKey.toLowerCase())) {
+    if ((((_item = item[params.keyParam || 'name']) === null || _item === void 0 || (_item$toLowerCase = _item.toLowerCase) === null || _item$toLowerCase === void 0 ? void 0 : _item$toLowerCase.call(_item)) || '').includes(nodeKey === null || nodeKey === void 0 ? void 0 : nodeKey.toLowerCase())) {
       nItem = _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, params.childrenParam || 'children', []));
     }
     if (item[params.childrenParam || 'children'] && item[params.childrenParam || 'children'].length) {

package/lib/utils/urlUtils.js

@@ -88,7 +88,7 @@ var transSearchByColumn = exports.transSearchByColumn = function transSearchByCo
   Object.keys(paramOrders).forEach(function (oItem) {
     orders.push({
       column: oItem,
-      asc: paramOrders[oItem] === 'descend'
+      asc: paramOrders[oItem] === 'ascend'
     });
   });
   paramsKeys[transOptionName || 'orders'] = orders.length ? orders : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.1.37",
+  "version": "4.1.39",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -19,7 +19,7 @@
     "lint": "npm run lint:es && npm run lint:css",
     "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "package-to-tgz": "tar -czf fan-standard-comp-4.1.34.tgz package && yarn"
+    "package-to-tgz": "tar -czf fan-standard-comp-4.1.39.tgz package && yarn"
   },
   "authors": [
     "shomychen"