@nokecy/qc-ui 0.1.33 → 0.1.35

package/dist/cjs/ag-grid-plus/ag-gridPlus.js

@@ -33,7 +33,7 @@ var _utils = require("./utils");
 
 var _setting = _interopRequireDefault(require("./setting"));
 
-var _excluded = ["style", "params", "request", "dataSource", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "gridColumnState", "children"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "gridColumnState", "children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -71,6 +71,7 @@ var getSort = function getSort(columnState) {
 
 function AgGridPlus(props) {
   var style = props.style,
+      loadingProps = props.loading,
       gridParams = props.params,
       request = props.request,
       dataSource = props.dataSource,
@@ -96,7 +97,7 @@ function AgGridPlus(props) {
       ready = _useState2[0],
       setReady = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(false),
+  var _useState3 = (0, _react.useState)(loadingProps ? loadingProps : false),
       _useState4 = _slicedToArray(_useState3, 2),
       loading = _useState4[0],
       setLoading = _useState4[1];
@@ -167,7 +168,11 @@ function AgGridPlus(props) {
   }, [gridColumnState, columnsRef.current]);
   (0, _react.useEffect)(function () {
     setRowData(dataSource || propRowData || []);
-  }, [dataSource, propRowData]);
+  }, [dataSource, propRowData]); //外部loading
+
+  (0, _react.useEffect)(function () {
+    loadingProps !== undefined && setLoading(loadingProps);
+  }, [loadingProps]);
   var onGridReady = (0, _react.useCallback)(function (params) {
     var _columnsRef$current;
 

package/dist/cjs/ag-grid-plus/interface.d.ts

@@ -9,6 +9,7 @@ interface GridProps extends AgGridReactProps {
     style?: CSSProperties;
     params?: any;
     initParams?: any;
+    loading?: boolean;
     request?: (params: any, sort: any, filter: any) => Promise<any>;
     dataSource?: any[];
     treeParentName?: string;

package/dist/cjs/array-table/index.js

@@ -98,7 +98,8 @@ var Addition = function Addition(props) {
   }, props, {
     block: false,
     defaultValue: _objectSpread(_objectSpread({}, props.defaultValue), {}, {
-      _id: (0, _uniqueId.default)()
+      _id: (0, _uniqueId.default)(),
+      _isNew: true
     })
   }));
 };

package/dist/cjs/editable/index.js

@@ -60,6 +60,9 @@ var useParentPattern = function useParentPattern() {
 
 var useEditable = function useEditable() {
   var pattern = useParentPattern();
+
+  var record = _antdV.ArrayBase.useRecord();
+
   var field = (0, _react.useField)(); // useLayoutEffect(() => {
   //     if (pattern === 'editable') {
   //         return field.setPattern('readPretty')
@@ -67,7 +70,7 @@ var useEditable = function useEditable() {
   // }, [pattern])
 
   (0, _react2.useLayoutEffect)(function () {
-    if (field.initialValue && pattern === 'editable') {
+    if ((field.initialValue || !(record !== null && record !== void 0 && record._isNew)) && pattern === 'editable') {
       return field.setPattern('readPretty');
     }
   }, [field.initialValue]);

package/dist/esm/ag-grid-plus/ag-gridPlus.js

@@ -1,4 +1,4 @@
-var _excluded = ["style", "params", "request", "dataSource", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "gridColumnState", "children"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "gridColumnState", "children"];
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -44,6 +44,7 @@ var getSort = function getSort(columnState) {
 
 function AgGridPlus(props) {
   var style = props.style,
+      loadingProps = props.loading,
       gridParams = props.params,
       request = props.request,
       dataSource = props.dataSource,
@@ -69,7 +70,7 @@ function AgGridPlus(props) {
       ready = _useState2[0],
       setReady = _useState2[1];
 
-  var _useState3 = useState(false),
+  var _useState3 = useState(loadingProps ? loadingProps : false),
       _useState4 = _slicedToArray(_useState3, 2),
       loading = _useState4[0],
       setLoading = _useState4[1];
@@ -140,7 +141,11 @@ function AgGridPlus(props) {
   }, [gridColumnState, columnsRef.current]);
   useEffect(function () {
     setRowData(dataSource || propRowData || []);
-  }, [dataSource, propRowData]);
+  }, [dataSource, propRowData]); //外部loading
+
+  useEffect(function () {
+    loadingProps !== undefined && setLoading(loadingProps);
+  }, [loadingProps]);
   var onGridReady = useCallback(function (params) {
     var _columnsRef$current;
 

package/dist/esm/ag-grid-plus/interface.d.ts

@@ -9,6 +9,7 @@ interface GridProps extends AgGridReactProps {
     style?: CSSProperties;
     params?: any;
     initParams?: any;
+    loading?: boolean;
     request?: (params: any, sort: any, filter: any) => Promise<any>;
     dataSource?: any[];
     treeParentName?: string;

package/dist/esm/array-table/index.js

@@ -74,7 +74,8 @@ var Addition = function Addition(props) {
   }, props, {
     block: false,
     defaultValue: _objectSpread(_objectSpread({}, props.defaultValue), {}, {
-      _id: uniqueId()
+      _id: uniqueId(),
+      _isNew: true
     })
   }));
 };

package/dist/esm/editable/index.js

@@ -25,7 +25,7 @@ import { isVoidField } from '@formily/core';
 import { observer, useField } from '@formily/react';
 import { Popover as AntdPopover } from 'antd';
 import cls from 'classnames';
-import { FormItem } from '@formily/antd-v5';
+import { ArrayBase, FormItem } from '@formily/antd-v5';
 import React, { useLayoutEffect, useRef, useState } from 'react';
 import { useClickAway, usePrefixCls } from '@formily/antd-v5/lib/__builtins__';
 import useStyle from "./style";
@@ -39,6 +39,7 @@ var useParentPattern = function useParentPattern() {
 
 var useEditable = function useEditable() {
   var pattern = useParentPattern();
+  var record = ArrayBase.useRecord();
   var field = useField(); // useLayoutEffect(() => {
   //     if (pattern === 'editable') {
   //         return field.setPattern('readPretty')
@@ -46,7 +47,7 @@ var useEditable = function useEditable() {
   // }, [pattern])
 
   useLayoutEffect(function () {
-    if (field.initialValue && pattern === 'editable') {
+    if ((field.initialValue || !(record !== null && record !== void 0 && record._isNew)) && pattern === 'editable') {
       return field.setPattern('readPretty');
     }
   }, [field.initialValue]);