wargerm 0.2.26 → 0.2.27

package/dist/components/WForm/index.d.ts

@@ -39,6 +39,7 @@ export interface Isearch {
     filterType?: 'query' | 'light';
     searchText?: string;
     resetText?: string;
+    hideResetBtn?: boolean;
     submitText?: string;
     hideSubmit?: boolean;
     transform?: (value: any) => any;

package/dist/index.esm.js

@@ -8795,7 +8795,8 @@ var WForm = function WForm(props, ref) {
   });
   return /*#__PURE__*/React.createElement(_Form, _objectSpread2({
     style: {
-      marginBottom: '20px'
+      marginBottom: '20px',
+      width: '100%'
     },
     onFinish: handleSearch,
     onValuesChange: function onValuesChange(changedValues, allValues) {
@@ -8803,9 +8804,7 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm), /*#__PURE__*/React.createElement(_Row, null, filterExtraColumnsForm), search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Row, {
-    justify: "end"
-  }, /*#__PURE__*/React.createElement(_Col, {
+  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Col, {
     style: {
       paddingLeft: '12px',
       paddingRight: '12px'
@@ -8821,14 +8820,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
-  }, search && search.searchText ? search.searchText : '提交'), /*#__PURE__*/React.createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     onClick: handleRest,
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
-  }, search && search.resetText ? search.resetText : '重置')]), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
+  }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
@@ -8849,7 +8848,7 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
-  }, "\u63D0\u4EA4"), /*#__PURE__*/React.createElement(WButton, {
+  }, "\u63D0\u4EA4"), search.hideResetBtn ? null : /*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'

package/dist/index.js

@@ -8829,7 +8829,8 @@ var WForm = function WForm(props, ref) {
   });
   return /*#__PURE__*/React__default['default'].createElement(_Form__default['default'], _objectSpread2({
     style: {
-      marginBottom: '20px'
+      marginBottom: '20px',
+      width: '100%'
     },
     onFinish: handleSearch,
     onValuesChange: function onValuesChange(changedValues, allValues) {
@@ -8837,9 +8838,7 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterExtraColumnsForm), search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], {
-    justify: "end"
-  }, /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], {
+  }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], {
     style: {
       paddingLeft: '12px',
       paddingRight: '12px'
@@ -8855,14 +8854,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
-  }, search && search.searchText ? search.searchText : '提交'), /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     onClick: handleRest,
     icon: /*#__PURE__*/React__default['default'].createElement(icons.ReloadOutlined, null)
-  }, search && search.resetText ? search.resetText : '重置')]), !search ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
@@ -8883,7 +8882,7 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
-  }, "\u63D0\u4EA4"), /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, "\u63D0\u4EA4"), search.hideResetBtn ? null : /*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'

package/package.json

@@ -1,79 +1,79 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.2.26",
-  "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.min.js",
-  "typings": "dist/index.d.ts",
-  "author": "jinly2",
-  "license": "MIT",
-  "keywords": [
-    "React",
-    "Component"
-  ],
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
-    "branch": "main"
-  },
-  "files": [
-    "dist",
-    "es",
-    "lib",
-    "index.css"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-form": "^1.49.3",
-    "@ant-design/pro-table": "^2.58.1",
-    "animate.css": "^4.1.1",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "swiper": "^6.7.0"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.2.0",
-    "antd": ">=4.7.0",
-    "classnames": ">=2.2.0",
-    "lodash": ">=4.0.0",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash": "^4.14.173",
-    "@types/react-dom": "^17.0.11",
-    "@umijs/test": "^3.0.5",
-    "antd": "^4.16.13",
-    "babel-plugin-import": "^1.13.3",
-    "classnames": "^2.3.1",
-    "dumi": "^1.1.31",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "yorkie": "^2.0.0"
-  }
-}
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.2.27",
+  "scripts": {
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.min.js",
+  "typings": "dist/index.d.ts",
+  "author": "jinly2",
+  "license": "MIT",
+  "keywords": [
+    "React",
+    "Component"
+  ],
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
+    "branch": "main"
+  },
+  "files": [
+    "dist",
+    "es",
+    "lib",
+    "index.css"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-form": "^1.49.3",
+    "@ant-design/pro-table": "^2.58.1",
+    "animate.css": "^4.1.1",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "swiper": "^6.7.0"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.2.0",
+    "antd": ">=4.7.0",
+    "classnames": ">=2.2.0",
+    "lodash": ">=4.0.0",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash": "^4.14.173",
+    "@types/react-dom": "^17.0.11",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.16.13",
+    "babel-plugin-import": "^1.13.3",
+    "classnames": "^2.3.1",
+    "dumi": "^1.1.31",
+    "father-build": "^1.19.1",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "yorkie": "^2.0.0"
+  }
+}