vap1 0.1.6 → 0.1.8

package/components/_setup/UForm/UFormTree.js

@@ -1,134 +1,99 @@
-// import React from 'react';
-// import _ from 'lodash';
-// import { TreeSelect } from 'antd';
-// import { registerInputType, UFormInput } from 'vap/_common/UForm';
-// import { Option } from 'vap/_common/UForm/interface';
-// import { TreeNode } from 'antd/es/tree-select/interface';
-// import { MULTI_CHOOSE_SHOW } from './Select';
-// const optionToTree = (options: Option[]): TreeNode[] => {
-//     return options.map((item) => {
-//         let result: TreeNode = { value: item.value, title: item.name, disabled: item.disabled };
-//         if (_.isArray(item.children) && item.children.length > 0) {
-//             result.children = optionToTree(item.children)
-//         }
-//         return result;
-//     })
-// }
-// const flatOptionToTree = (options: Option[], parent: string): TreeNode[] => {
-//     return options.map(item => {
-//         let result: TreeNode = { value: item.value, title: item.name };
-//         if (_.isArray(item.children) && item.children.length > 0) {
-//             result.children = optionToTree(item.children)
-//         }
-//         return result;
-//     })
-// }
-// registerInputType('stree-select', class extends UFormInput {
-//     render() {
-//         const { value, field, disabled } = this.props;
-//         let params: any = { disabled, value, showSearch: true, searchPlaceholder: '输入关键字过滤', treeDefaultExpandAll: true }
-//         if (field.rule && _.find(field.rule, { required: true })) {
-//             params.allowClear = false;
-//         }
-//         if (!_.has(field, 'config.treeData')) {
-//             if (_.has(field, 'options')) {
-//                 params.treeData = optionToTree(field.options);
-//             } else {
-//                 params.treeData = []
-//             }
-//         }
-//         return <TreeSelect
-//             dropdownStyle={{ maxHeight: 389 ,overflow:'auto'}}
-//             {...params}
-//             {...field.config}
-//             placeholder={this.getSelectTip()}
-//             multiple={false}
-//             value={value}
-//             treeCheckable={false}
-//             onChange={value => this.onChange(value)}
-//         />
-//     }
-// })
-// registerInputType('dtree-select', class extends UFormInput {
-//     render() {
-//         const { value, field, disabled } = this.props;
-//         let selectKey = [];
-//         if (value) {
-//             selectKey = value.split(',').map(item => item.trim())
-//         }
-//         let params: any = { disabled, value, showSearch: true, searchPlaceholder: '输入关键字过滤', treeDefaultExpandAll: true }
-//         if (field.rule && _.find(field.rule, { required: true })) {
-//             params.allowClear = false;
-//         }
-//         if (!_.has(field, 'config.treeData')) {
-//             if (_.has(field, 'options')) {
-//                 params.treeData = optionToTree(field.options);
-//             } else {
-//                 params.treeData = []
-//             }
-//         }
-//         return <TreeSelect
-//             searchPlaceholder={`输入关键字过滤`}
-//             {...params}
-//             {...field.config}
-//             value={selectKey}
-//             placeholder={this.getSelectTip()}
-//             multiple={true}
-//             treeCheckable
-//             onChange={value => this.onChange((value && (value as string[]).length) ? (value as string[]).join(',') : undefined)}
-//         />
-//     }
-// }, {
-//     show: MULTI_CHOOSE_SHOW
-// })
-// // registerInputType('flat-tree-select', class extends UFormInput {
-// //     render() {
-// //         const { value, field, disabled } = this.props;
-// //         let params: any = { disabled, value, showSearch: true }
-// //         if (field.rule && _.find(field.rule, { required: true })) {
-// //             params.allowClear = false;
-// //         }
-// //         if (!_.has(field, 'config.treeData')) {
-// //             if (_.has(field, 'options')) {
-// //                 params.treeData = flatOptionToTree(field.options);
-// //             } else {
-// //                 params.treeData = []
-// //             }
-// //         }
-// //         return <TreeSelect
-// //             {...params}
-// //             {...field.config}
-// //             placeholder={this.getSelectTip()}
-// //             multiple={false}
-// //             treeCheckable={false}
-// //             onChange={value => this.onChange(value)}
-// //         />
-// //     }
-// // })
-// // registerInputType('multi-flat-tree-select', class extends UFormInput {
-// //     render() {
-// //         const { value, field, disabled } = this.props;
-// //         let selectKey = [];
-// //         if (value) {
-// //             selectKey = value.split(',').map(item => item.trim())
-// //         }
-// //         let params: any = { disabled, value: selectKey, showSearch: true }
-// //         if (field.rule && _.find(field.rule, { required: true })) {
-// //             params.allowClear = false;
-// //         }
-// //         if (!_.has(field, 'config.treeData')) {
-// //             if (_.has(field, 'options')) {
-// //                 params.treeData = flatOptionToTree(field.options);
-// //             } else {
-// //                 params.treeData = []
-// //             }
-// //         }
-// //         return <TreeSelect
-// //             {...params}
-// //             placeholder={this.getSelectTip()}
-// //             multiple={true}
-// //             treeCheckable
-// //             onChange={value => this.onChange((value as string[]).join(','))}
-// //         />
-// //     }
-// // })
+"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 = __importStar(require("react"));
+const lodash_1 = __importDefault(require("lodash"));
+const _register_1 = require("../../UForm/_register");
+const _input_1 = require("../../UForm/_input");
+const STreeSelect_1 = require("../../TreeSelect/STreeSelect");
+const DTreeSelect_1 = require("../../TreeSelect/DTreeSelect");
+const FTreeSelect_1 = require("../../TreeSelect/FTreeSelect");
+(0, _register_1.registerFormField)('stree-select', (props) => {
+    const { field, disabled, value, onChange } = props;
+    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;
+    return react_1.default.createElement(STreeSelect_1.STreeSelect, Object.assign({}, params, field.config, { multiple: false, value: value === null ? undefined : value, onChange: onChange }));
+});
+(0, _register_1.registerFormField)('dtree-select', (props) => {
+    const { field, disabled, value, onChange } = props;
+    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;
+    return react_1.default.createElement(DTreeSelect_1.DTreeSelect, Object.assign({}, params, field.config, { multiple: false, value: value === null ? undefined : value, onChange: onChange }));
+});
+(0, _register_1.registerFormField)('ftree-select', (props) => {
+    const { field, disabled, value, onChange } = props;
+    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;
+    return react_1.default.createElement(FTreeSelect_1.FTreeSelect, Object.assign({}, params, field.config, { multiple: false, value: value === null ? undefined : value, onChange: onChange }));
+});
+const toArr = (value) => (0, react_1.useMemo)(() => {
+    if (value == undefined)
+        return [];
+    if (lodash_1.default.isArray(value))
+        return value;
+    if (lodash_1.default.isString(value))
+        return value.split(',');
+    return [];
+}, [value]);
+const treeChange = (onChange, dataType) => (0, react_1.useCallback)((value) => {
+    if (dataType == 'array') {
+        onChange(value);
+        return;
+    }
+    onChange(value.join(','));
+}, []);
+(0, _register_1.registerFormField)('multi-stree-select', (props) => {
+    const { field, disabled, value, onChange } = props;
+    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 treeValue = toArr(value);
+    const onTreeChange = treeChange(onChange, field.dataType);
+    return react_1.default.createElement(STreeSelect_1.STreeSelect, Object.assign({}, params, field.config, { multiple: true, value: treeValue, onChange: onTreeChange }));
+});
+(0, _register_1.registerFormField)('multi-dtree-select', (props) => {
+    const { field, disabled, value, onChange } = props;
+    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 treeValue = toArr(value);
+    const onTreeChange = treeChange(onChange, field.dataType);
+    return react_1.default.createElement(DTreeSelect_1.DTreeSelect, Object.assign({}, params, field.config, { multiple: true, value: treeValue, onChange: onTreeChange }));
+});
+(0, _register_1.registerFormField)('multi-ftree-select', (props) => {
+    const { field, disabled, value, onChange } = props;
+    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 treeValue = toArr(value);
+    const onTreeChange = treeChange(onChange, field.dataType);
+    return react_1.default.createElement(FTreeSelect_1.FTreeSelect, Object.assign({}, params, field.config, { multiple: true, value: treeValue, onChange: onTreeChange }));
+});

