vap - npm Package Compare versions

Comparing version 1.1.7 to 1.1.8

layouts/admin/ListModal/index.js

@@ -257,2 +257,3 @@ "use strict";
         utils_1.Ajax.POST(this.props.query, this.param, function (json) {
+            _this.mode = interface_1.MODE.COMMON;
             _this.setState({
@@ -259,0 +260,0 @@ list: json.list,

layouts/display/index.d.ts

@@ -77,4 +77,4 @@ /**
 export { default as Page } from './Page/Page';
-export { default as Panel } from './Page/Panel';
+export { Panel, RowPanel } from './Page/Panel';
 export { default as Row } from './Page/Row';
-export declare function HEIGHT(height: number): string;
+export declare function HEIGHT(height: number, cols?: number): string;

layouts/display/index.js

@@ -135,8 +135,10 @@ "use strict";
 var Panel_1 = require("./Page/Panel");
-exports.Panel = Panel_1.default;
+exports.Panel = Panel_1.Panel;
+exports.RowPanel = Panel_1.RowPanel;
 var Row_1 = require("./Page/Row");
 exports.Row = Row_1.default;
-function HEIGHT(height) {
-    return 'calc(100% - ' + (height + 85) + 'px)';
+function HEIGHT(height, cols) {
+    if (cols === void 0) { cols = 1; }
+    return 'calc(100% - ' + (height + 10 * cols) + 'px)';
 }
 exports.HEIGHT = HEIGHT;

layouts/display/Page/interface.d.ts

 import { CardProps } from 'antd/lib/card';
 import { RowProps } from 'antd/lib/row';
 export interface PanelProps extends CardProps {
+    width?: number;
     span?: number;
 }
+export interface RowPanelProps extends CardProps {
+    height: number | string;
+}
 export interface VRowProps extends RowProps {
     height: number | string;
 }

layouts/display/Page/Page.js

@@ -14,3 +14,2 @@ "use strict";
 var React = require("react");
-var antd_1 = require("antd");
 var default_1 = /** @class */ (function (_super) {
@@ -22,3 +21,3 @@ __extends(default_1, _super);
     default_1.prototype.render = function () {
-        return React.createElement(antd_1.Row, { className: "vap-container", type: "flex" }, this.props.children);
+        return React.createElement("div", { className: "vap-container" }, this.props.children);
     };
@@ -25,0 +24,0 @@ return default_1;

layouts/display/Page/Panel.d.ts

 /// <reference types="react" />
 import * as React from 'react';
-import { PanelProps } from './interface';
-export default class  extends React.Component<PanelProps> {
+import { PanelProps, RowPanelProps } from './interface';
+export declare class Panel extends React.Component<PanelProps> {
     render(): JSX.Element;
 }
+export declare class RowPanel extends React.Component<RowPanelProps> {
+    render(): JSX.Element;
+}

layouts/display/Page/Panel.js

@@ -23,10 +23,16 @@ "use strict";
 var antd_1 = require("antd");
-var default_1 = /** @class */ (function (_super) {
-    __extends(default_1, _super);
-    function default_1() {
+var _ = require("lodash");
+var Panel = /** @class */ (function (_super) {
+    __extends(Panel, _super);
+    function Panel() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    default_1.prototype.render = function () {
+    Panel.prototype.render = function () {
         var param = {};
-        if (this.props.span) {
+        if (this.props.width) {
+            param.style = {
+                minWidth: this.props.width
+            };
+        }
+        else if (this.props.span) {
             param.span = this.props.span;
@@ -39,7 +45,39 @@ }
         }
-        return React.createElement(antd_1.Col, __assign({ className: "vap-col" }, param),
+        var className = ["vap-col"];
+        if (_.has(this.props, 'title')) {
+            className.push("vap-panel-header");
+        }
+        return React.createElement(antd_1.Col, __assign({ className: className.join(" ") }, param),
             React.createElement(antd_1.Card, __assign({ className: "vap-panel" }, this.props), this.props.children));
     };
-    return default_1;
+    return Panel;
 }(React.Component));
-exports.default = default_1;
+exports.Panel = Panel;
+var RowPanel = /** @class */ (function (_super) {
+    __extends(RowPanel, _super);
+    function RowPanel() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    RowPanel.prototype.render = function () {
+        var param = {};
+        // if(this.props.width){
+        //     param.style = {
+        //         minWidth:this.props.width
+        //     }
+        // }else if(this.props.span){
+        //     param.span = this.props.span;
+        // }else{
+        //     param.style ={
+        //         flex:'1 1'
+        //     } 
+        // }
+        var className = ["vap-row"];
+        if (_.has(this.props, 'title')) {
+            className.push("vap-panel-header");
+        }
+        return React.createElement("div", { className: className.join(" "), style: { height: this.props.height } },
+            React.createElement(antd_1.Card, __assign({ className: "vap-panel" }, this.props), this.props.children));
+    };
+    return RowPanel;
+}(React.Component));
+exports.RowPanel = RowPanel;

layouts/display/Page/Row.js

@@ -31,6 +31,7 @@ "use strict";
         var param = _.assign({ style: {} }, this.props);
-        param.style.height = this.props.height;
-        param.className = param.className ? param.className + ' vap-row' : 'vap-row';
+        // param.style.height = this.props.height;
+        // param.className = param.className?param.className +' vap-row-container':'vap-row-container';
         param.type = "flex";
-        return React.createElement(antd_1.Row, __assign({}, param), this.props.children);
+        return React.createElement("div", { className: "vap-row", style: { height: this.props.height } },
+            React.createElement(antd_1.Row, __assign({}, param), this.props.children));
     };
@@ -37,0 +38,0 @@ return default_1;

layouts/display/Table/Table.d.ts

@@ -5,2 +5,6 @@ /// <reference types="react" />
 export default class <T> extends React.PureComponent<DisplayTableProps<T>> {
+    param: {
+        start: number;
+        count: number;
+    };
     state: {
@@ -10,3 +14,4 @@ list: any[];
     };
+    componentWillMount(): void;
     render(): JSX.Element;
 }

layouts/display/Table/Table.js

@@ -12,5 +12,14 @@ "use strict";
 })();
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var antd_1 = require("antd");
 var React = require("react");
+var _ = require("lodash");
 var default_1 = /** @class */ (function (_super) {
@@ -20,2 +29,6 @@ __extends(default_1, _super);
         var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.param = {
+            start: 0,
+            count: 10,
+        };
         _this.state = {
@@ -27,4 +40,9 @@ list: [],
     }
+    default_1.prototype.componentWillMount = function () {
+        if (!this.props.autoLoad === false) {
+            _.assign(this.param, this.props.param);
+        }
+    };
     default_1.prototype.render = function () {
-        return React.createElement(antd_1.Table, null);
+        return React.createElement(antd_1.Table, __assign({}, this.props, { dataSource: this.state.list }));
     };
@@ -31,0 +49,0 @@ return default_1;

package.json

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

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

99225

increased by2.62%

Lines of code

2546

increased by2.87%

No dependency changes