vap1 0.1.3 → 0.1.4

package/components/Box/Box.js

@@ -96,6 +96,11 @@ exports.Box = (0, react_1.forwardRef)((props, ref) => {
             style.height = '100%';
         }
     }
+    (0, react_1.useEffect)(() => {
+        if (state && state.height && contextRef && contextRef.current) {
+            contextRef.current.style.height = (state.height + 'px');
+        }
+    }, [state === null || state === void 0 ? void 0 : state.height]);
     const resize = () => {
         if (props.mode == undefined || props.mode == 'common' || app == null) {
             if (state === null)

package/components/Tables/VTable.js

@@ -137,11 +137,13 @@ const _VTable = (0, react_1.forwardRef)((props, ref) => {
     //     if (props.mode == undefined || props.mode == 'common') return;
     //     let height = state?.height;
     //     if (!height) return;
-    //     setTimeout(() => {
-    //         height -= getHeightByTagName(root.current, 'thead');
-    //         setScroll({ y: Math.ceil(height), x: true })
-    //     }, 2);
-    // }, [state?.height])
+    //     // VAP1.5 scroll table bug
+    //     root.current.style.height = height + 'px';
+    //     // setTimeout(() => {
+    //     // height -= getHeightByTagName(root.current, 'thead');
+    //     // setScroll({ y: Math.ceil(height), x: true })
+    //     // }, 2);
+    // }, [state?.height]);
     // @ts-ignore
     const effectKey = props.model.effect;
     (0, react_1.useEffect)(() => {

package/components/UForm/UForm.js

@@ -40,8 +40,6 @@ const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../../utils");
 const antd_1 = require("antd");
-const Row_1 = require("../_adapt/Row");
-const Col_1 = require("../_adapt/Col");
 const Popconfirm_1 = require("../_adapt/Popconfirm");
 const Popover_1 = require("../_adapt/Popover");
 const Button_1 = require("../_adapt/Button");
@@ -220,7 +218,7 @@ const renderFormField = (state, field, form, update, data) => {
             itemProps.wrapperCol = { span: 24 - label };
         }
     }
-    return react_1.default.createElement(Col_1.Col, Object.assign({}, colProps),
+    return react_1.default.createElement(antd_1.Col, Object.assign({}, colProps),
         react_1.default.createElement(antd_1.Form.Item, Object.assign({}, itemProps), form.getFieldDecorator(field.field, options)(react_1.default.createElement(input.component, {
             form,
             field,
@@ -239,10 +237,10 @@ const renderFormActions = (state, buttons, form, initRef) => {
     if (btns.length == 0)
         return utils_1.Const.NONE;
     var labelWidth = (state.labelSpan / 24) * (1 / state.cols) * 100;
-    return react_1.default.createElement(Col_1.Col, { span: 24, className: 'c-form-buttons' },
-        react_1.default.createElement(Row_1.Row, { wrap: false },
-            react_1.default.createElement(Col_1.Col, { style: { width: utils_1.Format.formatPercent(labelWidth) } }),
-            react_1.default.createElement(Col_1.Col, { style: { width: utils_1.Format.formatPercent(99 - labelWidth) }, className: 'c-form-actions' }, btns.map(btn => {
+    return react_1.default.createElement(antd_1.Col, { span: 24, className: 'c-form-buttons' },
+        react_1.default.createElement(antd_1.Row, null,
+            react_1.default.createElement(antd_1.Col, { style: { width: utils_1.Format.formatPercent(labelWidth) } }),
+            react_1.default.createElement(antd_1.Col, { style: { width: utils_1.Format.formatPercent(99 - labelWidth) }, className: 'c-form-actions' }, btns.map(btn => {
                 if (btn.roleCode && !utils_1.PageUtil.hasRole(btn.roleCode))
                     return utils_1.Const.NONE;
                 let onClick;
@@ -394,7 +392,7 @@ const _FormGroup = (props) => {
         if (group == null || group === false)
             return utils_1.Const.NONE;
         return react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement(Col_1.Col, { span: 24, className: "c-form-group-title" }, utils_1.i18n.getText(group.ik, group.title)),
+            react_1.default.createElement(antd_1.Col, { span: 24, className: "c-form-group-title" }, utils_1.i18n.getText(group.ik, group.title)),
             group.fields.map(field => {
                 if (field == null || field === false)
                     return utils_1.Const.NONE;

package/components/_adapt/Col.js

@@ -40,7 +40,9 @@ const Col = (props) => {
     if (props.className) {
         clazz.push(props.className);
     }
-    if (lodash_1.default.has(props, 'span') || lodash_1.default.has(props, 'width') || lodash_1.default.has(props, 'height') || lodash_1.default.has(props.style, 'width') || lodash_1.default.has(props.style, 'height')) {
+    if (lodash_1.default.has(props, 'span') || lodash_1.default.has(props, 'width') || lodash_1.default.has(props, 'height')
+        || lodash_1.default.has(props, 'sm') || lodash_1.default.has(props, 'md') || lodash_1.default.has(props, 'lg')
+        || (lodash_1.default.has(props, 'style') && (lodash_1.default.has(props.style, 'width') || lodash_1.default.has(props.style, 'height')))) {
         clazz.push('v-col-fix');
     }
     else {

package/components/_adapt/Row.js

@@ -8,7 +8,7 @@ const react_1 = __importDefault(require("react"));
 const antd_1 = require("antd");
 const Global_1 = require("../../utils/Global");
 const Row = (props) => {
-    let clazz = ['v-row'];
+    let clazz = ['ant-row', 'v-row'];
     if (props.className)
         clazz.push(props.className);
     if (props.wrap)

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.1.3","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.1.4","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}