vap - npm Package Compare versions

Comparing version 1.9.5 to 1.9.6

layouts/admin/DataTable/index.d.ts

@@ -7,3 +7,3 @@ /// <reference types="react" />
 */
-export default class TableLayout<T> extends React.PureComponent<DataTableProps<T>, any> {
+export default class <T> extends React.PureComponent<DataTableProps<T>, any> {
     rowKey: string;
@@ -18,6 +18,6 @@ sorter: {};
     };
-    private query;
+    private param;
     componentDidMount(): void;
     reflush: (param?: {}) => void;
-    onQuery(param: any): void;
+    query: (param: any) => void;
     search(pagination: any, filters: any, sorter: any): void;
@@ -24,0 +24,0 @@ onSelect(selectedRowKeys: any, selectObjects: any): void;

layouts/admin/DataTable/index.js

@@ -25,3 +25,3 @@ "use strict";
 var _ = require("lodash");
-var FormPanel_1 = require("../FormPanel");
+var QueryPanel_1 = require("../QueryPanel");
 var DefaultPageSize = 10;
@@ -31,5 +31,5 @@ /**
 */
-var TableLayout = /** @class */ (function (_super) {
-    __extends(TableLayout, _super);
-    function TableLayout() {
+var default_1 = /** @class */ (function (_super) {
+    __extends(default_1, _super);
+    function default_1() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
@@ -45,3 +45,3 @@ _this.rowKey = 'id';
         };
-        _this.query = {
+        _this.param = {
             start_: 0,
@@ -54,34 +54,34 @@ count_: DefaultPageSize,
             if (param === void 0) { param = {}; }
-            _this.onQuery(_.extend(_this.query, { start_: 0 }, param));
+            _this.query(_.extend(_this.param, { start_: 0 }, param));
         };
+        _this.query = function (param) {
+            _.extend(_this.param, param, { start_: 0 });
+            _this.setState({
+                current: 1,
+                selectedRowKeys: [],
+                selectedRows: [],
+            });
+            _this.props.dispatch({
+                type: _this.props.fetch,
+                query: _.extend({}, _this.props.default, _this.param)
+            });
+        };
         return _this;
     }
-    TableLayout.prototype.componentDidMount = function () {
+    default_1.prototype.componentDidMount = function () {
         //@ts-ignore
         this.rowKey = this.props.rowKey || 'id';
-        this.query.order_ = this.rowKey;
+        this.param.order_ = this.rowKey;
         if (_.has(this.props, 'sort')) {
-            this.query.order_ = this.props.sort.order;
-            this.query.by_ = this.props.sort.by;
+            this.param.order_ = this.props.sort.order;
+            this.param.by_ = this.props.sort.by;
         }
         var param = {
             type: this.props.fetch,
-            query: _.extend({}, this.props.default, this.query)
+            query: _.extend({}, this.props.default, this.param)
         };
         this.props.dispatch(param);
     };
-    TableLayout.prototype.onQuery = function (param) {
-        _.extend(this.query, param, { start_: 0 });
-        this.setState({
-            current: 1,
-            selectedRowKeys: [],
-            selectedRows: [],
-        });
-        this.props.dispatch({
-            type: this.props.fetch,
-            query: _.extend({}, this.props.default, this.query)
-        });
-    };
-    TableLayout.prototype.search = function (pagination, filters, sorter) {
-        var query = __assign({}, this.query, { start_: (pagination.current - 1) * pagination.pageSize, count_: pagination.pageSize });
+    default_1.prototype.search = function (pagination, filters, sorter) {
+        var query = __assign({}, this.param, { start_: (pagination.current - 1) * pagination.pageSize, count_: pagination.pageSize });
         var state = {};
@@ -120,3 +120,3 @@ if (!_.isEqual(this.sorter, sorter)) {
     // }
-    TableLayout.prototype.onSelect = function (selectedRowKeys, selectObjects) {
+    default_1.prototype.onSelect = function (selectedRowKeys, selectObjects) {
         this.setState({
@@ -126,3 +126,3 @@ selectedRowKeys: selectedRowKeys, selectObjects: selectObjects
     };
-    TableLayout.prototype.render = function () {
+    default_1.prototype.render = function () {
         var _this = this;
@@ -163,10 +163,3 @@ var params = {};
         return (React.createElement(antd_1.Layout, null,
-            this.props.queryPanel ? React.createElement(FormPanel_1.default, __assign({}, this.props.queryPanel, { onQuery: function (param) {
-                    if (_.has(_this.props.queryPanel, 'onQuery')) {
-                        _this.props.queryPanel.onQuery(param);
-                    }
-                    else {
-                        _this.onQuery(param);
-                    }
-                } })) : '',
+            this.props.queryPanel ? React.createElement(QueryPanel_1.default, __assign({}, this.props.queryPanel)) : [],
             React.createElement(antd_1.Layout.Content, null,
@@ -188,4 +181,4 @@ React.createElement(antd_1.Table, __assign({}, this.props, params, { rowClassName: function (record, index) {
     };
-    return TableLayout;
+    return default_1;
 }(React.PureComponent));
-exports.default = TableLayout;
+exports.default = default_1;

layouts/admin/DataTable/interface.d.ts

@@ -1,2 +0,2 @@
-import { FormPanelOpts } from '../FormPanel/interface';
+import { QueryPanelOpts } from '../QueryPanel/interface';
 import { TableProps, ColumnProps } from 'antd/lib/table/interface';
@@ -95,3 +95,3 @@ /**
 export interface DataTableProps<T> extends TableProps<T> {
-    queryPanel?: FormPanelOpts;
+    queryPanel?: QueryPanelOpts;
     /**
@@ -98,0 +98,0 @@ * 列定义，参考 antd table columns ，扩展 show 属性

layouts/admin/index.d.ts

@@ -57,3 +57,3 @@ /**
 export { default as DataTable } from './DataTable';
-export { default as FormPanel } from './FormPanel';
+export { default as QueryPanel } from './QueryPanel';
 export { default as TableLayout } from './TableLayout';
@@ -60,0 +60,0 @@ export { default as FromModal } from '../Common/FormModal';

layouts/admin/index.js

@@ -114,4 +114,4 @@ "use strict";
 exports.DataTable = DataTable_1.default;
-var FormPanel_1 = require("./FormPanel");
-exports.FormPanel = FormPanel_1.default;
+var QueryPanel_1 = require("./QueryPanel");
+exports.QueryPanel = QueryPanel_1.default;
 var TableLayout_1 = require("./TableLayout");
@@ -118,0 +118,0 @@ exports.TableLayout = TableLayout_1.default;

layouts/admin/TableLayout/TableHeader.js

@@ -205,2 +205,5 @@ "use strict";
             }
+            if (action.type) {
+                param.type = action.type;
+            }
             if (action.action) {
@@ -207,0 +210,0 @@ // console.log(this.props.selected)

layouts/common/ListModal/index.js

@@ -25,3 +25,2 @@ "use strict";
 var utils_1 = require("../../../utils");
-// Ajax
 /**
@@ -151,3 +150,3 @@ * @private
                 if (field.require) {
-                    if (_.isEmpty(this.editObject[field.dataIndex])) {
+                    if (_.isEmpty(this.editObject[field.dataIndex] + '')) {
                         antd_1.message.error(field.title + " \u4E0D\u80FD\u4E3A\u7A7A");
@@ -163,3 +162,2 @@ return;
                         }
-                        //@ts-ignore
                     }
@@ -204,2 +202,3 @@ else if (!field.pattern.test(this.editObject[field.dataIndex])) {
             this.editObject = _.assign({}, this.props.param, record);
+            console.log(this.editObject);
             var list = _.concat([], this.state.list);
@@ -279,4 +278,5 @@ list.map(function (item) {
             var render = column.render;
-            // @ts-ignore
-            column.render = function (text, record) { return _this.renderColumns(text === undefined ? (column.options ? column.options[0].value + '' : '') : text === null ? '' : text + '', record, column, render); };
+            column.render = function (text, record) { return _this.renderColumns(text === undefined ?
+                (column.options ? column.options[0].value + '' : '')
+                : text === null ? '' : text + '', record, column, render); };
         });
@@ -283,0 +283,0 @@ return columns;

layouts/display/Table/DataTable.js

@@ -120,3 +120,3 @@ "use strict";
                             param = {};
-                            param[this.delKey] = ids;
+                            param[this.delKey] = ids + '';
                             return [4 /*yield*/, utils_1.Ajax.DELETE(this.props.delete, param)];
@@ -127,3 +127,3 @@ case 1:
                                 antd_1.message.success(this.objName + "\u5220\u9664\u6210\u529F");
-                                this.setState({ list: utils_1.Model.del(this.state.list, ids.split(','), this.rowKey) });
+                                this.setState({ list: utils_1.Model.del(this.state.list, (ids + '').split(','), this.rowKey) });
                                 if (callBack) {
@@ -130,0 +130,0 @@ callBack(resp);

package.json

 {
   "name": "vap",
-  "version": "1.9.5",
+  "version": "1.9.6",
   "description": "vap",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

432050

increased by0.19%

Lines of code

11065

increased by0.22%

No dependency changes