@kmkf-fe-packages/basic-components 1.0.10-beta.16 → 1.0.10-beta.19

package/dist/index.esm.js

@@ -5,8 +5,8 @@ import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, WdtSendData, WDT_ORDER_TYPE_MAP } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, cloneDeep, difference, differenceWith } from 'lodash';
+import { useUpdateEffect, useDebounceEffect } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
-import { useDebounceEffect } from 'ahooks';
 import pubsub from 'pubsub-js';
 import BigNumber from 'bignumber.js';
 
@@ -7648,7 +7648,7 @@ var WidgetMap = {
   INPUT: 'input',
   TEXTAREA: 'textarea'
 };
-var pageSize = 10;
+var pageSize = 50;
 var SubForm = function SubForm(props) {
   var _selectOptions$;
   var value = props.value,
@@ -7660,8 +7660,7 @@ var SubForm = function SubForm(props) {
     flowTemplateKey = _props$subConfig.flowTemplateKey,
     nodeId = _props$subConfig.nodeId,
     workOrderTemplateId = _props$subConfig.workOrderTemplateId,
-    _props$look = props.look,
-    look = _props$look === void 0 ? false : _props$look;
+    disabled = props.disabled;
   var ref = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -7687,6 +7686,7 @@ var SubForm = function SubForm(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     hasMore = _useState12[0],
     setHasMore = _useState12[1];
+  var firstIn = useRef(true);
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       var valueItem = config.find(function (t) {
@@ -7745,7 +7745,7 @@ var SubForm = function SubForm(props) {
         }) : /*#__PURE__*/React.createElement("div", null, val);
       }
     };
-  })), [{
+  })), [disabled ? {} : {
     dataIndex: 'operation',
     title: '操作',
     width: 70,
@@ -7826,7 +7826,7 @@ var SubForm = function SubForm(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _ref2 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, _ref2$pageNo = _ref2.pageNo, pageNo = _ref2$pageNo === void 0 ? 1 : _ref2$pageNo;
-            if (!look) {
+            if (!disabled) {
               _context.next = 3;
               break;
             }
@@ -7893,12 +7893,12 @@ var SubForm = function SubForm(props) {
     };
   }();
   useEffect(function () {
-    setPageNo(1);
     getWorkOrderList({
       pageNo: 1
     });
   }, []);
-  useEffect(function () {
+  useUpdateEffect(function () {
+    setPageNo(1);
     getWorkOrderList({
       pageNo: 1
     });
@@ -7910,13 +7910,13 @@ var SubForm = function SubForm(props) {
     setInputValue(val);
     setOpen(true);
   }, 1000), []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !look && /*#__PURE__*/React.createElement(Space, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && /*#__PURE__*/React.createElement(Space, {
     style: {
       marginBottom: '10px'
     }
   }, /*#__PURE__*/React.createElement(Select, {
     style: {
-      width: '100px'
+      width: '120px'
     },
     options: selectOptions,
     defaultValue: selectOptions === null || selectOptions === void 0 ? void 0 : (_selectOptions$ = selectOptions[0]) === null || _selectOptions$ === void 0 ? void 0 : _selectOptions$.value,
@@ -7945,7 +7945,8 @@ var SubForm = function SubForm(props) {
       },
       onRow: function onRow(record) {
         return {
-          onClick: function onClick() {
+          onClick: function onClick(e) {
+            e.stopPropagation();
             onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), [_objectSpread2(_objectSpread2({}, record), {}, {
               uuid: uuid()
             })]));

package/dist/index.js

@@ -9,8 +9,8 @@ var request = require('umi-request');
 var reactCopyToClipboard = require('react-copy-to-clipboard');
 var kmkfUtils = require('@kmkf-fe-packages/kmkf-utils');
 var lodash = require('lodash');
-var zhCN = require('antd/lib/locale/zh_CN');
 var ahooks = require('ahooks');
+var zhCN = require('antd/lib/locale/zh_CN');
 var pubsub = require('pubsub-js');
 var BigNumber = require('bignumber.js');
 
@@ -7660,7 +7660,7 @@ var WidgetMap = {
   INPUT: 'input',
   TEXTAREA: 'textarea'
 };
-var pageSize = 10;
+var pageSize = 50;
 var SubForm = function SubForm(props) {
   var _selectOptions$;
   var value = props.value,
@@ -7672,8 +7672,7 @@ var SubForm = function SubForm(props) {
     flowTemplateKey = _props$subConfig.flowTemplateKey,
     nodeId = _props$subConfig.nodeId,
     workOrderTemplateId = _props$subConfig.workOrderTemplateId,
-    _props$look = props.look,
-    look = _props$look === void 0 ? false : _props$look;
+    disabled = props.disabled;
   var ref = React.useRef(null);
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -7699,6 +7698,7 @@ var SubForm = function SubForm(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     hasMore = _useState12[0],
     setHasMore = _useState12[1];
+  var firstIn = React.useRef(true);
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       var valueItem = config.find(function (t) {
@@ -7757,7 +7757,7 @@ var SubForm = function SubForm(props) {
         }) : /*#__PURE__*/React__default['default'].createElement("div", null, val);
       }
     };
-  })), [{
+  })), [disabled ? {} : {
     dataIndex: 'operation',
     title: '操作',
     width: 70,
@@ -7838,7 +7838,7 @@ var SubForm = function SubForm(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _ref2 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, _ref2$pageNo = _ref2.pageNo, pageNo = _ref2$pageNo === void 0 ? 1 : _ref2$pageNo;
-            if (!look) {
+            if (!disabled) {
               _context.next = 3;
               break;
             }
@@ -7905,12 +7905,12 @@ var SubForm = function SubForm(props) {
     };
   }();
   React.useEffect(function () {
-    setPageNo(1);
     getWorkOrderList({
       pageNo: 1
     });
   }, []);
-  React.useEffect(function () {
+  ahooks.useUpdateEffect(function () {
+    setPageNo(1);
     getWorkOrderList({
       pageNo: 1
     });
@@ -7922,13 +7922,13 @@ var SubForm = function SubForm(props) {
     setInputValue(val);
     setOpen(true);
   }, 1000), []);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !look && /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && /*#__PURE__*/React__default['default'].createElement(antd.Space, {
     style: {
       marginBottom: '10px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
-      width: '100px'
+      width: '120px'
     },
     options: selectOptions,
     defaultValue: selectOptions === null || selectOptions === void 0 ? void 0 : (_selectOptions$ = selectOptions[0]) === null || _selectOptions$ === void 0 ? void 0 : _selectOptions$.value,
@@ -7957,7 +7957,8 @@ var SubForm = function SubForm(props) {
       },
       onRow: function onRow(record) {
         return {
-          onClick: function onClick() {
+          onClick: function onClick(e) {
+            e.stopPropagation();
             onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), [_objectSpread2(_objectSpread2({}, record), {}, {
               uuid: kmkfUtils.uuid()
             })]));

package/dist/src/apaas/SubForm/index.d.ts

@@ -21,7 +21,7 @@ type SubFormProps = {
         nodeId: string;
         workOrderTemplateId: string;
     };
-    look: boolean;
+    disabled: boolean;
 };
 declare const SubForm: (props: SubFormProps) => React.JSX.Element;
 export default SubForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.0.10-beta.16",
+  "version": "1.0.10-beta.19",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "1.0.10-beta.15",
+    "@kmkf-fe-packages/kmkf-utils": "1.0.10-beta.17",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.8",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ae15fe2d1ec963b5da2602cf4ffd08d902bda6a"
+  "gitHead": "8b1a9d888cd263d5a6f3b868b1d28b9c39f7d235"
 }