vap1 0.2.4 → 0.2.5

package/components/UForm/index.d.ts

@@ -24,6 +24,7 @@ export type GroupType = 'default' | 'tabs' | 'collapse';
 export type LinkValue = string | number | boolean;
 import type { _FieldType } from './_FieldType';
 import type { SizeType } from '../_adapt/_Antd5';
+import type { TableColumn } from '../Tables';
 /**
  * 联动结果 ： 改变目标字段的交互属性
  * 所有属性为可选，需要改变几项属性，则只返回包含几个属性的对象，
@@ -193,6 +194,10 @@ export type UFormField = BaseItem & {
      * 回显方法
     */
     render?: (txt: any, obj?: any) => React.ReactNode;
+    /**
+     * 字段选项，适用于 `table` `json-table` 等
+     */
+    columns?: TableColumn[];
 };
 export type UFormFieldGroup = BaseItem & {
     /**

package/components/_adapt/Layout.js

@@ -93,7 +93,7 @@ var antd_1 = require("antd");
 var BasicLayout = /** @class */ (function (_super) {
     __extends(BasicLayout, _super);
     function BasicLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super.apply(this, __spreadArray([], __read(arguments), false)) || this;
         _this.state = { siders: [] };
         return _this;
     }

package/package.json

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

package/uform/FormEditor.js

@@ -87,7 +87,7 @@ var FormEditor = function (props) {
                         react_1.default.createElement(index_1.Button.Group, { style: { float: 'right', marginRight: 6, display: 'block' } },
                             editor.form.isGroup && react_1.default.createElement(index_1.Button, { icon: "plus", onClick: function () { return editor.addGroup(); } }, "\u6DFB\u52A0\u5206\u7EC4"),
                             react_1.default.createElement(index_1.Button, { icon: 'eye', type: "primary", onClick: function () {
-                                    if (schema.fields && schema.fields.length > 1) {
+                                    if (editor.form.fields && editor.form.fields.length > 0) {
                                         setOpen(true);
                                     }
                                     else {

package/uform/inputs/register.d.ts

@@ -1,6 +1,13 @@
 /// <reference types="react" />
 import type { FormItem } from '../schema';
 import type { PlainObject } from '../../basetype';
+export type CustomConfig = {
+    label: string;
+    key: string;
+    type: string;
+    defaultValue?: any;
+    options?: PlainObject;
+};
 export type FormInput = {
     title: string;
     type: string;
@@ -13,6 +20,7 @@ export type FormInput = {
     defaultProperties?: PlainObject;
     defaultConfig?: PlainObject;
     defaultPlaceholder?: string;
+    customConfig?: CustomConfig[];
 };
 type FormGroup = {
     title: string;

package/uform/panel/Propreties/_ItemBase.js

@@ -10,17 +10,49 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
 var index_1 = require("../../../index");
+var index_2 = require("../../../index");
 var plugins_1 = require("../../plugins");
 var FieldPlugin_1 = require("./Component/FieldPlugin");
 var OptionTable_1 = require("./Component/OptionTable");
+var _register_1 = require("../../../components/UForm/_register");
 exports.default = (function (props) {
+    var _a, _b;
     var setFieldProperties = props.setFieldProperties, field = props.field, input = props.input, baseSpan = props.baseSpan;
+    var config = field.config || {};
+    var setConfig = function (key, value) {
+        config[key] = value;
+        setFieldProperties('config', config);
+    };
+    var renderCustomConfig = function (item) {
+        var element = (0, _register_1.getUFormInput)(item.type).component;
+        return (0, react_1.createElement)(element, __assign(__assign({}, item), { field: item.type, title: '' }));
+    };
     return react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(index_1.Form.Item, { label: "\u5B57\u6BB5\u540D", required: true },
             react_1.default.createElement(index_1.Input, { size: 'small', value: field.field, onChange: function (evt) { return setFieldProperties('field', evt.target.value); } })),
@@ -41,5 +73,13 @@ exports.default = (function (props) {
         input.fieldCount == null && react_1.default.createElement(index_1.Form.Item, { label: "\u9ED8\u8BA4\u503C" },
             react_1.default.createElement(index_1.Input, { size: 'small', placeholder: '\u8F93\u5165\u53D6\u503C', value: field._default, onChange: function (evt) { return setFieldProperties('_default', evt.target.value); } })),
         input.hasOption && react_1.default.createElement(OptionTable_1.OptionTable, __assign({}, props)),
+        ((_a = field.customConfig) === null || _a === void 0 ? void 0 : _a.length) > 0 && react_1.default.createElement(index_2.Divider, { orientation: "left" }, "\u81EA\u5B9A\u4E49\u5C5E\u6027"),
+        ((_b = field.customConfig) === null || _b === void 0 ? void 0 : _b.length) > 0 && field.customConfig.map(function (item) {
+            var value = config[item.key] || item.defaultValue || null;
+            var onChange = function (v) {
+                setConfig(item.key, v);
+            };
+            return react_1.default.createElement(index_1.Form.Item, { label: item.label }, renderCustomConfig(__assign(__assign({}, item), { value: value, onChange: onChange })));
+        }),
         react_1.default.createElement(FieldPlugin_1.FieldPlugin, __assign({}, props, { slot: plugins_1.PluginSlot.FIELD_BASE })));
 });

package/uform/schema.d.ts

@@ -1,4 +1,5 @@
 import type { GroupType, UFormLayout, UFormField, UFromProps } from '../components/UForm';
+import type { CustomConfig } from './inputs/register';
 export type Template = string;
 export type SyncMethod = {
     param: Template;
@@ -48,7 +49,7 @@ export type Link = FunctionCode & {
  * 说明：为了保证兼容性，所有字段尽量与VAP UFormField 一致。以保证 schema Json 可以支持使用。
  * 如果有 点 _开头的属性，说明需要使用转换工具进行转换
 */
-export type FormItem = Pick<UFormField, 'field' | 'title' | 'span' | 'placeholder' | 'roleCode' | 'ik' | 'required' | 'tip' | 'extra' | 'help' | 'options' | 'ignore' | 'show' | 'disabled' | 'config'> & {
+export type FormItem = Pick<UFormField, 'field' | 'title' | 'span' | 'placeholder' | 'roleCode' | 'ik' | 'required' | 'tip' | 'extra' | 'help' | 'options' | 'ignore' | 'show' | 'disabled' | 'config' | 'columns'> & {
     /**
      * itemId 唯一标识
      * */
@@ -85,6 +86,10 @@ export type FormItem = Pick<UFormField, 'field' | 'title' | 'span' | 'placeholde
      * 是否为数字
     */
     _isNumber?: boolean;
+    /**
+     * 扩展其它属性
+    */
+    customConfig?: CustomConfig[];
 };
 export type FormGroup = {
     id: string;

package/uform/utils/arr.js

@@ -59,6 +59,7 @@ var insertFieldInList = function (field, list, pos) {
 };
 // 插入一个字段到列表指定位置
 var insertInList = function (fieldType, list, pos) {
+    var _a;
     if (pos === void 0) { pos = null; }
     var info = (0, inputs_1.getInput)(fieldType);
     if (info == null) {
@@ -73,6 +74,8 @@ var insertInList = function (fieldType, list, pos) {
         field.config = lodash_1.default.assign({}, info.defaultConfig);
     if (info.fieldCount && info.fieldCount > 1)
         field.field = lodash_1.default.range(info.fieldCount).map(utils_1.StringUtil.genKey).join(',');
+    if (((_a = info.customConfig) === null || _a === void 0 ? void 0 : _a.length) > 0)
+        field.customConfig = info.customConfig;
     if (info.hasOption) {
         field.options = [];
         if (field.type == 'switch') {

package/utils/_Support.d.ts

@@ -4,8 +4,8 @@
 type GLOBAL_KEY = '_V_APPACTION' | 'useApp' | '_V_STATE' | '_V_GLOBAL' | '_V_I18N' | '_V_DICT' | '_VAP' | 'NProgress' | 'echarts' | '_C_SELECT_BAR' | '_C_SEARCH_FIELD' | '_C_FORM_FIELD';
 export declare var getGlobal: () => any;
 export declare enum Language {
-    ZH_CN = "zh-CN",
-    ZH_HK = "zh-HK",
+    ZH_CN = "zh-CN",// 简体中文
+    ZH_HK = "zh-HK",// 繁體中文
     EN_US = "en-US"
 }
 export declare const globalDefault: <T>(key: GLOBAL_KEY, init: T) => T;

package/utils/screenful.js

@@ -30,8 +30,8 @@ var __read = (this && this.__read) || function (o, n) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var METHOD_MAP = [
     ['requestFullscreen', 'exitFullscreen', 'fullscreenElement', 'fullscreenEnabled', 'fullscreenchange', 'fullscreenerror',],
-    ['webkitRequestFullscreen', 'webkitExitFullscreen', 'webkitFullscreenElement', 'webkitFullscreenEnabled', 'webkitfullscreenchange', 'webkitfullscreenerror',],
-    ['webkitRequestFullScreen', 'webkitCancelFullScreen', 'webkitCurrentFullScreenElement', 'webkitCancelFullScreen', 'webkitfullscreenchange', 'webkitfullscreenerror',],
+    ['webkitRequestFullscreen', 'webkitExitFullscreen', 'webkitFullscreenElement', 'webkitFullscreenEnabled', 'webkitfullscreenchange', 'webkitfullscreenerror',], // New WebKit
+    ['webkitRequestFullScreen', 'webkitCancelFullScreen', 'webkitCurrentFullScreenElement', 'webkitCancelFullScreen', 'webkitfullscreenchange', 'webkitfullscreenerror',], // Old WebKit
     ['mozRequestFullScreen', 'mozCancelFullScreen', 'mozFullScreenElement', 'mozFullScreenEnabled', 'mozfullscreenchange', 'mozfullscreenerror',],
     ['msRequestFullscreen', 'msExitFullscreen', 'msFullscreenElement', 'msFullscreenEnabled', 'MSFullscreenChange', 'MSFullscreenError',],
 ];