vap1 0.1.5 → 0.1.6

package/components/Trees/COTree/COTreeUtil.js

@@ -0,0 +1,187 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.invertToString = exports.convertFormString = exports.invertToObject = exports.convertFormObject = exports.getTreeDataByLoaded = exports.flagRender = void 0;
+const react_1 = __importDefault(require("react"));
+const lodash_1 = __importDefault(require("lodash"));
+const utils_1 = require("../../../utils");
+const Icon_1 = require("../../_adapt/Icon");
+const flagRender = (flag) => {
+    switch (flag) {
+        case 0:
+            return react_1.default.createElement("span", { className: 'co-tree-select-all' },
+                react_1.default.createElement(Icon_1.Icon, { type: "check-circle" }),
+                react_1.default.createElement("small", null, "\u542B\u4E0B\u7EA7"));
+        case 1:
+            return react_1.default.createElement("span", { className: 'co-tree-not-include' },
+                react_1.default.createElement(Icon_1.Icon, { type: "switcher" }),
+                react_1.default.createElement("small", null, "\u4E0D\u542B\u672C\u7EA7"));
+        case 2:
+            return react_1.default.createElement("span", { className: 'co-tree-select-only' },
+                react_1.default.createElement(Icon_1.Icon, { type: "symbol-check-on" }),
+                react_1.default.createElement("small", null, "\u672C\u7EA7+\u6307\u5B9A\u4E0B\u7EA7"));
+    }
+    return utils_1.Const.NONE;
+};
+exports.flagRender = flagRender;
+const loop = (root, FIELDS, treeData, checkedKeys, FULL_CHECKED, HALF_CHECKED, XOR_CHECKED, ORDER_BY, DISABLED, TIP) => {
+    let arr = ORDER_BY(root);
+    for (let item of arr) {
+        let node = {
+            key: item[FIELDS.keyField],
+            title: item[FIELDS.titleField],
+            // checkable: true,
+            selectable: false,
+            disabled: DISABLED(item),
+            // @ts-ignore
+            data: lodash_1.default.omit(item, 'children'),
+        };
+        // unselect 时，如果下级不再有，本极为1，则清除
+        if (FULL_CHECKED.has(item[FIELDS.keyField])) {
+            // 再点就取消
+            // node.className = 'co-tree-select-all';
+            // node.icon = <Icon type="check-circle" />;
+            // node.title = <span>{item[FIELDS.titleField]}{TIP && <small>(含下级)</small>}</span>
+            node.title = react_1.default.createElement("span", { className: 'co-tree-select-all' },
+                react_1.default.createElement(Icon_1.Icon, { type: "check-circle" }),
+                " ",
+                react_1.default.createElement("span", null, item[FIELDS.titleField]),
+                TIP && react_1.default.createElement("small", null, "(\u542B\u4E0B\u7EA7)"));
+            node.isLeaf = true;
+            checkedKeys.checked.push(item[FIELDS.keyField]);
+        }
+        else if (HALF_CHECKED.has(item[FIELDS.keyField])) {
+            // 再点就全选
+            // node.className = 'co-tree-select-only';
+            // node.icon = <Icon type='symbol-check-on' />;
+            // node.title = <span>{item[FIELDS.titleField]}{TIP && <small>(本级+指定下级)</small>}</span>
+            node.title = react_1.default.createElement("span", { className: 'co-tree-select-only' },
+                react_1.default.createElement(Icon_1.Icon, { type: "symbol-check-on" }),
+                " ",
+                react_1.default.createElement("span", null, item[FIELDS.titleField]),
+                TIP && react_1.default.createElement("small", null, "(\u672C\u7EA7+\u6307\u5B9A\u4E0B\u7EA7)"));
+            checkedKeys.halfChecked.push(item[FIELDS.keyField]);
+        }
+        else if (XOR_CHECKED.has(item[FIELDS.keyField])) {
+            // 再就就半选（）
+            // node.className = 'co-tree-not-include';
+            // node.icon = <Icon type='switcher' />;
+            // node.title = <span>{item[FIELDS.titleField]}{TIP && <small>(不含本级)</small>}</span>
+            node.title = react_1.default.createElement("span", { className: 'co-tree-not-include' },
+                react_1.default.createElement(Icon_1.Icon, { type: "switcher" }),
+                " ",
+                react_1.default.createElement("span", null, item[FIELDS.titleField]),
+                TIP && react_1.default.createElement("small", null, "(\u4E0D\u542B\u672C\u7EA7)"));
+            checkedKeys.halfChecked.push(item[FIELDS.keyField]);
+        }
+        else {
+            // 点击 = 半选
+            // node.className = 'co-tree-not-check';
+            // node.icon = <Icon type='symbol-check-off' />;
+            node.title = react_1.default.createElement("span", { className: 'co-tree-not-check' },
+                react_1.default.createElement(Icon_1.Icon, { type: "symbol-check-off" }),
+                " ",
+                react_1.default.createElement("span", null, item[FIELDS.titleField]));
+        }
+        if (node.isLeaf === undefined && FIELDS.checkField) {
+            node.isLeaf = item[FIELDS.checkField] ? false : true;
+        }
+        if (lodash_1.default.isArray(item.children)) {
+            if (node.isLeaf === false || node.isLeaf === undefined) {
+                node.children = [];
+                loop(item.children, FIELDS, node.children, checkedKeys, FULL_CHECKED, HALF_CHECKED, XOR_CHECKED, ORDER_BY, DISABLED, TIP);
+            }
+        }
+        treeData.push(node);
+    }
+};
+const getTreeDataByLoaded = (all, treeProps, FIELDS) => {
+    const FULL_CHECKED = new Set();
+    const HALF_CHECKED = new Set();
+    const XOR_CHECKED = new Set();
+    (treeProps.value || []).map(item => {
+        switch (item.flag) {
+            case 0:
+                FULL_CHECKED.add(item.key);
+                break;
+            case 1:
+                XOR_CHECKED.add(item.key);
+                break;
+            case 2:
+                HALF_CHECKED.add(item.key);
+                break;
+        }
+    });
+    const DISABLED = treeProps.disableNode ? treeProps.disableNode : () => false;
+    const TIP = treeProps.selectTip || false;
+    const ORDER_BY = FIELDS.sortField ? (arr) => lodash_1.default.orderBy(arr, FIELDS.sortField, 'asc') : arr => arr;
+    const treeData = [];
+    const checkedKeys = { checked: [], halfChecked: [] };
+    loop(all, FIELDS, treeData, checkedKeys, FULL_CHECKED, HALF_CHECKED, XOR_CHECKED, ORDER_BY, DISABLED, TIP);
+    return [{ treeData, checkedKeys, }, FULL_CHECKED, HALF_CHECKED, XOR_CHECKED];
+};
+exports.getTreeDataByLoaded = getTreeDataByLoaded;
+const FLAG_SET = new Set([0, 1, 2]);
+const convertFormObject = (obj) => {
+    let result = [];
+    const keys = lodash_1.default.keys(obj);
+    for (let key of keys) {
+        let flagStr = obj[key];
+        try {
+            let flag = parseInt(flagStr);
+            if (FLAG_SET.has(flag)) {
+                result.push({ key, flag: flag });
+            }
+        }
+        catch (_a) {
+        }
+    }
+    return result;
+};
+exports.convertFormObject = convertFormObject;
+const invertToObject = (items) => {
+    const data = {};
+    items.map(item => {
+        if (FLAG_SET.has(item.flag) && item.key) {
+            data[item.key] = item.flag;
+        }
+    });
+    return data;
+};
+exports.invertToObject = invertToObject;
+// xxx:0,yyy:2,zzz:1
+const convertFormString = (txt) => {
+    let result = [];
+    const items = (txt || '').split(',');
+    for (let item of items) {
+        let ptns = item.split(':');
+        if (ptns.length == 2) {
+            try {
+                let flagStr = ptns[1];
+                let flag = parseInt(lodash_1.default.trim(flagStr));
+                if (FLAG_SET.has(flag)) {
+                    let key = lodash_1.default.trim(ptns[0]);
+                    if (key) {
+                        result.push({ key, flag: flag });
+                    }
+                }
+            }
+            catch (_a) { }
+        }
+    }
+    return result;
+};
+exports.convertFormString = convertFormString;
+const invertToString = (items) => {
+    // const data = {};
+    let flags = [];
+    items.map(item => {
+        if (FLAG_SET.has(item.flag) && item.key) {
+            flags.push(`${lodash_1.default.trim(item.key)}:${item.flag}`);
+        }
+    });
+    return flags.join(',');
+};
+exports.invertToString = invertToString;

