ztxkui 2.0.4 → 2.0.9

package/dist/App.js

@@ -35,6 +35,7 @@ import SearchContainer from './components/business/SearchContainer';
 import Upload from './components/Upload';
 import Form from './components/Form';
 import TransList from './components/business/List';
+import GridList from 'components/business/GridList';
 import './styles/index.scss';
 var RangePicker = DatePicker.RangePicker;
 var Item = Form.Item;
@@ -1370,6 +1371,18 @@ function App() {
         }
     }, []);
     return (React.createElement("div", { className: "App", style: { padding: '10px' } },
+        React.createElement("div", { style: { padding: '10px', width: '60%' } },
+            React.createElement(GridList, null,
+                React.createElement(GridList.Item, { span: 8, title: "\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D" }, "\u59D3\u540D"),
+                React.createElement(GridList.Item, { span: 8, title: "\u59D3\u540D" }, "\u59D3\u540D"),
+                React.createElement(GridList.Item, { span: 8, title: "\u59D3\u540D" }, "\u59D3\u540D")),
+            React.createElement(GridList, null,
+                React.createElement(GridList.Item, { span: 12, titleSpan: 8, title: "\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D" }, "\u59D3\u540D"),
+                React.createElement(GridList.Item, { span: 12, titleSpan: 8, title: "\u59D3\u540D" }, "\u59D3\u540D")),
+            React.createElement(GridList, null,
+                React.createElement(GridList.Item, { span: 24, title: "\u59D3\u540D", titleSpan: 8 }, "\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D")),
+            React.createElement(GridList, null,
+                React.createElement(GridList.Item, { span: 24, title: "\u59D3\u540D", titleSpan: 12 }, "\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3"))),
         React.createElement(DetailList, { records: inspectionDetail, labelWidth: 10, labelAlign: "left", apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", 
             // downloadBtnDisable={true}
             hasManOrDate: true, hasSignArea: true, isDark: true }),
@@ -1498,7 +1511,9 @@ function App() {
                         dataSource: dataSource, rowKey: "id", showColumnDynamic: true, 
                         // onAddAndDelHandle={onAddAndDelHandle}
                         // onMoveRow={onMoveRowHandle}
-                        summaryConfig: summaryConfig, summaryFixed: true, scroll: { y: 200 }, onEditableSave: onEditableSaveHandle, rowSelection: rowSelection })))),
+                        summaryConfig: summaryConfig, summaryFixed: true, 
+                        // scroll={{ y: 200 }}
+                        onEditableSave: onEditableSaveHandle, rowSelection: rowSelection })))),
         React.createElement("br", null),
         React.createElement("br", null),
         React.createElement("br", null),

package/dist/components/EnhanceSelect/index.d.ts

@@ -79,6 +79,10 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
      * 远程搜索主键Key值
      */
     remoteSearchDataKey?: string;
+    /**
+     * 是否启用远程搜索主键Key值
+     */
+    isRemoteSearchDataKey?: boolean;
     /**
      * 接口数据格式转换
      */
@@ -99,6 +103,6 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
  *    { code: 200, data: { records: [] } } || { status: 200, data: { code: 200, data: { records: [] } } }
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
-declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, transformData, joinKey, joinStr, ...restProps }: IProps<VT>): JSX.Element;
+declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, isRemoteSearchDataKey, transformData, joinKey, joinStr, ...restProps }: IProps<VT>): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof EnhanceSelect>;
 export default _default;

package/dist/components/EnhanceSelect/index.js

@@ -71,14 +71,15 @@ function getData(request, options) {
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
 function EnhanceSelect(_a) {
-    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, transformData = _a.transformData, joinKey = _a.joinKey, _e = _a.joinStr, joinStr = _e === void 0 ? '-' : _e, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "transformData", "joinKey", "joinStr"]);
+    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _e = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _e === void 0 ? true : _e, transformData = _a.transformData, joinKey = _a.joinKey, _f = _a.joinStr, joinStr = _f === void 0 ? '-' : _f, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr"]);
     // 下拉数据源
-    var _f = useFetchState([]), selectList = _f[0], setSelectList = _f[1];
+    var _g = useFetchState([]), selectList = _g[0], setSelectList = _g[1];
     // 多选时，自己需要合并的数据
-    var _g = useFetchState([]), multipleList = _g[0], setMultipleList = _g[1];
-    var _h = useFetchState(false), loading = _h[0], setLoading = _h[1];
+    var _h = useFetchState([]), multipleList = _h[0], setMultipleList = _h[1];
+    var _j = useFetchState(false), loading = _j[0], setLoading = _j[1];
     var fetchId = useRef(0); // 请求Id，每次请求都会加1