package/index.d.ts

@@ -90,6 +90,9 @@ Checkbox, Switch, DatePicker, TimePicker, Upload, Rate, AutoComplete, Cascader,
  * 应用性组件
 */
 Carousel, Calendar, } from 'antd';
+export { STreeSelect, type STreeSelectProps } from './components/TreeSelect/STreeSelect';
+export { DTreeSelect, type DTreeSelectProps } from './components/TreeSelect/DTreeSelect';
+export { FTreeSelect, type FTreeSelectProps } from './components/TreeSelect/FTreeSelect';
 export { Form } from 'antd';
 export { Table } from './components/_adapt/Table';
 export type { TableProps } from './components/_adapt/Table';

package/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoComplete = exports.Rate = exports.Upload = exports.TimePicker = exports.DatePicker = exports.Switch = exports.Checkbox = exports.Pagination = exports.Timeline = exports.List = exports.Tree = exports.Descriptions = exports.Tag = exports.Alert = exports.Button = exports.Icon = exports.FloatButton = exports.Mentions = exports.Anchor = exports.Affix = exports.BackTop = exports.Avatar = exports.Badge = exports.Statistic = exports.Typography = exports.Progress = exports.Popover = exports.Popconfirm = exports.Tooltip = exports.Dropdown = exports.Drawer = exports.Modal = exports.Col = exports.Row = exports.Space = exports.Layout = exports.Skeleton = exports.Card = exports.Spin = exports.Result = exports.Empty = exports.Divider = exports.Collapse = exports.Tabs = exports.Menu = exports.Breadcrumb = exports.Steps = exports.notification = exports.ConfigProvider = exports.message = void 0;
-exports.PromiseLabel = exports.IAutoComplete = exports.Role = exports.I = exports.CountUp = exports.HighLight = exports.DateRange = exports.Loading = exports.SearchBar = exports.Box = exports.SList = exports.UploadModal = exports.UploadImage = exports.UploadFile = exports.FTree = exports.DTree = exports.STree = exports.TopTableModal = exports.TopTable = exports.STable = exports.ApiTableModal = exports.ApiTable = exports.VTable = exports.UDescriptions = exports.UModal = exports.UInfoModal = exports.UInfo = exports.UFormModal = exports.UForm = exports.UPagination = exports.ColorPicker = exports.Radio = exports.InputNumber = exports.Slider = exports.TreeSelect = exports.Select = exports.Input = exports.Table = exports.Form = exports.Calendar = exports.Carousel = exports.Transfer = exports.Cascader = void 0;
+exports.PromiseLabel = exports.IAutoComplete = exports.Role = exports.I = exports.CountUp = exports.HighLight = exports.DateRange = exports.Loading = exports.SearchBar = exports.Box = exports.SList = exports.UploadModal = exports.UploadImage = exports.UploadFile = exports.FTree = exports.DTree = exports.STree = exports.TopTableModal = exports.TopTable = exports.STable = exports.ApiTableModal = exports.ApiTable = exports.VTable = exports.UDescriptions = exports.UModal = exports.UInfoModal = exports.UInfo = exports.UFormModal = exports.UForm = exports.UPagination = exports.ColorPicker = exports.Radio = exports.InputNumber = exports.Slider = exports.TreeSelect = exports.Select = exports.Input = exports.Table = exports.Form = exports.FTreeSelect = exports.DTreeSelect = exports.STreeSelect = exports.Calendar = exports.Carousel = exports.Transfer = exports.Cascader = void 0;
 /**
  * 基础
 */