package/components/UForm/UForm.js

@@ -141,7 +141,6 @@ const renderFormField = (state, field, form, update, data) => {
     if (hiddenFields.current.has(field.field)) {
         return react_1.default.createElement(antd_1.Form.Item, { style: { display: 'none' } }, form.getFieldDecorator(field.field)(react_1.default.createElement(input.component, {
             form,
-            // initValue:
             field,
             disabled: disableFields.current.has(field.field),
             options: (0, _FormUtils_1.getOptions)(optionFields.current.has(field.field) ? optionFields.current.get(field.field) : (field.options || []), field, data)

package/components/UForm/UFormModal.js

@@ -38,8 +38,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UFormModal = void 0;
 const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
-const Popconfirm_1 = require("../_adapt/Popconfirm");
 const Modal_1 = require("../_adapt/Modal");
+const Popconfirm_1 = require("../_adapt/Popconfirm");
 const Button_1 = require("../_adapt/Button");
 const UForm_1 = require("./UForm");
 const utils_1 = require("../../utils");

package/components/UForm/_FieldType.d.ts

@@ -5,4 +5,4 @@
 | text ||
  *
 */
-export declare const _FieldType: readonly ["text", "textarea", "password", "color", "number", "slider", "slider-range", "slider-range", "input-with-select", "select", "multi-select", "switch", "radio", "radio-button", "radio-with-more", "checkbox", "checkbox-with-all", "icon", "stree-select", "dtree-select", "ftree-select", "date", "datetime", "month", "week", "time", "daterange", "timerange", "daterange-single", "timerange-single", "monthrange", "json-array", "file", "multi-file", "img", "idcard", "ip", "ip4", "ip6", "phone", "telephone", "mobilephone", "port", "mac", "url", "email", "crontab", "organization", "role", "roles"];
+export declare const _FieldType: readonly ["text", "textarea", "password", "color", "number", "slider", "slider-range", "slider-range", "input-with-select", "select", "multi-select", "switch", "switch-checkbox", "radio", "radio-button", "radio-with-more", "checkbox", "checkbox-with-all", "icon", "stree-select", "dtree-select", "ftree-select", "date", "datetime", "month", "week", "time", "daterange", "datetimerange", "daterange-single", "datetimerange-single", "monthrange", "json-array", "json-table", "file", "multi-file", "img", "idcard", "ip", "ip4", "ip6", "phone", "telephone", "mobilephone", "port", "mac", "url", "email", "crontab", "organization", "role", "roles", "cems-org"];

package/components/UForm/_FieldType.js

@@ -9,6 +9,9 @@ exports._FieldType = void 0;
  *
 */
 exports._FieldType = [
+    /**
+     * 文本输入，默认
+    */
     'text',
     /**
      * 文本输入域
@@ -56,6 +59,7 @@ exports._FieldType = [
      * 开关
     */
     'switch',
+    'switch-checkbox',
     /**
      * 单选
     */
@@ -74,11 +78,13 @@ exports._FieldType = [
     'week',
     'time',
     'daterange',
-    'timerange',
+    'datetimerange',
     'daterange-single',
-    'timerange-single',
+    'datetimerange-single',
+    // 'timerange',
     'monthrange',
     'json-array',
+    'json-table',
     'file',
     'multi-file',
     'img',
@@ -97,4 +103,6 @@ exports._FieldType = [
     'organization',
     'role',
     'roles',
+    // CEMS 专用
+    'cems-org',
 ];

package/components/UForm/index.d.ts

@@ -16,6 +16,7 @@ import type { ValidationRule } from 'antd/es/form/Form';
  *  2. 大于8个字段时，默认使用  common
 */
 export type UFormLayout = 'common' | 'simple' | 'compress';
+export type FieldDataType = 'string' | 'array' | 'object';
 /**
  * 分组展示的方式 default = 默认 |  tabs = 标签  | collapse = 折叠风琴
 */
@@ -173,6 +174,15 @@ export type UFormField = BaseItem & {
      *
     */
     link?: Link[];
+    /**
+     * （试验中，暂不要使用）
+     * 在复杂类型中使用时，可使用dataType定义类型
+     * 多选 multi-select/checkbox 等 适用： string | array
+     * json-array 适用 string | array
+     * json-object 适用 string | object
+     * 也可用于自定义类型
+    */
+    dataType?: FieldDataType;
     /**
      * 扩展字段说明：
      * 自定义

package/components/_adapt/Drawer.js

@@ -8,7 +8,7 @@ const react_1 = __importDefault(require("react"));
 const antd_1 = require("antd");
 const utils_1 = require("./utils");
 const Drawer = (props) => {
-    return react_1.default.createElement(antd_1.Drawer, Object.assign({}, (0, utils_1.convertProps)(props, ['visible', 'open'], ['afterVisibleChange', 'afterOpenChange'])),
+    return react_1.default.createElement(antd_1.Drawer, Object.assign({}, (0, utils_1.convertProps)(props, ['visible', 'open'], ['afterVisibleChange', 'afterOpenChange']), { getContainer: () => document.getElementById('vap-app-content') }),
         props.children,
         props.footer);
 };

package/components/_adapt/Dropdown.d.ts

@@ -1,6 +1,6 @@
-import type { FC } from 'react';
+import type { FC, ExoticComponent, PropsWithChildren } from 'react';
 import type { MenuProps } from './Menu';
-import type { DropDownProps as AntdDropDownProps } from 'antd/es/dropdown';
+import type { DropDownProps as AntdDropDownProps, DropdownButtonProps as AntdDropdownButtonProps } from 'antd/es/dropdown';
 /**
  * 说明： 排除 Dropdown 组件已被 antd 标记为 deprecated 的属性:
  * 1. visible : Please use `open` instead
@@ -12,4 +12,13 @@ export type DropdownProps = Omit<AntdDropDownProps, 'visible' | 'onVisibleChange
     menu?: MenuProps;
     overlay?: AntdDropDownProps['overlay'];
 };
-export declare const Dropdown: FC<DropdownProps>;
+export type DropdownButtonProps = Omit<AntdDropdownButtonProps, 'visible' | 'onVisibleChange' | 'overlay'> & {
+    arrow?: boolean;
+    menu?: MenuProps;
+    overlay?: AntdDropDownProps['overlay'];
+};
+type DropdownComponent = ExoticComponent<PropsWithChildren<DropdownProps>> & {
+    Button: FC<PropsWithChildren<DropdownButtonProps>>;
+};
+export declare const Dropdown: DropdownComponent;
+export {};

package/components/_adapt/Dropdown.js

@@ -28,11 +28,19 @@ const react_1 = __importStar(require("react"));
 const antd_1 = require("antd");
 const utils_1 = require("./utils");
 const Menu_1 = require("./Menu");
-const Dropdown = props => {
+const _Dropdown = props => {
     const dropdownProps = (0, react_1.useMemo)(() => (0, utils_1.convertProps)(props, ['visible', 'open'], ['onVisibleChange', 'onOpenChange']), []);
     if (props.menu) {
         return react_1.default.createElement(antd_1.Dropdown, Object.assign({}, dropdownProps, { overlay: react_1.default.createElement(Menu_1.Menu, Object.assign({}, props.menu)) }));
     }
     return react_1.default.createElement(antd_1.Dropdown, Object.assign({}, dropdownProps));
 };
-exports.Dropdown = Dropdown;
+const _DropdownButton = props => {
+    const dropdownProps = (0, react_1.useMemo)(() => (0, utils_1.convertProps)(props, ['visible', 'open'], ['onVisibleChange', 'onOpenChange']), []);
+    if (props.menu) {
+        return react_1.default.createElement(antd_1.Dropdown.Button, Object.assign({}, dropdownProps, { overlay: react_1.default.createElement(Menu_1.Menu, Object.assign({}, props.menu)) }));
+    }
+    return react_1.default.createElement(antd_1.Dropdown.Button, Object.assign({}, dropdownProps));
+};
+exports.Dropdown = _Dropdown;
+exports.Dropdown.Button = _DropdownButton;

package/components/_adapt/Modal.js

@@ -48,7 +48,7 @@ class Modal extends react_1.Component {
             react_1.default.createElement(Button_1.Button, Object.assign({ onClick: evt => utils_1.PageUtil.stopEvent(evt, () => onCancel()) }, cancelButtonProps), cancelText || utils_1.i18n.ant('Modal.cancelText')));
     }
     render() {
-        return react_1.default.createElement(antd_1.Modal, Object.assign({}, this.props, { visible: this.props.open, footer: this.props.footer === null ? null : this.renderFooter() }));
+        return react_1.default.createElement(antd_1.Modal, Object.assign({}, this.props, { getContainer: () => document.getElementById('vap-app-content'), visible: this.props.open, footer: this.props.footer === null ? null : this.renderFooter() }));
     }
 }
 exports.Modal = Modal;

package/components/_adapt/Radio.js

@@ -7,18 +7,18 @@ exports.Radio = void 0;
 const react_1 = __importDefault(require("react"));
 const antd_1 = require("antd");
 const lodash_1 = __importDefault(require("lodash"));
-const RadioGroupWithOptions = (props) => react_1.default.createElement(antd_1.Radio.Group, Object.assign({}, lodash_1.default.omit(props, 'children')), props.options.map(item => {
-    if (props.optionType == 'button') {
-        return react_1.default.createElement(antd_1.Radio.Button, { value: item.value }, item.label);
+const RadioGroupWithOptions = (props) => {
+    if (props.buttonStyle) {
+        return react_1.default.createElement(antd_1.Radio.Group, Object.assign({}, lodash_1.default.omit(props, ['children', 'options']), { buttonStyle: "solid" }), props.options.map(item => react_1.default.createElement(antd_1.Radio.Button, { value: item.value }, item.label)));
     }
-    return react_1.default.createElement(antd_1.Radio, { value: item.value }, item.label);
-}));
+    return react_1.default.createElement(antd_1.Radio.Group, Object.assign({}, lodash_1.default.omit(props, ['children', 'options'])), props.options.map(item => react_1.default.createElement(antd_1.Radio, { value: item.value }, item.label)));
+};
 const RadioGroup = props => {
     if (lodash_1.default.isArray(props.options))
         return react_1.default.createElement(RadioGroupWithOptions, Object.assign({}, props));
     return react_1.default.createElement(antd_1.Radio.Group, Object.assign({}, props));
 };
-const _Radio = (props) => react_1.default.createElement(exports.Radio, Object.assign({}, props));
+const _Radio = (props) => react_1.default.createElement(antd_1.Radio, Object.assign({}, props));
 exports.Radio = _Radio;
 exports.Radio.Group = RadioGroup;
 exports.Radio.Button = antd_1.Radio.Button;

package/components/_common/Upagination.js

@@ -85,16 +85,16 @@ const getConfig = (total, totalAcc, cost) => {
             conf.showTotal = () => utils_1.Const.NONE;
             break;
         case 1:
-            conf.showTotal = (total, range) => TOTAL1(total, range, totalAcc);
+            conf.showTotal = (total, range) => TOTAL1(total, range, totalAcc || total);
             break;
         case 2:
-            conf.showTotal = (total, range) => TOTAL2(total, range, totalAcc, cost);
+            conf.showTotal = (total, range) => TOTAL2(total, range, totalAcc || total, cost);
             break;
         case 3:
-            conf.showTotal = (total, range) => TOTAL3(total, range, totalAcc);
+            conf.showTotal = (total, range) => TOTAL3(total, range, totalAcc || total);
             break;
         default:
-            conf.showTotal = (total, range) => TOTAL1(total, range, totalAcc);
+            conf.showTotal = (total, range) => TOTAL1(total, range, totalAcc || total);
             break;
     }
     return conf;

package/components/_setup/UForm/UFormCOTree.d.ts

@@ -0,0 +1 @@
+export {};

package/components/_setup/UForm/UFormCOTree.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importDefault(require("react"));
+const lodash_1 = __importDefault(require("lodash"));
+const _register_1 = require("../../UForm/_register");
+const COSelect_1 = require("../../Trees/COTree/COSelect");
+const _input_1 = require("../../UForm/_input");
+// CEMS ORG SELECT 
+(0, _register_1.registerFormField)('cems-org', (props) => {
+    const { field, disabled, value, onChange } = props;
+    let params = {
+        placeholder: (0, _input_1.getPlaceholder)(field, true),
+        disabled,
+        allowClear: true,
+        onChange: onChange
+    };
+    if (field.required || field.rules && lodash_1.default.find(field.rules, { required: true }))
+        params.allowClear = false;
+    return react_1.default.createElement(COSelect_1.COSelect, Object.assign({ dataType: field.dataType || 'string' }, params, field.config, { value: value }));
+});

package/components/_setup/UForm/UFormDate.js

@@ -1,9 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
+const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const antd_1 = require("antd");
 const _register_1 = require("../../UForm/_register");
@@ -39,7 +62,14 @@ const DatePick = (props) => {
         if (day.isValid())
             params.value = day;
     }
-    const format = lodash_1.default.has(field.config, 'format') ? field.config.format : (props.showTime ? utils_1.GLOBAL.CONFIG.DATE.DATE_TIME_FORMAT : utils_1.GLOBAL.CONFIG.DATE.DATE_FORMAT);
+    const format = (0, react_1.useMemo)(() => {
+        var _a;
+        if ((_a = field.config) === null || _a === void 0 ? void 0 : _a.format)
+            return field.config.format;
+        if (props.showTime)
+            return utils_1.GLOBAL.CONFIG.DATE.DATE_TIME_FORMAT;
+        return utils_1.GLOBAL.CONFIG.DATE.DATE_FORMAT;
+    }, []);
     return react_1.default.createElement(antd_1.DatePicker, Object.assign({ style: { width: '80%' } }, params, field.config, { showTime: props.showTime, format: format, onChange: day => {
             if (day == null) {
                 onChange(undefined);
@@ -138,12 +168,17 @@ const DatePickRender = (value, data, field, showTime) => {
     let params = { placeholder: (0, _input_1.getPlaceholder)(field, true), disabled, allowClear: true };
     if (field.required || field.rules && lodash_1.default.find(field.rules, { required: true }))
         params.allowClear = false;
+    const format = (0, react_1.useMemo)(() => {
+        var _a;
+        if ((_a = field.config) === null || _a === void 0 ? void 0 : _a.format)
+            return field.config.format;
+        return utils_1.GLOBAL.CONFIG.DATE.TIME_FORMAT;
+    }, []);
     if (value) {
-        let day = (0, dayjs_1.default)(value);
+        let day = (0, dayjs_1.default)(value, format);
         if (day.isValid())
             params.value = day;
     }
-    const format = lodash_1.default.has(field.config, 'format') ? field.config.format : utils_1.GLOBAL.CONFIG.DATE.TIME_FORMAT;
     return react_1.default.createElement(antd_1.TimePicker, Object.assign({ style: { width: '80%' } }, params, field.config, { format: format, onChange: day => {
             if (day == null) {
                 onChange(undefined);
@@ -152,25 +187,68 @@ const DatePickRender = (value, data, field, showTime) => {
                 onChange(day.format(format));
             }
         } }));
-}, {
-    render: (value, data, field) => {
-        if (field.render)
-            return field.render(value, data);
-        if (value == null || value == '')
-            return '';
-        let mnt = (0, dayjs_1.default)(value);
-        if (mnt.isValid()) {
-            const format = lodash_1.default.has(field.config, 'format') ? field.config.format : utils_1.GLOBAL.CONFIG.DATE.TIME_FORMAT;
-            return mnt.format(format);
-        }
-        return '';
-    }
 });
+// 1.5 版本暂无
+// registerFormField('timerange', (props: FormFieldProps) => {
+//     const { field, disabled, value, onChange } = props;
+//     const ptn = useMemo(() => field.field.split(','), [])
+//     const format = useMemo(() => {
+//         if (field.config?.format) return field.config.format;
+//         return GLOBAL.CONFIG.DATE.TIME_FORMAT
+//     }, [])
+//     if (ptn.length != 2) {
+//         console.error('daterange field must hava a start and end, eg: field:"startTime,endTime"')
+//         return <TimePicker value={value} onChange={(val) => onChange(val.format(format))} disabled={disabled} />
+//     }
+//     const [startField, endField] = ptn;
+//     let params: TimeRangePickerProps = { disabled, allowClear: true };
+//     if (field.required || field.rules && _.find(field.rules, { required: true })) params.allowClear = false;
+//     params.value = [undefined, undefined];
+//     if (value) {
+//         if (value[startField]) {
+//             let day = dayjs(value[startField], format);
+//             if (day.isValid()) params.value[0] = day;
+//         }
+//         if (value[endField]) {
+//             let day = dayjs(value[endField], format);
+//             if (day.isValid()) params.value[1] = day;
+//         }
+//     }
+//     return <TimePicker.RangePicker
+//         style={{ width: '80%' }}
+//         {...params}
+//         {...field.config}
+//         format={format}
+//         onChange={([start, end]) => {
+//             if (start && end) {
+//                 onChange({
+//                     [startField]: start.format(format),
+//                     [endField]: end.format(format),
+//                 })
+//             } else {
+//                 onChange({
+//                     [startField]: undefined,
+//                     [endField]: undefined,
+//                 })
+//             }
+//         }}
+//     />
+// }, {
+//     render: (value, data, field) => {
+//         const ptn = field.field.split(',');
+//         if (ptn.length != 2) return '';
+//         const [startField, endField] = ptn;
+//         if (data[startField] && data[endField]) {
+//             return `${data[startField]} - ${data[endField]}`
+//         }
+//         return '';
+//     }
+// });
 const AntdRangePick = (props) => {
     const { field, disabled, value, onChange } = props;
     let ptn = field.field.split(',');
     if (ptn.length != 2) {
-        console.error('timerange field must hava a start and end, eg: field:"startTime,endTime"');
+        console.error('daterange field must hava a start and end, eg: field:"startTime,endTime"');
         return react_1.default.createElement(DatePick, Object.assign({}, props));
     }
     const [startField, endField] = ptn;
@@ -190,9 +268,6 @@ const AntdRangePick = (props) => {
                 params.value[1] = day;
         }
     }
-    // const format = _.has(field.config, 'format') ? field.config.format : (
-    //     props.showTime ? GLOBAL.CONFIG.DATE.DATE_TIME_FORMAT : GLOBAL.CONFIG.DATE.DATE_FORMAT
-    // )
     let format = props.isDate ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss';
     let showTime = !props.isDate;
     if (props.isDate) {
@@ -240,7 +315,7 @@ const DateRangePick = (props) => {
     const { field, disabled, value, onChange, showTime } = props;
     let ptn = field.field.split(',');
     if (ptn.length != 2) {
-        console.error('timerange field must hava a start and end, eg: field:"startTime,endTime"');
+        console.error('daterange field must hava a start and end, eg: field:"startTime,endTime"');
         return react_1.default.createElement(DatePick, Object.assign({}, props));
     }
     const [startField, endField] = ptn;
@@ -291,7 +366,7 @@ const RangePickRender = (value, data, field, showTime) => {
     breakCol: true,
     isMultiple: true
 });
-(0, _register_1.registerFormField)('timerange', (props) => react_1.default.createElement(AntdRangePick, Object.assign({}, props, { isDate: false })), {
+(0, _register_1.registerFormField)('datetimerange', (props) => react_1.default.createElement(AntdRangePick, Object.assign({}, props, { isDate: false })), {
     render: (value, data, field) => RangePickRender(value, data, field, true),
     breakCol: true,
     isMultiple: true
@@ -301,7 +376,7 @@ const RangePickRender = (value, data, field, showTime) => {
     breakCol: true,
     isMultiple: true
 });
-(0, _register_1.registerFormField)('timerange-single', (props) => react_1.default.createElement(DateRangePick, Object.assign({}, props, { showTime: true })), {
+(0, _register_1.registerFormField)('datetimerange-single', (props) => react_1.default.createElement(DateRangePick, Object.assign({}, props, { showTime: true })), {
     render: (value, data, field) => RangePickRender(value, data, field, true),
     breakCol: true,
     isMultiple: true

package/components/_setup/UForm/UFormJSONTable.d.ts

@@ -0,0 +1 @@
+export {};