vap1 0.3.8 → 0.4.0

package/deps/editor/EditorModal.js

@@ -77,7 +77,7 @@ var _EditorModal = function (props) {
     }, []);
     return react_1.default.createElement(index_1.Modal, { open: props.open, maskClosable: false, 
         // onCancel={props.onCancel}
-        title: props.title, width: props.width || 960, afterClose: props.afterClose, bodyStyle: { width: '100%', height: 480, padding: 0 } },
+        title: props.title, width: props.width || 960, afterClose: props.afterClose, bodyStyle: { width: '100%', height: 480, padding: 0 }, onOk: onOk, onCancel: props.onCancel },
         react_1.default.createElement(Editor_1.Editor, { value: props.data, ref: editorRef }));
 };
 var EditorModal = function (props) {

package/deps/editor/support/buttons/ImageButton.js

@@ -41,9 +41,7 @@ exports.insertImage = insertImage;
 var UploadImageModal = function (_a) {
     var open = _a.open, onCancel = _a.onCancel, onOk = _a.onOk, value = _a.value;
     var currentUrl = (0, react_1.useRef)();
-    return react_1.default.createElement(index_1.Modal, { width: 640, 
-        // styles={{ body: { padding: 0, height: 400 } }}
-        bodyStyle: { padding: 0, height: 500 }, title: "\u4E0A\u4F20\u56FE\u7247", open: open, onCancel: onCancel, onOk: function () {
+    return react_1.default.createElement(index_1.Modal, { width: 640, bodyStyle: { padding: 0, height: 400 }, title: "\u4E0A\u4F20\u56FE\u7247", open: open, onCancel: onCancel, onOk: function () {
             if (currentUrl.current == null) {
                 index_1.message.error('请上传图片');
                 return;

package/deps/editor/support/element/ImageElement.js

@@ -20,71 +20,29 @@ var index_1 = require("../../../../index");
 var slate_react_1 = require("slate-react");
 var slate_1 = require("slate");
 var slate_react_2 = require("slate-react");
-// type ImageProps = {}
+var UploadImage_1 = require("../../../../components/Upload/UploadImage");
 var ImageView = function (_a) {
     var attributes = _a.attributes, children = _a.children, element = _a.element;
-    return react_1.default.createElement("div", null);
+    return react_1.default.createElement("div", __assign({}, attributes, { className: 'sv-img' }),
+        react_1.default.createElement("img", { src: (0, UploadImage_1.getImageUrl)(element.url) }));
 };
 var ImageEdit = function (_a) {
     var attributes = _a.attributes, children = _a.children, element = _a.element;
     var editor = (0, slate_react_1.useSlateStatic)();
     var path = slate_react_1.ReactEditor.findPath(editor, element);
-    // console.log(element, attributes)
-    // if(element)
     var selected = (0, slate_react_2.useSelected)();
-    // const focused = useFocused()
     return react_1.default.createElement("div", __assign({}, attributes, { className: 'sv-img' + (selected ? ' se-del' : '') }),
         children,
         react_1.default.createElement("div", { contentEditable: false, className: 'sv-img-content' + (element.align ? (' sv-img-' + element.align) : '') },
             selected && react_1.default.createElement(index_1.Button, { danger: true, type: 'primary', onClick: function () { return slate_1.Transforms.removeNodes(editor, { at: path }); }, size: "small" }, "\u5220\u9664"),
-            react_1.default.createElement("img", { src: element.url })));
+            react_1.default.createElement("img", { src: (0, UploadImage_1.getImageUrl)(element.url) })));
 };
-// const ImageEdit =  ({ attributes, children, element }) => {
-//     const editor = useSlateStatic()
-//     const path = ReactEditor.findPath(editor, element)
-//     const selected = useSelected()
-//     const focused = useFocused()
-//     return (
-//       <div {...attributes}>
-//         {children}
-//         <div
-//           contentEditable={false}
-//           className={css`
-//             position: relative;
-//           `}
-//         >
-//           <img
-//             src={element.url}
-//             className={css`
-//               display: block;
-//               max-width: 100%;
-//               max-height: 20em;
-//               box-shadow: ${selected && focused ? '0 0 0 3px #B4D5FF' : 'none'};
-//             `}
-//           />
-//           <Button
-//             active
-//             onClick={() => Transforms.removeNodes(editor, { at: path })}
-//             className={css`
-//               display: ${selected && focused ? 'inline' : 'none'};
-//               position: absolute;
-//               top: 0.5em;
-//               left: 0.5em;
-//               background-color: white;
-//             `}
-//           >
-//             <Icon>delete</Icon>
-//           </Button>
-//         </div>
-//       </div>
-// }
 var Image = function (props) {
     if (props.isEditor)
         return react_1.default.createElement(ImageEdit, __assign({}, props));
     return react_1.default.createElement(ImageView, __assign({}, props));
     // const editor = useSlateStatic()
     // const path = ReactEditor.findPath(editor, element)
-    // // console.log(path)
     // // const selected = useSelected()
     // // const focused = useFocused()
     // return <div {...attributes}>

package/deps/editor/support/element/_Element.js

@@ -49,7 +49,6 @@ var Element = function (props) {
         case 'audio':
             // return <div style={{ color: 'red' }}>视频还不支持</div>
             return react_1.default.createElement("div", { style: { color: 'red' } }, "\u6682\u4E0D\u652F\u6301");
-        // return <Image {...props} style={style} isEditor={props.isEditor} />
         default:
             return react_1.default.createElement("p", __assign({ style: style }, attributes), children);
     }

package/deps/editor/support/index.js

@@ -28,7 +28,6 @@ var VOID_SET = new Set(['image', 'video', 'audio']);
 var supportAdvance = function (editor) {
     var insertData = editor.insertData, isVoid = editor.isVoid;
     editor.isVoid = function (element) {
-        // console.log(element.type, VOID_SET.has(element.type))
         if (VOID_SET.has(element.type))
             return true;
         return isVoid(element);
@@ -63,8 +62,6 @@ var supportAdvance = function (editor) {
     return editor;
     // editor.insertData = data => {
     //     const text = data.getData('text/plain')
-    //     console.log('insert', data);
-    //     console.log('text', text);
     //     const { files } = data
     //     if (files && files.length > 0) {
     //         for (const file of files) {

package/deps/editor/tools/_TxtButton.js

@@ -37,7 +37,6 @@ var slate_react_1 = require("slate-react");
 var utils_1 = require("../utils");
 var utils_2 = require("../../../utils");
 var index_1 = require("../../../index");
-// import { UFormModal } from '../../../components/UForm';
 var Icon_1 = require("../../../components/_adapt/Icon");
 var useToggle_1 = require("../../../hooks/useToggle");
 var markValue = function (editor, cmd) {
@@ -91,9 +90,7 @@ var FontFamily = function (_a) {
     var editor = (0, slate_react_1.useSlate)();
     var value = markValue(editor, cmd) || undefined;
     var notSelected = ((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.focus.offset) == ((_c = editor.selection) === null || _c === void 0 ? void 0 : _c.anchor.offset);
-    return react_1.default.createElement(index_1.Select, { size: 'small', value: value, disabled: value === undefined && notSelected, style: { width: 72, marginRight: 6 }, placeholder: "\u5B57\u4F53", 
-        // onClick={(evt) => PageUtil.stopEvent(evt)}
-        onChange: function (val) {
+    return react_1.default.createElement(index_1.Select, { size: 'small', value: value, disabled: value === undefined && notSelected, style: { width: 72, marginRight: 6 }, placeholder: "\u5B57\u4F53", onChange: function (val) {
             if (val == 0) {
                 setValue(editor, cmd, null);
             }
@@ -121,8 +118,13 @@ var FontSize = function (_a) {
     if (disabled || (((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.focus.offset) == ((_c = editor.selection) === null || _c === void 0 ? void 0 : _c.anchor.offset))) {
         clazz.push('se-icon-disabled');
     }
-    return react_1.default.createElement(index_1.Popover, { placement: "bottomLeft", content: react_1.default.createElement("div", { style: { width: 240, }, onClick: utils_2.PageUtil.stopEvent },
-            react_1.default.createElement(index_1.Slider, { value: value, min: 12, max: 60, onChange: function (val) { return setValue(editor, cmd, val); } })) },
+    return react_1.default.createElement(index_1.Popover, { placement: "bottomLeft", content: react_1.default.createElement("div", { style: { width: 300, } },
+            react_1.default.createElement(index_1.Slider, { value: value, min: 12, max: 60, onChange: function (val) { return setValue(editor, cmd, val); } }),
+            react_1.default.createElement("div", { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-around' } },
+                react_1.default.createElement(index_1.Tag, { color: "lime", style: { fontSize: 14, marginRight: 0, lineHeight: 'unset', cursor: 'pointer' }, onClick: function () { return setValue(editor, cmd, 12); } }, "12px"),
+                react_1.default.createElement(index_1.Tag, { color: "cyan", style: { fontSize: 16, marginRight: 0, lineHeight: 'unset', cursor: 'pointer' }, onClick: function () { return setValue(editor, cmd, 16); } }, "16px"),
+                react_1.default.createElement(index_1.Tag, { color: "geekblue", style: { fontSize: 24, marginRight: 0, lineHeight: 'unset', cursor: 'pointer' }, onClick: function () { return setValue(editor, cmd, 24); } }, "24px"),
+                react_1.default.createElement(index_1.Tag, { color: "purple", style: { fontSize: 36, marginRight: 0, lineHeight: 'unset', cursor: 'pointer' }, onClick: function () { return setValue(editor, cmd, 36); } }, "36px"))) },
         react_1.default.createElement("span", { className: clazz.join(' ') },
             "\u5B57\u53F7 : ",
             react_1.default.createElement("b", { className: 'vapfont' },
@@ -175,8 +177,9 @@ var Color = function (_a) {
     var icon = _a.icon, ik = _a.ik, cmd = _a.cmd, disabled = _a.disabled;
     var editor = (0, slate_react_1.useSlate)();
     var value = markValue(editor, cmd);
+    var isDisabled = disabled || (((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.focus.offset) == ((_c = editor.selection) === null || _c === void 0 ? void 0 : _c.anchor.offset));
     var clazz = ['se-icon', 'se-icon-mark', 'vicon', 'vicon-' + icon];
-    if (disabled || (((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.focus.offset) == ((_c = editor.selection) === null || _c === void 0 ? void 0 : _c.anchor.offset))) {
+    if (isDisabled) {
         clazz.push('se-icon-disabled');
     }
     var style = {};
@@ -184,7 +187,7 @@ var Color = function (_a) {
         style.color = value;
         style.fontWeight = 'bold';
     }
-    return react_1.default.createElement(index_1.ColorPicker, __assign({}, colorProps, { onChange: function (val, hex) { return setValue(editor, cmd, hex); } }),
+    return react_1.default.createElement(index_1.ColorPicker, __assign({}, colorProps, { disabled: isDisabled, value: value, onChange: function (val, hex) { return setValue(editor, cmd, hex); } }),
         react_1.default.createElement("span", { className: clazz.join(' '), style: style }));
 };
 exports.Color = Color;
@@ -194,14 +197,15 @@ var BgColor = function (_a) {
     var editor = (0, slate_react_1.useSlate)();
     var value = markValue(editor, cmd);
     var clazz = ['se-icon', 'se-icon-mark', 'vicon', 'vicon-' + icon];
-    if (disabled || (((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.focus.offset) == ((_c = editor.selection) === null || _c === void 0 ? void 0 : _c.anchor.offset))) {
+    var isDisabled = disabled || (((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.focus.offset) == ((_c = editor.selection) === null || _c === void 0 ? void 0 : _c.anchor.offset));
+    if (isDisabled) {
         clazz.push('se-icon-disabled');
     }
     var style = {};
     if (value) {
         style.backgroundColor = value;
     }
-    return react_1.default.createElement(index_1.ColorPicker, __assign({}, colorProps, { onChange: function (val, hex) { return setValue(editor, cmd, hex); } }),
+    return react_1.default.createElement(index_1.ColorPicker, __assign({}, colorProps, { disabled: isDisabled, value: value, onChange: function (val, hex) { return setValue(editor, cmd, hex); } }),
         react_1.default.createElement("span", { className: clazz.join(' '), style: style }));
 };
 exports.BgColor = BgColor;

package/package.json

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

package/screen/Page.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = void 0;
 var react_1 = __importStar(require("react"));
 var antd_1 = require("antd");
-// @ts-ignore
+// @ts-ignore : 全局
 var zh_CN = antd.locales.zh_CN;
 antd_1.Empty.defaultProps = { image: '/images/empty-insight.png' };
 var resize = function () {

package/uform/hooks/useEditor.js

@@ -84,9 +84,7 @@ var useFormEditor = function (dataJson, fixFields) {
     // 添加字段
     var addFixedField = function (field, temPosition, groupId) {
         if (groupId) {
-            //     setFields(insertInGroup(type, fields as FormGroup[], groupId, temPosition))
-            // } else {
-            //     setFields(insertInList(type, fields as FormItem[], temPosition))
+            setFields((0, arr_1.insertInGroup)(field.type, fields, groupId, temPosition));
         }
         else {
             setFields((0, arr_1.insertInList)(field.type, fields, temPosition, field));

package/utils/ArrayUtil.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -19,7 +30,7 @@ var update = function (list, data, rowKey) {
     param[rowKey] = data[rowKey];
     var index = lodash_1.default.findIndex(arr, param);
     if (index >= 0) {
-        var obj = lodash_1.default.assign({}, data);
+        var obj = lodash_1.default.assign({}, __assign({}, arr[index]), data);
         arr[index] = obj;
     }
     return arr;

package/utils/PageUtil.js

@@ -118,11 +118,18 @@ exports.resolveURL = len == 0 ? DEFAULT_RESOLVER : function (url) {
 /**
  * 兼容二级目录-恢复URL
 */
-exports.clearURL = len == 0 ? DEFAULT_RESOLVER : function (url) {
-    if (!url.startsWith(window.APP_ROOT))
-        return url;
-    return url.substring(len);
+var clearURL = function (url) {
+    var result = url || '';
+    var idx = result.indexOf('?');
+    if (result.indexOf('?') >= 0)
+        result = result.substring(0, idx);
+    if (len == 0)
+        return result;
+    if (!result.startsWith(window.APP_ROOT))
+        return result;
+    return result.substring(len);
 };
+exports.clearURL = clearURL;
 var GLOBAL_APPS = new Map();
 /**
  *  获取当前 APP 名称