@jetlinks-web/components 3.1.11 → 3.1.13

package/es/EditTable/FormItem.js

@@ -55,7 +55,7 @@ const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = ["id"];
 import { onBeforeUnmount, computed, reactive, watch, provide } from "vue";
 import { get, isArray } from 'lodash-es';
-import { useProvideFormItemContext } from 'ant-design-vue/es/form/FormItemContext';
+import { useProvideFormItemContext } from 'ant-design-vue/lib/form/FormItemContext';
 import { useInjectError, useInjectForm } from "./hooks";
 import { TABLE_FORM_ITEM_ERROR } from "./consts";
 import genEditTableStyle from './style';
@@ -129,7 +129,10 @@ const __sfc_main__ = Object.assign({
                 index = props.name[0];
             }
             const promise = context.validateItem({ [filedName.value]: get(context.dataSource.value, props.name) }, index);
-            promise.catch(res => {
+            promise.then(() => {
+                hideErrorTip();
+                context.removeFieldError(eventKey.value);
+            }).catch(res => {
                 const error = _optionalChain([res, 'optionalAccess', _2 => _2.filter, 'call', _3 => _3(item => item.field === filedName.value)]) || [];
                 if (error.length === 0) {
                     hideErrorTip();
@@ -149,6 +152,7 @@ const __sfc_main__ = Object.assign({
             // validateRules()
         };
         const onFieldChange = () => {
+            debugger;
             validateRules();
             emit('change');
         };
@@ -164,7 +168,10 @@ const __sfc_main__ = Object.assign({
             id: filedId,
             onFieldChange,
             onFieldBlur,
-        }, computed(() => get(context.dataSource.value, props.name)));
+        }, computed(() => {
+            console.log(context.dataSource.value, props.name);
+            return get(context.dataSource.value, props.name);
+        }));
         onBeforeUnmount(() => {
             hideErrorTip();
         });

package/es/ProLayout/PageContainer/index.js

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import { createVNode as _createVNode } from "vue";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack"];
+var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack", "onBack"];
 import { withInstall } from "ant-design-vue/es/_util/type";
 import { Affix, Spin, PageHeader, Tabs, Button } from 'ant-design-vue';
 import { defineComponent, unref, toRefs, computed } from 'vue';
@@ -208,6 +208,7 @@ var ProPageHeader = function ProPageHeader(props) {
     prefixCls = props.prefixCls,
     _ = props.fixedHeader,
     showBack = props.showBack,
+    onBack = props.onBack,
     restProps = _objectWithoutProperties(props, _excluded);
   var value = useRouteContext();
   var _useLocaleReceiver = useLocaleReceiver('ProLayout'),

package/es/ProTable/setting.js

@@ -137,11 +137,7 @@ export var proTableProps = _objectSpread(_objectSpread(_objectSpread({}, _conten
   pagination: {
     type: Object,
     default: function _default() {
-      return {
-        showSizeChanger: true,
-        size: 'size',
-        pageSizeOptions: ['12', '24', '48', '96']
-      };
+      return {};
     }
   }
 });

package/es/VirtualTable/VirtualTable.js

@@ -368,7 +368,7 @@ const __sfc_main__ = Object.assign({
                             rowSelection: _rowSelection.value
                         }, {
                             bodyCell: _withCtx(({ text, record, index, column }) => [
-                                (column.dataIndex === firstColumn.value.dataIndex || column.key === firstColumn.value.key)
+                                ((firstColumn.value.dataIndex && column.dataIndex === firstColumn.value.dataIndex) || (firstColumn.value.key && column.key === firstColumn.value.key))
                                     ? (_openBlock(), _createElementBlock(_Fragment, { key: 0 }, [
                                         _createElementVNode("span", {
                                             class: "ant-table-row-indent indent-level-3",

package/lib/EditTable/FormItem.js

@@ -55,7 +55,7 @@ const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = ["id"];
 import { onBeforeUnmount, computed, reactive, watch, provide } from "vue";
 import { get, isArray } from 'lodash-es';
-import { useProvideFormItemContext } from 'ant-design-vue/es/form/FormItemContext';
+import { useProvideFormItemContext } from 'ant-design-vue/lib/form/FormItemContext';
 import { useInjectError, useInjectForm } from "./hooks";
 import { TABLE_FORM_ITEM_ERROR } from "./consts";
 import genEditTableStyle from './style';
@@ -129,7 +129,10 @@ const __sfc_main__ = Object.assign({
                 index = props.name[0];
             }
             const promise = context.validateItem({ [filedName.value]: get(context.dataSource.value, props.name) }, index);
-            promise.catch(res => {
+            promise.then(() => {
+                hideErrorTip();
+                context.removeFieldError(eventKey.value);
+            }).catch(res => {
                 const error = _optionalChain([res, 'optionalAccess', _2 => _2.filter, 'call', _3 => _3(item => item.field === filedName.value)]) || [];
                 if (error.length === 0) {
                     hideErrorTip();
@@ -149,6 +152,7 @@ const __sfc_main__ = Object.assign({
             // validateRules()
         };
         const onFieldChange = () => {
+            debugger;
             validateRules();
             emit('change');
         };
@@ -164,7 +168,10 @@ const __sfc_main__ = Object.assign({
             id: filedId,
             onFieldChange,
             onFieldBlur,
-        }, computed(() => get(context.dataSource.value, props.name)));
+        }, computed(() => {
+            console.log(context.dataSource.value, props.name);
+            return get(context.dataSource.value, props.name);
+        }));
         onBeforeUnmount(() => {
             hideErrorTip();
         });

package/lib/ProLayout/PageContainer/index.js

@@ -19,7 +19,7 @@ require("ant-design-vue/es/_util/vue-types");
 var _defaultSettings = require("../defaultSettings");
 var _LocaleReciver = require("../../LocaleReciver");
 var _style = _interopRequireDefault(require("../style"));
-var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack"];
+var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack", "onBack"];
 var pageHeaderTabConfig = exports.pageHeaderTabConfig = {
   /**
    * @name tabs 的列表
@@ -212,6 +212,7 @@ var ProPageHeader = function ProPageHeader(props) {
     prefixCls = props.prefixCls,
     _ = props.fixedHeader,
     showBack = props.showBack,
+    onBack = props.onBack,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var value = (0, _RouteContext.useRouteContext)();
   var _useLocaleReceiver = (0, _LocaleReciver.useLocaleReceiver)('ProLayout'),

package/lib/ProTable/setting.js

@@ -144,11 +144,7 @@ var proTableProps = exports.proTableProps = (0, _objectSpread2.default)((0, _obj
   pagination: {
     type: Object,
     default: function _default() {
-      return {
-        showSizeChanger: true,
-        size: 'size',
-        pageSizeOptions: ['12', '24', '48', '96']
-      };
+      return {};
     }
   }
 });

package/lib/VirtualTable/VirtualTable.js

@@ -368,7 +368,7 @@ const __sfc_main__ = Object.assign({
                             rowSelection: _rowSelection.value
                         }, {
                             bodyCell: _withCtx(({ text, record, index, column }) => [
-                                (column.dataIndex === firstColumn.value.dataIndex || column.key === firstColumn.value.key)
+                                ((firstColumn.value.dataIndex && column.dataIndex === firstColumn.value.dataIndex) || (firstColumn.value.key && column.key === firstColumn.value.key))
                                     ? (_openBlock(), _createElementBlock(_Fragment, { key: 0 }, [
                                         _createElementVNode("span", {
                                             class: "ant-table-row-indent indent-level-3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "3.1.11",
+  "version": "3.1.13",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -155,8 +155,8 @@
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
     "@jetlinks-web/constants": "^1.0.9",
-    "@jetlinks-web/hooks": "^1.1.1",
-    "@jetlinks-web/utils": "^1.2.12"
+    "@jetlinks-web/utils": "^1.2.12",
+    "@jetlinks-web/hooks": "^1.1.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",