@lm_fe/pages 0.1.201 → 0.2.5

package/dist/a_chunks/{.root3.js → src.components.Base_List.js}

@@ -1,59 +1,20 @@
-import 'antd/es/button/style';
-import _Button from 'antd/es/button';
-import 'antd/es/divider/style';
-import _Divider from 'antd/es/divider';
-import { _ as _extends } from './extends.js';
-import 'antd/es/space/style';
-import _Space from 'antd/es/space';
-import 'antd/es/message/style';
-import _message from 'antd/es/message';
-import 'antd/es/form/style';
-import _Form from 'antd/es/form';
-import _omit from 'lodash/omit';
-import _isString from 'lodash/isString';
-import _isNil from 'lodash/isNil';
-import _isFunction from 'lodash/isFunction';
-import _get from 'lodash/get';
-import { s as styleInject, b as __assign, c as __spreadArray, _ as __awaiter, a as __generator, m as mchcModal__, d as __rest } from './index.js';
-import { EditOutlined, CopyOutlined, PrinterOutlined, DeleteOutlined, ExportOutlined, PlusOutlined, ReloadOutlined, SearchOutlined } from '@ant-design/icons';
+import { s as styleInject, a as __assign, _ as __spreadArray, b as __awaiter, c as __generator, m as mchcModal__, d as __rest } from './index.js';
 import { mchcConfig, mchcLogger, mchcEnv, mchcEvent } from '@lm_fe/env';
 import { SMchc_FormDescriptions, ModelService } from '@lm_fe/service';
-import { safe_json_parse, safe_json_parse_arr, expect_array, Browser, sleep, downloadFile, formatDateTime, safe_async_call } from '@lm_fe/utils';
+import { safeGetFromFuncOrData, flat, safe_json_parse, safe_json_parse_arr, expect_array, Browser, downloadFile, formatDateTime, safe_async_call, sleep, cloneDeep } from '@lm_fe/utils';
+import { Form, message, Space, Divider, Button } from 'antd';
+import { get, isObject, isString, isNil, omit, isFunction } from 'lodash';
 import React, { useState, useEffect, useRef } from 'react';
-import 'antd/es/switch/style';
-import 'antd/es/switch';
-import 'antd/es/input/style';
-import 'antd/es/input';
-import { LazyAntd, MyFormSection, OkButton, MyBaseListComponents, getDefaultRequiredRules, InterceptDisplayFC } from '@lm_fe/components_m';
-import _isObject from 'lodash/isObject';
-import { LazyAntd as LazyAntd$1, useMyEffectSafe } from '@lm_fe/components';
-import 'antd/es/row/style';
-import 'antd/es/row';
-import 'antd/es/col/style';
-import 'antd/es/col';
-import 'antd/es/list/style';
-import 'antd/es/list';
-import 'antd/es/tooltip/style';
-import 'antd/es/tooltip';
+import { MyFormSection, OkButton, MyBaseListComponents, getDefaultRequiredRules, InterceptDisplayFC } from '@lm_fe/components_m';
+import { useMyEffectSafe, MyIcon, Table_L } from '@lm_fe/components';
+import { use_provoke } from '@lm_fe/provoke';
 import 'classnames';