-    var _j = useFetchState(false), firstLoading = _j[0], setFirstLoading = _j[1];
+    // 是否使用过远程搜索主键key
+    var _k = useFetchState(false), firstLoading = _k[0], setFirstLoading = _k[1];
     // 如果selectList 发生改变，那么触发onCompleted事件
     useEffect(function () {
         if (Array.isArray(selectList) && onCompleted) {
@@ -183,9 +184,9 @@ function EnhanceSelect(_a) {
     ]);
     var searchHandle = function (value) {
         // 当value有值时才进行搜索
-        if (value) {
-            getRemoteDataHandle(value, '');
-        }
+        // if (value) {
+        getRemoteDataHandle(value, '');
+        // }
     };
     var onSearchHandle = debounce(searchHandle, 300);
     // 1、如果传入list的话，那么直接使用list数据
@@ -241,17 +242,26 @@ function EnhanceSelect(_a) {
         if (!url || !remoteSearch) {
             return;
         }
+        debugger;
         // console.log('TEST: 远程搜索');
-        if (!firstLoading) {
-            if (!restProps.value) {
-                getRemoteDataHandle('', '');
-            }
-            else {
-                if (typeof restProps.value === 'string' ||
-                    Array.isArray(restProps.value)) {
-                    setFirstLoading(true);
-                    getRemoteDataHandle('', restProps.value);
-                }
+        // 如果初始化请求已经做过了，那么这个副作用直接返回
+        if (firstLoading) {
+            return;
+        }
+        // 这种情况不需要启用远程搜索key值
+        if (!isRemoteSearchDataKey) {
+            getRemoteDataHandle('', '');
+            setFirstLoading(true);
+            return;
+        }
+        if (!restProps.value) {
+            getRemoteDataHandle('', '');
+        }
+        else {
+            if (typeof restProps.value === 'string' ||
+                Array.isArray(restProps.value)) {
+                setFirstLoading(true);
+                getRemoteDataHandle('', restProps.value);
             }
         }
     }, [
@@ -260,6 +270,7 @@ function EnhanceSelect(_a) {
         getRemoteDataHandle,
         restProps.value,
         firstLoading,
+        isRemoteSearchDataKey,
         setFirstLoading,
     ]);
     // 数据合并

package/dist/components/Table/table.js

@@ -38,7 +38,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import { DndProvider } from 'react-dnd';
 /**默认scroll配置 */
 // const _scroll = { y: 500, x: 1000 };
-var _scroll = { x: 1000 };
+var _scroll = { x: 1000, y: 500 };
 /**
  * @description 定义可拖拽行
  *              定义可编辑列

package/dist/components/business/GridList/item.d.ts

@@ -3,6 +3,8 @@ import { ColProps } from 'antd/lib/col';
 export interface IProps extends ColProps {
     title: string;
     colon?: boolean;
+    span: number;
+    titleSpan?: number;
 }
 declare const Item: React.FC<IProps>;
 export default Item;

package/dist/components/business/GridList/item.js

@@ -24,12 +24,12 @@ import React from 'react';
 import { Col } from 'antd';
 import classNames from 'classnames';
 var Item = function (_a) {
-    var children = _a.children, className = _a.className, title = _a.title, colon = _a.colon, restProps = __rest(_a, ["children", "className", "title", "colon"]);
+    var children = _a.children, className = _a.className, title = _a.title, colon = _a.colon, span = _a.span, titleSpan = _a.titleSpan, restProps = __rest(_a, ["children", "className", "title", "colon", "span", "titleSpan"]);
     var classes = classNames('zt-grid-item', className);
-    return (React.createElement(Col, __assign({ className: classes }, restProps),
-        React.createElement("span", { className: "zt-grid-item--title" },
+    return (React.createElement(Col, __assign({ className: classes, span: span }, restProps),
+        React.createElement("span", { className: "zt-grid-item--title", style: titleSpan ? { width: (titleSpan / span) * 38 + "%" } : {} },
             title,
             colon && '：'),
-        React.createElement("span", { className: "zt-grid-item--text" }, children)));
+        React.createElement("span", { className: "zt-grid-item--text", style: titleSpan ? { width: 100 - (titleSpan / span) * 38 + "%" } : {} }, children)));
 };
 export default Item;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "2.0.4",
+  "version": "2.0.9",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",