@@ -109,6 +109,12 @@ Object.defineProperty(exports, "Transfer", { enumerable: true, get: function ()
 */
 Object.defineProperty(exports, "Carousel", { enumerable: true, get: function () { return antd_5.Carousel; } });
 Object.defineProperty(exports, "Calendar", { enumerable: true, get: function () { return antd_5.Calendar; } });
+var STreeSelect_1 = require("./components/TreeSelect/STreeSelect");
+Object.defineProperty(exports, "STreeSelect", { enumerable: true, get: function () { return STreeSelect_1.STreeSelect; } });
+var DTreeSelect_1 = require("./components/TreeSelect/DTreeSelect");
+Object.defineProperty(exports, "DTreeSelect", { enumerable: true, get: function () { return DTreeSelect_1.DTreeSelect; } });
+var FTreeSelect_1 = require("./components/TreeSelect/FTreeSelect");
+Object.defineProperty(exports, "FTreeSelect", { enumerable: true, get: function () { return FTreeSelect_1.FTreeSelect; } });
 var antd_6 = require("antd");
 Object.defineProperty(exports, "Form", { enumerable: true, get: function () { return antd_6.Form; } });
 // export { Form } from './components/_adapt/Form'

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.1.6","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.1.8","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}

package/utils/Global.d.ts

@@ -159,6 +159,10 @@ export type GlobalSetting = {
          * 表单大小 ，说明： 1.5 版本无效
         */
         SIZE: any;
+        /**
+         * 使用 Drawer 代替 Modal，暂不支持
+        */
+        USE_DRAWER: boolean;
         /**
          * UFormModal 点击弹框外蒙层区域时，允许自动关闭
          * 默认是 true

package/utils/Global.js

@@ -85,6 +85,7 @@ const DEFAULT = {
     },
     FORM: {
         SIZE: 'small',
+        USE_DRAWER: false,
         maskClosable: false,
         ILLEGAL_CHAR_VALIDATE: true,
         ILLEGAL_CHAR_REGEXP: /[\'"#$?：!！？%￥&^*]/im,

package/utils/TreeUtil.d.ts

@@ -22,7 +22,8 @@ export type BaseTreeOpts = {
     */
     sortField?: string;
     /**
-    * 父节点
+    * 父节点字段
+    * 说明：相关树组件中 isFlat = true 时，此值必传
     */
     parentField?: string;
     /**