-import 'antd/es/spin/style';
-import 'antd/es/spin';
-import 'antd/es/result/style';
-import 'antd/es/result';
-import 'antd/es/menu/style';
-import 'antd/es/menu';
-import 'lodash/keys';
-LazyAntd.Tree;
-LazyAntd.TreeSelect;
-LazyAntd.Select;
-LazyAntd.Table;
-LazyAntd.Dropdown;
-LazyAntd.Pagination;
 function MyBaseListRenderFormSection(_a) {
   var config = _a.config,
     disabled = _a.disabled,
     form = _a.form;
   return /*#__PURE__*/React.createElement(MyFormSection, {
+    size: 'small',
     form: form,
     defaultOptions: {},
     inline: true,
@@ -71,13 +32,29 @@ function MyBaseListRenderFormSection(_a) {
     disableAll: disabled
   });
 }
-var css_248z = ".index-module_base-list__AUHXA {\n  height: 100%;\n  overflow-y: hidden;\n}\n.index-module_ant-table-ordinal__c8C7I {\n  padding-left: 0 !important;\n  padding-right: 0 !important;\n}\n";
+var css_248z = ".index-module_base-list__AUHXA {\n  height: 100%;\n  overflow-y: auto;\n}\n.index-module_ant-table-ordinal__c8C7I {\n  padding-left: 0 !important;\n  padding-right: 0 !important;\n}\n";
 styleInject(css_248z);
 function formatProps(props) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _w, _x, _y, _z, _0, _1;
   var _props = __assign({}, props);
+  _props.handleBeforePopup = (_c = (_a = _props.handleBeforePopup) !== null && _a !== void 0 ? _a : (_b = _props.bf_conf) === null || _b === void 0 ? void 0 : _b.handleBeforePopup) !== null && _c !== void 0 ? _c : function (values) {
+    return values;
+  };
+  _props.beforeSubmit = (_f = (_d = _props.beforeSubmit) !== null && _d !== void 0 ? _d : (_e = _props.bf_conf) === null || _e === void 0 ? void 0 : _e.beforeSubmit) !== null && _f !== void 0 ? _f : function (values) {
+    return values;
+  };
+  _props.name = (_g = _props.name) !== null && _g !== void 0 ? _g : (_h = _props.bf_conf) === null || _h === void 0 ? void 0 : _h.name;
+  _props.searchParams = safeGetFromFuncOrData((_j = _props.searchParams) !== null && _j !== void 0 ? _j : (_k = _props.bf_conf) === null || _k === void 0 ? void 0 : _k.searchParams);
+  _props.initialSearchValue = safeGetFromFuncOrData((_l = _props.initialSearchValue) !== null && _l !== void 0 ? _l : (_m = _props.bf_conf) === null || _m === void 0 ? void 0 : _m.initialSearchValue);
+  _props.searchConfig = safeGetFromFuncOrData((_o = _props.searchConfig) !== null && _o !== void 0 ? _o : (_p = _props.bf_conf) === null || _p === void 0 ? void 0 : _p.searchConfig);
+  _props.tableColumns = (_q = _props.tableColumns) !== null && _q !== void 0 ? _q : (_r = _props.bf_conf) === null || _r === void 0 ? void 0 : _r.tableColumns;
+  _props.showAction = (_u = (_s = _props.showAction) !== null && _s !== void 0 ? _s : (_t = _props.bf_conf) === null || _t === void 0 ? void 0 : _t.showAction) !== null && _u !== void 0 ? _u : true;
+  _props.showAdd = (_y = (_w = _props.showAdd) !== null && _w !== void 0 ? _w : (_x = _props.bf_conf) === null || _x === void 0 ? void 0 : _x.showAdd) !== null && _y !== void 0 ? _y : true;
+  _props.genColumns = (_1 = (_z = _props.genColumns) !== null && _z !== void 0 ? _z : (_0 = _props.bf_conf) === null || _0 === void 0 ? void 0 : _0.genColumns) !== null && _1 !== void 0 ? _1 : undefined;
   return _props;
 }
 function tranformQueryData(values, searchConfig, isFuck) {
+  var _a;
   if (searchConfig === void 0) {
     searchConfig = [];
   }
@@ -85,11 +62,21 @@ function tranformQueryData(values, searchConfig, isFuck) {
     isFuck = false;
   }
   var newValues = __assign({}, values);
-  var kvArr = searchConfig.filter(function (_) {
+  var straws = flat((_a = searchConfig.filter(function (_) {
+    return (_ === null || _ === void 0 ? void 0 : _.inputType) === 'straw';
+  })) === null || _a === void 0 ? void 0 : _a.map(function (_) {
+    var _a;
+    return (_a = _ === null || _ === void 0 ? void 0 : _.children) !== null && _a !== void 0 ? _a : [];
+  })).map(function (_) {
+    return __assign(__assign({}, _), {
+      straw_children: true
+    });
+  });
+  var kvArr = __spreadArray(__spreadArray([], searchConfig, true), straws, true).filter(function (_) {
     return _;
   }).map(function (conf) {
     var k = SMchc_FormDescriptions.get_form_item_name_str(conf);
-    var v = _get(newValues, k);
+    var v = get(newValues, k);
     return [k, v, conf];
   });
   return kvArr.reduce(function (sum, _a) {
@@ -98,37 +85,37 @@ function tranformQueryData(values, searchConfig, isFuck) {
       v = _a[1],
       conf = _a[2];
     if (isFuck) return __assign(__assign({}, sum), (_b = {}, _b[k] = v, _b));
-    var res = conf ? calcKeyByType(k, v, conf) : (_c = {}, _c[k] = v, _c);
+    var res = conf && !get(conf, 'straw_children') ? calcKeyByType(k, v, conf) : (_c = {}, _c[k] = v, _c);
     return __assign(__assign({}, sum), res);
   }, {});
 }
 function calcKeyByType(k, v, config) {
   var _a, _b, _c, _d, _e, _f, _g;
-  var _h, _j, _k, _l, _m;
+  var _h, _j, _k, _l, _m, _o;
   var input_type = (_h = config.inputType) !== null && _h !== void 0 ? _h : 'input';
   var filterType = (_l = (_k = (_j = config.filterType) === null || _j === void 0 ? void 0 : _j.split) === null || _k === void 0 ? void 0 : _k.call(_j, ',')) !== null && _l !== void 0 ? _l : [];
-  var type = (_m = config.inputProps) === null || _m === void 0 ? void 0 : _m.type;
+  var type = ((_m = config.inputProps) === null || _m === void 0 ? void 0 : _m.type) || ((_o = config.inputProps) === null || _o === void 0 ? void 0 : _o.mode);
   var is_multiple = type === 'multiple' || type === 'tags';
   var f1 = filterType[0];
   var f2 = filterType[1];
-  if (['input', 'Input', 'MyInput', 'address', 'MyAddress'].includes(input_type)) {
+  if (['input', 'Input', 'MyInput', 'address', 'MyAddress', 'MA'].includes(input_type)) {
     return _a = {}, _a["".concat(k, ".").concat(f1 || 'contains')] = v, _a;
   }
-  if (['input_number', 'InputNumber', 'DatePicker'].includes(input_type)) {
+  if (['input_number', 'InputNumber', 'DatePicker', 'MSW', 'MySwitch', 'switch'].includes(input_type)) {
     return _b = {}, _b["".concat(k, ".").concat(f1 || 'equals')] = v, _b;
   }
   if (['select', 'Select', 'MySelect', 'MS'].includes(input_type)) {
     var obj = safe_json_parse(v, v);
     if (Array.isArray(obj)) {
       var arr = obj.map(function (_) {
-        return _isObject(_) ? _.value : _;
+        return isObject(_) ? _.value : _;
       });
       var _v = arr.length > 1 ? arr.join(',') : arr[0];
-      var has_comma = _isString(_v) && _v.includes(',');
+      var has_comma = isString(_v) && _v.includes(',');
       var _df = is_multiple || has_comma ? 'in' : 'equals';
       return _c = {}, _c["".concat(k, ".").concat(f1 || _df)] = _v, _c;
     } else {
-      var has_comma = _isString(v) && v.includes(',');
+      var has_comma = isString(v) && v.includes(',');
       var _df = is_multiple || has_comma ? 'in' : 'equals';
       return _d = {}, _d["".concat(k, ".").concat(f1 || _df)] = v, _d;
     }
@@ -142,7 +129,7 @@ function calcKeyByType(k, v, config) {
 function get_dataIndex(record) {
   var _a, _b;
   var _dataIndex = (_b = (_a = record === null || record === void 0 ? void 0 : record.dataIndex) !== null && _a !== void 0 ? _a : record === null || record === void 0 ? void 0 : record.name) !== null && _b !== void 0 ? _b : record === null || record === void 0 ? void 0 : record.key;
-  if (_isString(_dataIndex) && _dataIndex.includes('.')) {
+  if (isString(_dataIndex) && _dataIndex.includes('.')) {
     return _dataIndex.split('.');
   }
   return _dataIndex;
@@ -160,7 +147,7 @@ function use_my_baselist(props) {
   useEffect(function () {
     SMchc_FormDescriptions.extract_form_config(tableColumns).then(function (conf) {
       set_table_columns(expect_array(conf).filter(function (_) {
-        return !_isNil(_);
+        return !isNil(_);
       }));
     });
     return function () {};
@@ -170,20 +157,11 @@ function use_my_baselist(props) {
   };
 }
 var browserClient = Browser.client || {};
-LazyAntd$1.Tree;
-LazyAntd$1.TreeSelect;
-LazyAntd$1.Select;
-var Table = LazyAntd$1.Table;
-LazyAntd$1.Dropdown;
-LazyAntd$1.Pagination;
 function _MyBaseList(_props) {
   var _a, _b, _c;
-  var staticDefaultQuery = {
-    page: 0,
-    size: mchcConfig.get('列表一页显示条数') || 14,
-    sort: 'id,desc',
-    'deleteFlag.equals': 0
-  };
+  var sys_theme = use_provoke(function (s) {
+    return s.sys_theme;
+  });
   var props = formatProps(_props);
   var dbg_dataSource = props.dbg_dataSource,
     _d = props.needPagination,
@@ -199,7 +177,8 @@ function _MyBaseList(_props) {
     ignore_env = props.ignore_env,
     get_fuck_page = props.get_fuck_page,
     ModalForm = props.ModalForm,
-    baseTitle = props.baseTitle,
+    _g = props.baseTitle,
+    baseTitle = _g === void 0 ? '' : _g,
     rowKey = props.rowKey,
     showExport = props.showExport,
     showPrint = props.showPrint,
@@ -209,24 +188,25 @@ function _MyBaseList(_props) {
     needChecked = props.needChecked,
     requestBeforeEdit = props.requestBeforeEdit,
     addText = props.addText,
+    editText = props.editText,
     name = props.name,
     apiPrefix = props.apiPrefix,
     ActionAddonBefore = props.ActionAddonBefore,
     RenderAction = props.RenderAction,
     RenderBtns = props.RenderBtns,
     RenderSearchBtns = props.RenderSearchBtns,
-    _g = props.searchConfig,
-    searchConfig = _g === void 0 ? [] : _g,
-    _h = props.searchParams,
-    searchParams = _h === void 0 ? {} : _h,
-    _j = props.initialSearchValue,
-    initialSearchValue = _j === void 0 ? {} : _j,
-    _k = props.showRowDelBtn,
-    showRowDelBtn = _k === void 0 ? true : _k,
-    _l = props.showRowEditBtn,
-    showRowEditBtn = _l === void 0 ? true : _l,
-    _m = props.showRowPrintBtn,
-    showRowPrintBtn = _m === void 0 ? false : _m,
+    _h = props.searchConfig,
+    searchConfig = _h === void 0 ? [] : _h,
+    _j = props.searchParams,
+    searchParams = _j === void 0 ? {} : _j,
+    _k = props.initialSearchValue,
+    initialSearchValue = _k === void 0 ? {} : _k,
+    _l = props.showRowDelBtn,
+    showRowDelBtn = _l === void 0 ? true : _l,
+    _m = props.showRowEditBtn,
+    showRowEditBtn = _m === void 0 ? true : _m,
+    _o = props.showRowPrintBtn,
+    showRowPrintBtn = _o === void 0 ? false : _o,
     customModelService = props.customModelService,
     genColumns = props.genColumns,
     onAdd = props.onAdd,
@@ -234,22 +214,28 @@ function _MyBaseList(_props) {
     onPrint = props.onPrint,
     beforeSearch = props.beforeSearch,
     handleClickRow = props.handleClickRow,
-    _o = props.handleDoubleClickRow,
-    handleDoubleClickRow = _o === void 0 ? function (item) {
+    _p = props.handleDoubleClickRow,
+    handleDoubleClickRow = _p === void 0 ? function (item) {
       return handleEdit(item);
-    } : _o,
+    } : _p,
     onModalOpen = props.onModalOpen,
-    _p = props.printDefaultConfig,
-    printDefaultConfig = _p === void 0 ? {} : _p,
-    _q = props.beforeSubmit,
-    beforeSubmit = _q === void 0 ? function (v) {
+    _q = props.printDefaultConfig,
+    printDefaultConfig = _q === void 0 ? {} : _q,
+    _r = props.beforeSubmit,
+    beforeSubmit = _r === void 0 ? function (v) {
       return v;
-    } : _q,
+    } : _r,
     handleBeforePopup = props.handleBeforePopup,
     effect_ctx = props.effect_ctx,
     action_col = props.action_col;
+  var staticDefaultQuery = {
+    page: 0,
+    size: needPagination ? mchcConfig.get('列表一页显示条数') || 14 : 999,
+    sort: 'id,desc',
+    'deleteFlag.equals': 0
+  };
   var myBaseListService = useRef();
-  var _searchForm = _Form.useForm()[0];
+  var _searchForm = Form.useForm()[0];
   var children = props.children;
   var queryRef = useRef(null);
   var wrapRef = useRef(null);
@@ -257,10 +243,13 @@ function _MyBaseList(_props) {
   var defaultQuery = useRef(defaultQueryValue);
   var showSearch = !!searchConfig.length;
   var table_columns = use_my_baselist(props).table_columns;
-  var actCellWidth = (+showRowDelBtn + +showRowEditBtn + +showRowPrintBtn) * 50;
+  var actCellWidth = (+showRowDelBtn + +showRowEditBtn + +showRowPrintBtn) * 60;
   if (ActionAddonBefore) {
     actCellWidth += 70;
   }
+  if (editText) {
+    actCellWidth += editText.length * 14;
+  }
   var searchForm = (_a = props.searchForm) !== null && _a !== void 0 ? _a : _searchForm;
   useEffect(function () {
     myBaseListService.current = customModelService || new ModelService({
@@ -274,51 +263,51 @@ function _MyBaseList(_props) {
       ignore_usr: ignore_usr
     });
   }, [name, customModelService]);
-  var _r = useState(0),
-    total = _r[0],
-    setTotal = _r[1];
-  var _s = useState([]),
-    dataSource = _s[0],
-    setDataSource = _s[1];
-  var _t = useState(false),
-    visible = _t[0],
-    setVisible = _t[1];
+  var _s = useState(0),
+    total = _s[0],
+    setTotal = _s[1];
+  var _t = useState([]),
+    dataSource = _t[0],
+    setDataSource = _t[1];
   var _u = useState(false),
-    editable = _u[0],
-    setEditable = _u[1];
-  var _v = useState(),
-    ___id = _v[0],
-    set___Id = _v[1];
+    visible = _u[0],
+    setVisible = _u[1];
+  var _v = useState(false),
+    editable = _v[0],
+    setEditable = _v[1];
   var _w = useState(),
-    extraModalData = _w[0],
-    setExtraModalData = _w[1];
-  var _x = useState(0),
-    editKey = _x[0],
-    setEditKey = _x[1];
-  var _y = useState(false),
-    loading = _y[0],
-    setLoading = _y[1];
+    ___id = _w[0],
+    set___Id = _w[1];
+  var _x = useState(),
+    extraModalData = _x[0],
+    setExtraModalData = _x[1];
+  var _y = useState(0),
+    editKey = _y[0],
+    setEditKey = _y[1];
   var _z = useState(false),
-    longSearchForm = _z[0],
-    setLongSearchForm = _z[1];
-  var _0 = useState(500),
-    tableHeight = _0[0],
-    setTableHeight = _0[1];
-  var _1 = useState([]),
-    checkRows = _1[0],
-    setCheckRows = _1[1];
-  var form = _Form.useForm()[0];
+    loading = _z[0],
+    setLoading = _z[1];
+  var _0 = useState(false),
+    longSearchForm = _0[0],
+    setLongSearchForm = _0[1];
+  var _1 = useState(500),
+    tableHeight = _1[0],
+    setTableHeight = _1[1];
+  var _2 = useState([]),
+    checkRows = _2[0],
+    setCheckRows = _2[1];
+  var table_form = Form.useForm()[0];
   var editKeyRef = useRef(0);
   var formWrapper = useRef(null);
   var propsCache = useRef(props);
   propsCache.current = props;
   var inited = useRef(false);
-  var _2 = useState(defaultQueryValue.size),
-    __pageSize = _2[0],
-    set__pageSize = _2[1];
-  var _3 = useState(1),
-    __current = _3[0],
-    set__current = _3[1];
+  var _3 = useState(defaultQueryValue.size),
+    __pageSize = _3[0],
+    set__pageSize = _3[1];
+  var _4 = useState(1),
+    __current = _4[0],
+    set__current = _4[1];
   function setPageSize(n) {
     set__pageSize(n);
     defaultQuery.current.size = n;
@@ -334,11 +323,11 @@ function _MyBaseList(_props) {
   useEffect(function () {
     setTimeout(function () {
       var _a, _b, _c, _d, _e, _f, _g;
-      var h = browserClient.clientHeight;
+      var h = document.body.clientHeight;
       var formHeight = (_b = (_a = formWrapper.current) === null || _a === void 0 ? void 0 : _a.clientHeight) !== null && _b !== void 0 ? _b : 0;
       var queryHeight = (_d = (_c = queryRef.current) === null || _c === void 0 ? void 0 : _c.clientHeight) !== null && _d !== void 0 ? _d : 0;
       var tableHeaderHeight = (_g = (_f = (_e = wrapRef.current) === null || _e === void 0 ? void 0 : _e.querySelector('.ant-table-header')) === null || _f === void 0 ? void 0 : _f.clientHeight) !== null && _g !== void 0 ? _g : 0;
-      setTableHeight(h - queryHeight - tableHeaderHeight - 100 - 80);
+      setTableHeight(h - queryHeight - tableHeaderHeight - 118 - 60);
       if (formHeight > 40) {
         setLongSearchForm(true);
       }
@@ -370,7 +359,7 @@ function _MyBaseList(_props) {
   if (effect_ctx) {
     useMyEffectSafe(effect_ctx)(function () {
       if (inited.current) {
-        _message.info('刷新成功！');
+        message.info('刷新成功！');
         handleSearch();
       }
     }, []);
@@ -389,7 +378,7 @@ function _MyBaseList(_props) {
       return __generator(this, function (_e) {
         switch (_e.label) {
           case 0:
-            if (_isFunction(props.create_or_update)) {
+            if (isFunction(props.create_or_update)) {
               return [2, props.create_or_update(submitData)];
             }
             service = myBaseListService.current;
@@ -407,7 +396,7 @@ function _MyBaseList(_props) {
             res = _e.sent();
             _e.label = 4;
           case 4:
-            _message.info(text + '成功！');
+            message.info(text + '成功！');
             safe_set_edit_key(0);
             set___Id(undefined);
             handleSearch();
@@ -436,14 +425,14 @@ function _MyBaseList(_props) {
         }
       }, modalFormConfig === null || modalFormConfig === void 0 ? void 0 : modalFormConfig.modal_data), {
         formDescriptions: cal_columns,
-        onSubmit: function onSubmit(values) {
+        onSubmit: function onSubmit(new_data, old_data) {
           return __awaiter(this, void 0, void 0, function () {
             var _data, submitData;
             return __generator(this, function (_a) {
               switch (_a.label) {
                 case 0:
-                  _data = Object.assign({}, rowData, values);
-                  return [4, safe_async_call(beforeSubmit, _data)];
+                  _data = Object.assign({}, rowData, new_data);
+                  return [4, safe_async_call(beforeSubmit, _data, old_data)];
                 case 1:
                   submitData = _a.sent();
                   mchcLogger.log('submitData', submitData);
@@ -461,7 +450,7 @@ function _MyBaseList(_props) {
               switch (_b.label) {
                 case 0:
                   fn = handleBeforePopup;
-                  _data = rowData !== null && rowData !== void 0 ? rowData : {};
+                  _data = cloneDeep(rowData !== null && rowData !== void 0 ? rowData : {});
                   if (!((rowData === null || rowData === void 0 ? void 0 : rowData.id) && requestBeforeEdit)) return [3, 2];
                   return [4, (_a = myBaseListService.current) === null || _a === void 0 ? void 0 : _a.getOne(rowData === null || rowData === void 0 ? void 0 : rowData.id)];
                 case 1:
@@ -490,18 +479,16 @@ function _MyBaseList(_props) {
     create_or_update: create_or_update
   };
   var actionCol = (_b = action_col === null || action_col === void 0 ? void 0 : action_col(render_props)) !== null && _b !== void 0 ? _b : {
-    title: '操作',
+    title: __DEV__ ? actCellWidth + '' : '操作',
     dataIndex: '__operation',
     fixed: 'right',
     align: 'center',
     isActive: 0,
-    showSorter: false,
-    showFilter: false,
     width: actCellWidth,
     render: function render(value, rowData, index) {
       var editable = isEditing(rowData);
       if (needEditInTable && editable) {
-        return /*#__PURE__*/React.createElement(_Space, null, /*#__PURE__*/React.createElement(OkButton, {
+        return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(OkButton, {
           size: "small",
           onClick: function onClick() {
             return handleItemSave();
@@ -514,38 +501,47 @@ function _MyBaseList(_props) {
         }, "\u53D6\u6D88"));
       }
       if (RenderAction) {
-        return /*#__PURE__*/React.createElement(RenderAction, _extends({
+        return /*#__PURE__*/React.createElement(RenderAction, __assign({
           rowData: rowData
         }, render_props));
       }
-      return /*#__PURE__*/React.createElement(_Space, {
-        size: "small"
-      }, ActionAddonBefore && /*#__PURE__*/React.createElement(ActionAddonBefore, _extends({
+      return /*#__PURE__*/React.createElement(Space, {
+        size: 'small'
+      }, ActionAddonBefore && /*#__PURE__*/React.createElement(ActionAddonBefore, __assign({
         rowData: rowData
       }, render_props)), showRowEditBtn ? /*#__PURE__*/React.createElement(OkButton, {
-        title: "\u7F16\u8F91/\u67E5\u770B",
-        icon: /*#__PURE__*/React.createElement(EditOutlined, null),
+        title: '编辑/查看',
+        icon: /*#__PURE__*/React.createElement(MyIcon, {
+          value: 'EditOutlined'
+        }),
         size: "small",
         onClick: function onClick(e) {
           return handleEdit(rowData);
-        }
+        },
+        btn_text: editText
       }) : null, showCopy ? /*#__PURE__*/React.createElement(OkButton, {
         title: "\u590D\u5236",
-        icon: /*#__PURE__*/React.createElement(CopyOutlined, null),
+        icon: /*#__PURE__*/React.createElement(MyIcon, {
+          value: 'CopyOutlined'
+        }),
         size: "small",
         onClick: function onClick(e) {
-          return handleEdit(_omit(rowData, ['id']));
+          return handleEdit(omit(rowData, ['id']));
         }
       }) : null, showRowPrintBtn ? /*#__PURE__*/React.createElement(OkButton, {
         title: "\u6253\u5370",
-        icon: /*#__PURE__*/React.createElement(PrinterOutlined, null),
+        icon: /*#__PURE__*/React.createElement(MyIcon, {
+          value: 'PrinterOutlined'
+        }),
         size: "small",
         onClick: function onClick(e) {
           return handleRowPrint(rowData);
         }
       }) : null, showRowDelBtn ? /*#__PURE__*/React.createElement(OkButton, {
         title: "\u5220\u9664",
-        icon: /*#__PURE__*/React.createElement(DeleteOutlined, null),
+        icon: /*#__PURE__*/React.createElement(MyIcon, {
+          value: 'DeleteOutlined'
+        }),
         danger: true,
         type: "primary",
         size: "small",
@@ -584,7 +580,7 @@ function _MyBaseList(_props) {
             return [4, (_a = myBaseListService.current) === null || _a === void 0 ? void 0 : _a.del(rowData.id)];
           case 1:
             _b.sent();
-            _message.success("\u5220\u9664".concat(baseTitle, "\u6210\u529F"));
+            mchcEnv.success("\u5220\u9664".concat(baseTitle, "\u6210\u529F"));
             handleSearch();
             return [2];
         }
@@ -606,31 +602,34 @@ function _MyBaseList(_props) {
       });
     });
   }
-  function handleItemSave(_data) {
+  function handleItemSave(d) {
     return __awaiter(this, void 0, void 0, function () {
-      var rowData, submitData;
+      var old_data, _data, submitData;
       var _a;
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            return [4, form.validateFields()];
+            return [4, table_form.validateFields()];
           case 1:
             _b.sent();
-            rowData = (_a = _data !== null && _data !== void 0 ? _data : dataSource.find(function (_) {
+            old_data = (_a = d !== null && d !== void 0 ? d : dataSource.find(function (_) {
               return _.id === editKeyRef.current;
             })) !== null && _a !== void 0 ? _a : {};
-            submitData = __assign(__assign({}, rowData), form.getFieldsValue());
-            return [4, create_or_update(submitData)];
+            _data = __assign(__assign({}, old_data), table_form.getFieldsValue());
+            return [4, safe_async_call(beforeSubmit, _data, old_data)];
           case 2:
+            submitData = _b.sent();
+            return [4, create_or_update(submitData)];
+          case 3:
             _b.sent();
-            form.resetFields();
+            table_form.resetFields();
             return [2];
         }
       });
     });
   }
   function handleItemCancel() {
-    form.resetFields();
+    table_form.resetFields();
     set___Id(undefined);
     safe_set_edit_key(0);
     setDataSource(typeof editKey === 'string' ? dataSource.slice(1, dataSource.length) : dataSource);
@@ -649,10 +648,10 @@ function _MyBaseList(_props) {
             _a.sent();
             return [3, 3];
           case 2:
-            _message.warning('请先保存上一条数据！');
+            message.warning('请先保存上一条数据！');
             return [2];
           case 3:
-            form.setFieldsValue(rowData);
+            table_form.setFieldsValue(rowData);
             key = rowData.editKey || rowData.id;
             set___Id(rowData.id);
             safe_set_edit_key(key);
@@ -678,20 +677,24 @@ function _MyBaseList(_props) {
     set___Id(rowData.id);
   }
   var handleAdd = function handleAdd() {
+    var _a;
     if (onAdd) {
       onAdd();
       return;
     }
     if (needEditInTable) {
       if (editKeyRef.current) {
-        _message.error('请先保存上一条记录');
+        message.error('请先保存上一条记录~');
         return;
       }
       var mockKey = +new Date();
-      safe_set_edit_key(mockKey);
-      setDataSource(__spreadArray([{
+      var new_data = {
         editKey: mockKey
-      }], dataSource, true));
+      };
+      new_data = (_a = handleBeforePopup === null || handleBeforePopup === void 0 ? void 0 : handleBeforePopup(new_data)) !== null && _a !== void 0 ? _a : new_data;
+      var new_arr = __spreadArray([new_data], dataSource, true);
+      handleEdit(new_data);
+      setDataSource(new_arr);
     } else {
       if (ModalForm) {
         setEditable(true);
@@ -735,12 +738,12 @@ function _MyBaseList(_props) {
           case 0:
             if (!myBaseListService.current) return [2];
             if (dataSource.some(function (_) {
-              return _isNil(_.id);
+              return isNil(_.id);
             })) setDataSource([]);
             setLoading(true);
             return [4, Promise.all([myBaseListService.current.page({
               params: params
-            }), sleep(.2)])["finally"](function () {
+            }), sleep(100)])["finally"](function () {
               return setLoading(false);
             })];
           case 1:
@@ -783,7 +786,7 @@ function _MyBaseList(_props) {
         props = _b.props,
         dataIndex = _b.dataIndex,
         width = _b.width;
-      var isOperativeCell = _isString(dataIndex) && ['__operation', 'operation'].includes(dataIndex);
+      var isOperativeCell = isString(dataIndex) && ['__operation', 'operation'].includes(dataIndex);
       var format_data = {
         title: get_title(col),
         dataIndex: get_dataIndex(col)
@@ -812,8 +815,7 @@ function _MyBaseList(_props) {
     var editing = cell.editing,
       dataIndex = cell.dataIndex,
       title = cell.title,
-      _b = cell.inputType,
-      inputType = _b === void 0 ? 'input' : _b,
+      inputType = cell.inputType,
       inputProps = cell.inputProps,
       rules = cell.rules,
       record = cell.record;
@@ -823,42 +825,25 @@ function _MyBaseList(_props) {
       render = cell.render,
       restProps = __rest(cell, ["editing", "dataIndex", "title", "inputType", "inputProps", "rules", "record", "index", "children", "inputConfig", "render"]);
     var C = (_a = MyBaseListComponents[inputType]) !== null && _a !== void 0 ? _a : function () {
-      return "Unkown Cell Component!";
+      return "Unkown Cell Component:" + inputType;
     };
-    return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
-      title: _get(record, dataIndex)
-    }), editing ? /*#__PURE__*/React.createElement(_Form.Item, {
+    return /*#__PURE__*/React.createElement("td", __assign({}, restProps, {
+      title: get(record, dataIndex)
+    }), editing && inputType ? (/*#__PURE__*/React.createElement(Form.Item, {
       name: dataIndex,
       style: {
         margin: 0
       },
       rules: getDefaultRequiredRules(rules, title || dataIndex)
-    }, /*#__PURE__*/React.createElement(C, _extends({}, inputProps, {
+    }, /*#__PURE__*/React.createElement(C, __assign({}, inputProps, {
       inputType: inputType,
       config: inputConfig !== null && inputConfig !== void 0 ? inputConfig : cell
-    }))) : C.DisplayFC && !render ? /*#__PURE__*/React.createElement(InterceptDisplayFC, {
+    })))) : (C === null || C === void 0 ? void 0 : C.DisplayFC) && !render ? /*#__PURE__*/React.createElement(InterceptDisplayFC, {
       C: C,
       config: inputConfig !== null && inputConfig !== void 0 ? inputConfig : cell,
-      value: _get(record, dataIndex)
+      value: get(record, dataIndex)
     }) : children);
   };
-  var renderOthersModal = function renderOthersModal() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, visible && ModalForm && /*#__PURE__*/React.createElement(ModalForm, {
-      visible: visible,
-      editable: editable,
-      id: ___id,
-      extraModalData: extraModalData,
-      onCancel: function onCancel() {
-        handleCancel();
-        handleSearch();
-      },
-      onSearch: handleSearch,
-      onOk: function onOk() {
-        handleCancel();
-        handleSearch();
-      }
-    }));
-  };
   function search() {
     return __awaiter(this, void 0, void 0, function () {
       var q;
@@ -872,107 +857,13 @@ function _MyBaseList(_props) {
       });
     });
   }
-  var renderAdd = function renderAdd() {
-    return /*#__PURE__*/React.createElement(_Space, null, RenderBtns === null || RenderBtns === void 0 ? void 0 : RenderBtns.call(window, actionCtx), showExport || onExport ? /*#__PURE__*/React.createElement(OkButton, {
-      icon: /*#__PURE__*/React.createElement(ExportOutlined, null),
-      type: "primary",
-      onClick: function onClick() {
-        var _a;
-        if (onExport) {
-          onExport(actionCtx);
-        } else {
-          (_a = myBaseListService.current) === null || _a === void 0 ? void 0 : _a["export"](getSearchParams()).then(function (r) {
-            downloadFile(r, "".concat(baseTitle).concat(formatDateTime(), ".xlsx"), 'application/vnd.ms-excel');
-          });
-        }
-      }
-    }, '导出') : null, showPrint ? /*#__PURE__*/React.createElement(OkButton, {
-      icon: /*#__PURE__*/React.createElement(ExportOutlined, null),
-      type: "primary",
-      onClick: function onClick() {
-        if (onPrint) {
-          onPrint(actionCtx);
-        } else {
-          mchcModal__.open('print_modal', {
-            modal_data: {
-              requestData: __assign(__assign({
-                url: name + 'print'
-              }, getSearchParams()), printDefaultConfig)
-            }
-          });
-        }
-      }
-    }, '打印') : null, showAdd ? /*#__PURE__*/React.createElement(OkButton, {
-      disabled: loading,
-      icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
-      type: "primary",
-      onClick: handleAdd
-    }, addText || '新增') : null, showSearch ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Divider, {
-      type: "vertical"
-    }), /*#__PURE__*/React.createElement(_Button.Group, null, RenderSearchBtns === null || RenderSearchBtns === void 0 ? void 0 : RenderSearchBtns.call(window, actionCtx), /*#__PURE__*/React.createElement(OkButton, {
-      htmlType: "reset",
-      icon: /*#__PURE__*/React.createElement(ReloadOutlined, null),
-      disabled: loading,
-      onClick: function onClick() {
-        searchForm.resetFields();
-        defaultQuery.current = defaultQueryValue;
-        setDataSource([]);
-        setCurrent(1);
-        setPageSize(defaultQueryValue.size);
-        handleSearch();
-      }
-    }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(OkButton, {
-      type: "primary",
-      htmlType: "submit",
-      disabled: loading,
-      onClick: function onClick() {
-        return search();
-      },
-      icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
-    }, "\u67E5\u8BE2"))) : null);
-  };
-  var renderTitle = function renderTitle() {
-    return /*#__PURE__*/React.createElement("div", {
-      ref: queryRef,
-      style: __assign({
-        padding: 4
-      }, longSearchForm ? {
-        display: 'flex',
-        flexDirection: 'column-reverse'
-      } : {
-        display: 'flex',
-        justifyContent: 'space-between'
-      })
-    }, /*#__PURE__*/React.createElement("div", {
-      ref: formWrapper,
-      style: {
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'space-between',
-        paddingTop: 4
-      }
-    }, showSearch ? /*#__PURE__*/React.createElement(_Form, {
-      initialValues: initialSearchValue,
-      form: searchForm,
-      layout: "inline",
-      onFinish: function onFinish() {
-        search();
-      }
-    }, searchConfig ? /*#__PURE__*/React.createElement(MyBaseListRenderFormSection, {
-      config: searchConfig,
-      disabled: loading
-    }) : null) : null), /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'flex-end',
-        borderBottom: longSearchForm ? '1px dashed #ddd' : 0,
-        paddingBottom: 4,
-        paddingRight: 28
-      }
-    }, renderAdd()));
-  };
   var mergedColumns = format_columns(cal_columns);
+  var rowSelection = {
+    onChange: handleRowSelected,
+    selectedRowKeys: checkRows.map(function (_) {
+      return _.id;
+    })
+  };
   var __pagination = needPagination ? {
     position: ['bottomCenter'],
     total: total,
@@ -989,29 +880,139 @@ function _MyBaseList(_props) {
     onShowSizeChange: handlePageChange,
     showQuickJumper: true,
     showSizeChanger: true
-  } : {};
+  } : false;
   var __components = needEditInTable || true ? {
     body: {
       cell: renderEditableCell
     }
   } : {};
+  var _5 = useState([]);
+  _5[0];
+  _5[1];
   return /*#__PURE__*/React.createElement("div", {
-    className: "base-list",
-    ref: wrapRef
-  }, /*#__PURE__*/React.createElement(_Form, {
+    ref: wrapRef,
+    style: {
+      background: sys_theme.bg_color
+    }
+  }, /*#__PURE__*/React.createElement(Form, {
     onSubmitCapture: function onSubmitCapture(e) {
-      _message.info('onSubmitCapture');
+      message.info('onSubmitCapture');
     },
     onFinish: function onFinish() {
-      _message.info('onFinish');
+      message.info('onFinish');
     },
-    form: form,
+    form: table_form,
     component: false,
     onFieldsChange: handleFieldsChange
   }, /*#__PURE__*/React.createElement("div", {
     className: "global-base-table",
     id: "global-base-table"
-  }, renderTitle === null || renderTitle === void 0 ? void 0 : renderTitle(), /*#__PURE__*/React.createElement(Table, {
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: queryRef,
+    style: __assign({
+      padding: 4
+    }, longSearchForm ? {
+      display: 'flex',
+      flexDirection: 'column-reverse'
+    } : {
+      display: 'flex',
+      justifyContent: 'space-between'
+    })
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: formWrapper,
+    style: {
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'space-between',
+      paddingTop: 4
+    }
+  }, showSearch ? (/*#__PURE__*/React.createElement(Form, {
+    initialValues: initialSearchValue,
+    form: searchForm,
+    layout: "inline",
+    onFinish: function onFinish() {
+      search();
+    }
+  }, searchConfig ? /*#__PURE__*/React.createElement(MyBaseListRenderFormSection, {
+    config: searchConfig,
+    disabled: loading
+  }) : null)) : null), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'flex-end',
+      borderBottom: longSearchForm ? "1px dashed ".concat(sys_theme.colorBorder) : 0,
+      paddingBottom: 4,
+      paddingRight: 28
+    }
+  }, /*#__PURE__*/React.createElement(Space, null, RenderBtns === null || RenderBtns === void 0 ? void 0 : RenderBtns.call(window, actionCtx), showExport || onExport ? /*#__PURE__*/React.createElement(OkButton, {
+    icon: /*#__PURE__*/React.createElement(MyIcon, {
+      value: 'ExportOutlined'
+    }),
+    type: "primary",
+    onClick: function onClick() {
+      var _a;
+      if (onExport) {
+        onExport(actionCtx);
+      } else {
+        (_a = myBaseListService.current) === null || _a === void 0 ? void 0 : _a["export"](getSearchParams()).then(function (r) {
+          downloadFile(r, "".concat(baseTitle).concat(formatDateTime(), ".xlsx"), 'application/vnd.ms-excel');
+        });
+      }
+    }
+  }, '导出') : null, showPrint ? /*#__PURE__*/React.createElement(OkButton, {
+    icon: /*#__PURE__*/React.createElement(MyIcon, {
+      value: 'ExportOutlined'
+    }),
+    type: "primary",
+    onClick: function onClick() {
+      if (onPrint) {
+        onPrint(actionCtx);
+      } else {
+        mchcModal__.open('print_modal', {
+          modal_data: {
+            requestData: __assign(__assign({
+              url: name + 'print'
+            }, getSearchParams()), printDefaultConfig)
+          }
+        });
+      }
+    }
+  }, '打印') : null, showAdd ? /*#__PURE__*/React.createElement(OkButton, {
+    disabled: loading,
+    icon: /*#__PURE__*/React.createElement(MyIcon, {
+      value: 'PlusOutlined'
+    }),
+    type: "primary",
+    onClick: handleAdd
+  }, addText || '新增') : null, showSearch ? (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
+    type: 'vertical'
+  }), /*#__PURE__*/React.createElement(Button.Group, null, RenderSearchBtns === null || RenderSearchBtns === void 0 ? void 0 : RenderSearchBtns.call(window, actionCtx), /*#__PURE__*/React.createElement(OkButton, {
+    htmlType: "reset",
+    icon: /*#__PURE__*/React.createElement(MyIcon, {
+      value: 'ReloadOutlined'
+    }),
+    disabled: loading,
+    onClick: function onClick() {
+      searchForm.resetFields();
+      defaultQuery.current = defaultQueryValue;
+      setDataSource([]);
+      setCurrent(1);
+      setPageSize(defaultQueryValue.size);
+      handleSearch();
+    }
+  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(OkButton, {
+    type: "primary",
+    htmlType: "submit",
+    disabled: loading,
+    onClick: function onClick() {
+      return search();
+    },
+    icon: /*#__PURE__*/React.createElement(MyIcon, {
+      value: 'SearchOutlined'
+    })
+  }, "\u67E5\u8BE2")))) : null))), /*#__PURE__*/React.createElement(Table_L, {
+    size: 'small',
     dataSource: dataSource,
     rowKey: rowKey || 'id',
     bordered: true,
@@ -1019,22 +1020,17 @@ function _MyBaseList(_props) {
     pagination: __pagination,
     title: undefined,
     style: {
-      padding: '0 12px'
+      padding: '0 12px',
+      paddingBottom: needPagination ? 0 : 8
     },
     components: __components,
     scroll: {
       scrollToFirstRowOnChange: true,
-      x: _get(otherTableProps, 'scroll.x') || 'calc(100px)',
-      y: _get(otherTableProps, 'scroll.y') || tableHeight
+      x: get(otherTableProps, 'scroll.x') || 'calc(100px)',
+      y: get(otherTableProps, 'scroll.y') || tableHeight
     },
     columns: mergedColumns,
-    rowSelection: needChecked ? {
-      type: 'checkbox',
-      onChange: handleRowSelected,
-      selectedRowKeys: checkRows.map(function (_) {
-        return _.id;
-      })
-    } : undefined,
+    rowSelection: needChecked ? rowSelection : undefined,
     onRow: function onRow(record) {
       return {
         onClick: function onClick(event) {
@@ -1048,7 +1044,20 @@ function _MyBaseList(_props) {
         }
       };
     }
-  }))), renderOthersModal(), children);
+  }))), /*#__PURE__*/React.createElement(React.Fragment, null, visible && ModalForm && (/*#__PURE__*/React.createElement(ModalForm, {
+    open: visible,
+    editable: editable,
+    id: ___id,
+    extraModalData: extraModalData,
+    onCancel: function onCancel() {
+      handleCancel();
+      handleSearch();
+    },
+    onSearch: handleSearch,
+    onOk: function onOk() {
+      handleCancel();
+      handleSearch();
+    }
+  }))), children);
 }
 export { _MyBaseList, _MyBaseList as default };
-//# sourceMappingURL=.root3.js.map