@jetlinks-web/components 2.6.11 → 3.0.0-rc

package/lib/components.js

@@ -101,12 +101,6 @@ Object.defineProperty(exports, "Markdown", {
     return _Markdown.default;
   }
 });
-Object.defineProperty(exports, "MonacoEditor", {
-  enumerable: true,
-  get: function get() {
-    return _MonacoEditor.default;
-  }
-});
 Object.defineProperty(exports, "PageContainer", {
   enumerable: true,
   get: function get() {
@@ -171,7 +165,6 @@ var _Ellipsis = _interopRequireDefault(require("./Ellipsis"));
 var _Empty = _interopRequireDefault(require("./Empty"));
 var _FullPage = _interopRequireDefault(require("./FullPage"));
 var _Icon = _interopRequireDefault(require("./Icon"));
-var _MonacoEditor = _interopRequireDefault(require("./MonacoEditor"));
 var _PermissionButton = _interopRequireDefault(require("./PermissionButton"));
 var _ProLayout = _interopRequireWildcard(require("./ProLayout"));
 var _ProTable = _interopRequireDefault(require("./ProTable"));

package/lib/style/components.less

@@ -4,7 +4,6 @@
 @import "../EditTable/style/index-pure.less";
 @import "../Ellipsis/style/index-pure.less";
 @import "../FlameGraph/style/index-pure.less";
-@import "../MonacoEditor/style/index-pure.less";
 @import "../RadioButton/style/index-pure.less";
 @import "../Scrollbar/style/index-pure.less";
 @import "../Title/style/index-pure.less";

package/lib/style/index.css

@@ -4858,9 +4858,9 @@ span.ant-radio + * {
 }
 .jetlinks-edit-table-wrapper .jetlinks-edit-table .jetlinks-table-horizontal-scroll {
   width: 100%;
-  height: 10px;
-  min-height: 10px;
-  max-height: 10px;
+  height: 15px;
+  min-height: 15px;
+  max-height: 15px;
   display: flex;
 }
 .jetlinks-edit-table-wrapper .jetlinks-edit-table .jetlinks-table-horizontal-scroll .jetlinks-table-horizontal-scroll-bar {
@@ -4892,6 +4892,7 @@ span.ant-radio + * {
 }
 .jetlinks-edit-table-body-viewport .jetlinks-edit-table-center .jetlinks-edit-table-row {
   width: 100%;
+  display: flex;
   align-items: center;
   transition: top 0.2s, height 0.2s, background-color 0.1s;
   border-bottom: 1px solid #ebebeb;
@@ -5088,10 +5089,6 @@ span.ant-radio + * {
   height: 100%;
   overflow-x: hidden;
 }
-.j-monaco-editor {
-  min-height: 50px;
-  height: 100%;
-}
 .j-scrollbar {
   overflow: hidden;
   position: relative;

package/lib/style/index.less

@@ -7,7 +7,6 @@
 @import '../CardSelect/style/index.less';
 @import '../DragModal/style/index.less';
 @import "../EditTable/style/index.less";
-@import "../MonacoEditor/style/index.less";
 @import '../Scrollbar/style/index.less';
 @import '../Title/style/index.less';
 @import '../RadioButton/style/index.less';

package/lib/style.js

@@ -8,7 +8,6 @@ require("./Search/style");
 require("./CardSelect/style");
 require("./DragModal/style");
 require("./EditTable/style");
-require("./MonacoEditor/style");
 require("./Scrollbar/style");
 require("./Title/style");
 require("./RadioButton/style");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.6.11",
+  "version": "3.0.0-rc",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -158,9 +158,9 @@
     "webpack-dev-server": "^4.0.0",
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
-    "@jetlinks-web/utils": "^1.2.9",
-    "@jetlinks-web/hooks": "^1.0.25",
-    "@jetlinks-web/constants": "^1.0.9"
+    "@jetlinks-web/constants": "^1.0.9",
+    "@jetlinks-web/hooks": "^1.0.28",
+    "@jetlinks-web/utils": "^1.2.12"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/es/MonacoEditor/Monaco.js

@@ -1,242 +0,0 @@
-function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) {
-    const op = ops[i];
-    const fn = ops[i + 1];
-    i += 2;
-    if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) {
-        return undefined;
-    }
-    if (op === 'access' || op === 'optionalAccess') {
-        lastAccessLHS = value;
-        value = fn(value);
-    }
-    else if (op === 'call' || op === 'optionalCall') {
-        value = fn((...args) => value.call(lastAccessLHS, ...args));
-        lastAccessLHS = undefined;
-    }
-} return value; }
-/* Analyzed bindings: {
-  "modelValue": "props",
-  "theme": "props",
-  "language": "props",
-  "codeTips": "props",
-  "init": "props",
-  "registrationTips": "props",
-  "registrationTypescript": "props",
-  "blurFormat": "props",
-  "readOnly": "props",
-  "options": "props",
-  "ref": "setup-const",
-  "onMounted": "setup-const",
-  "watch": "setup-const",
-  "onUnmounted": "setup-const",
-  "toRaw": "setup-const",
-  "nextTick": "setup-const",
-  "monaco": "setup-const",
-  "omit": "setup-maybe-ref",
-  "props": "setup-reactive-const",
-  "emit": "setup-const",
-  "dom": "setup-ref",
-  "instance": "setup-let",
-  "monacoProviderRef": "setup-ref",
-  "monacoTypescriptProviderRef": "setup-ref",
-  "handleSuggestions": "setup-const",
-  "disposeRegister": "setup-const",
-  "registerCompletionItemProvider": "setup-const",
-  "disposeTypescript": "setup-const",
-  "registerTypescript": "setup-const",
-  "editorFormat": "setup-const",
-  "insert": "setup-const"
-} */
-import { openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { ref, onMounted, watch, onUnmounted, nextTick } from 'vue';
-import * as monaco from 'monaco-editor';
-import { omit } from 'lodash-es';
-const __sfc_main__ = Object.assign({
-    name: 'JMonacoEditor'
-}, {
-    props: {
-        modelValue: [String, Number],
-        theme: { type: String, default: 'vs-dark' },
-        language: { type: String, default: 'json' },
-        codeTips: { type: Array, default: () => [] },
-        init: { type: Function, default: undefined },
-        registrationTips: { type: Object, default: () => ({}) },
-        registrationTypescript: { type: Object, default: () => ({}) },
-        blurFormat: { type: Boolean, default: true },
-        readOnly: { type: Boolean, default: false },
-        options: { type: Object, default: () => ({}) },
-    },
-    emits: [
-        'update:modelValue',
-        'blur',
-        'focus',
-        'change',
-        'errorChange',
-    ],
-    setup(__props, { expose: __expose, emit: __emit }) {
-        const props = __props;
-        const emit = __emit;
-        const dom = ref();
-        let instance;
-        const monacoProviderRef = ref();
-        const monacoTypescriptProviderRef = ref();
-        // codeTipItem.dispose() // 销毁自定义提示
-        const handleSuggestions = (suggestions, range) => {
-            return Array.isArray(suggestions)
-                ? suggestions.map((item) => ({ ...item, range }))
-                : [];
-        };
-        const disposeRegister = () => {
-            _optionalChain([monacoProviderRef, 'access', _ => _.value, 'optionalAccess', _2 => _2.dispose, 'call', _3 => _3()]);
-            monacoProviderRef.value = null;
-        };
-        /**
-         * 代码提示注册
-         */
-        const registerCompletionItemProvider = () => {
-            disposeRegister();
-            if (monaco.languages && _optionalChain([props, 'access', _4 => _4.registrationTips, 'optionalAccess', _5 => _5.suggestions])) {
-                const { name, suggestions } = props.registrationTips;
-                monacoProviderRef.value =
-                    monaco.languages.registerCompletionItemProvider(name || 'json', {
-                        provideCompletionItems: function (model, position) {
-                            const word = model.getWordUntilPosition(position); // 获取提示代码范围位置
-                            const range = {
-                                startLineNumber: position.lineNumber,
-                                endLineNumber: position.lineNumber,
-                                startColumn: word.startColumn,
-                                endColumn: word.endColumn,
-                            };
-                            return {
-                                suggestions: handleSuggestions(suggestions, range),
-                            };
-                        },
-                    });
-            }
-        };
-        const disposeTypescript = () => {
-            _optionalChain([monacoTypescriptProviderRef, 'access', _6 => _6.value, 'optionalAccess', _7 => _7.dispose, 'call', _8 => _8()]);
-            monacoTypescriptProviderRef.value = null;
-        };
-        const registerTypescript = () => {
-            disposeTypescript();
-            if (monaco.languages && _optionalChain([props, 'access', _9 => _9.registrationTypescript, 'optionalAccess', _10 => _10.typescript])) {
-                const { name, typescript } = props.registrationTypescript;
-                monacoTypescriptProviderRef.value =
-                    monaco.languages.typescript.javascriptDefaults.addExtraLib(typescript);
-            }
-        };
-        /**
-         * 代码格式化
-         */
-        const editorFormat = () => {
-            if (!instance)
-                return;
-            setTimeout(() => {
-                _optionalChain([instance, 'access', _11 => _11.getAction, 'call', _12 => _12('editor.action.formatDocument'), 'optionalAccess', _13 => _13.run, 'call', _14 => _14()]);
-            }, 300);
-            if (props.hasOwnProperty('readOnly')) {
-                setTimeout(() => {
-                    instance.updateOptions({
-                        readOnly: props.readOnly !== false,
-                    });
-                }, 400);
-            }
-        };
-        monaco.editor.onDidChangeMarkers(([uri]) => {
-            const markers = monaco.editor.getModelMarkers({ resource: uri });
-            emit('errorChange', markers);
-        });
-        onMounted(async () => {
-            const _model = monaco.editor.createModel(props.modelValue, props.language);
-            instance = monaco.editor.create(dom.value, {
-                model: _model,
-                tabSize: 2,
-                automaticLayout: true,
-                scrollBeyondLastLine: false,
-                theme: props.theme,
-                formatOnPaste: true,
-                ...(omit(props.options, ['readOnly']) || {}),
-            });
-            instance.onDidChangeModelContent(() => {
-                //
-                const value = instance.getValue();
-                nextTick(() => {
-                    emit('update:modelValue', value);
-                    emit('change', value);
-                });
-            });
-            instance.onDidBlurEditorText(() => {
-                emit('blur');
-                if (props.blurFormat) {
-                    editorFormat();
-                }
-            });
-            instance.onDidFocusEditorText(() => {
-                emit('focus');
-            });
-            if (props.modelValue) {
-                setTimeout(() => {
-                    editorFormat();
-                }, 200);
-            }
-            _optionalChain([props, 'access', _15 => _15.init, 'optionalCall', _16 => _16(instance, monaco)]);
-        });
-        /**
-         * 光标位置插入内容
-         * @param {String} val
-         * @param position
-         */
-        const insert = (val, position) => {
-            if (!instance)
-                return;
-            const _position = position || instance.getPosition();
-            const value = instance.getValue();
-            if (position && position.lineNumber) {
-                instance.setPosition(position);
-            }
-            instance.executeEdits(value, [
-                {
-                    range: new monaco.Range(_optionalChain([_position, 'optionalAccess', _17 => _17.lineNumber]), _optionalChain([_position, 'optionalAccess', _18 => _18.column]), _optionalChain([_position, 'optionalAccess', _19 => _19.lineNumber]), _optionalChain([_position, 'optionalAccess', _20 => _20.column])),
-                    text: val,
-                },
-            ]);
-        };
-        watch(() => props.modelValue, (val) => {
-            if (!instance ||
-                (instance &&
-                    props.modelValue === instance.getValue()))
-                return;
-            // setValue之前获取光标位置
-            const position = instance.getPosition();
-            // setValue之后光标位置改变
-            instance.setValue(val);
-            // 设置光标位置为setValue之前的位置
-            instance.setPosition(position);
-            editorFormat();
-        });
-        watch(() => JSON.stringify(props.registrationTips), () => {
-            registerCompletionItemProvider();
-        }, { immediate: true });
-        watch(() => JSON.stringify(props.registrationTypescript), () => {
-            registerTypescript();
-        }, { immediate: true });
-        onUnmounted(() => {
-            disposeRegister();
-            disposeTypescript();
-            _optionalChain([instance, 'access', _21 => _21.editor, 'optionalAccess', _22 => _22.dispose, 'optionalCall', _23 => _23()]);
-        });
-        __expose({
-            editorFormat,
-            insert,
-        });
-        return (_ctx, _cache) => {
-            return (_openBlock(), _createElementBlock("div", {
-                ref_key: "dom",
-                ref: dom,
-                class: "j-monaco-editor"
-            }, null, 512 /* NEED_PATCH */));
-        };
-    }
-});
-export default __sfc_main__;

package/es/MonacoEditor/index.js

@@ -1,5 +0,0 @@
-import Monaco from './Monaco.js';
-Monaco.install = function (app) {
-  app.component(Monaco.name, Monaco);
-};
-export default Monaco;

package/es/MonacoEditor/style/index.css

@@ -1,4 +0,0 @@
-.j-monaco-editor {
-  min-height: 50px;
-  height: 100%;
-}

package/es/MonacoEditor/style/index.js

@@ -1 +0,0 @@
-import './index.less';

package/es/MonacoEditor/style/index.less

@@ -1,4 +0,0 @@
-.j-monaco-editor {
-  min-height: 50px;
-  height: 100%;
-}

package/lib/MonacoEditor/Monaco.js

@@ -1,242 +0,0 @@
-function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) {
-    const op = ops[i];
-    const fn = ops[i + 1];
-    i += 2;
-    if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) {
-        return undefined;
-    }
-    if (op === 'access' || op === 'optionalAccess') {
-        lastAccessLHS = value;
-        value = fn(value);
-    }
-    else if (op === 'call' || op === 'optionalCall') {
-        value = fn((...args) => value.call(lastAccessLHS, ...args));
-        lastAccessLHS = undefined;
-    }
-} return value; }
-/* Analyzed bindings: {
-  "modelValue": "props",
-  "theme": "props",
-  "language": "props",
-  "codeTips": "props",
-  "init": "props",
-  "registrationTips": "props",
-  "registrationTypescript": "props",
-  "blurFormat": "props",
-  "readOnly": "props",
-  "options": "props",
-  "ref": "setup-const",
-  "onMounted": "setup-const",
-  "watch": "setup-const",
-  "onUnmounted": "setup-const",
-  "toRaw": "setup-const",
-  "nextTick": "setup-const",
-  "monaco": "setup-const",
-  "omit": "setup-maybe-ref",
-  "props": "setup-reactive-const",
-  "emit": "setup-const",
-  "dom": "setup-ref",
-  "instance": "setup-let",
-  "monacoProviderRef": "setup-ref",
-  "monacoTypescriptProviderRef": "setup-ref",
-  "handleSuggestions": "setup-const",
-  "disposeRegister": "setup-const",
-  "registerCompletionItemProvider": "setup-const",
-  "disposeTypescript": "setup-const",
-  "registerTypescript": "setup-const",
-  "editorFormat": "setup-const",
-  "insert": "setup-const"
-} */
-import { openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { ref, onMounted, watch, onUnmounted, nextTick } from 'vue';
-import * as monaco from 'monaco-editor';
-import { omit } from 'lodash-es';
-const __sfc_main__ = Object.assign({
-    name: 'JMonacoEditor'
-}, {
-    props: {
-        modelValue: [String, Number],
-        theme: { type: String, default: 'vs-dark' },
-        language: { type: String, default: 'json' },
-        codeTips: { type: Array, default: () => [] },
-        init: { type: Function, default: undefined },
-        registrationTips: { type: Object, default: () => ({}) },
-        registrationTypescript: { type: Object, default: () => ({}) },
-        blurFormat: { type: Boolean, default: true },
-        readOnly: { type: Boolean, default: false },
-        options: { type: Object, default: () => ({}) },
-    },
-    emits: [
-        'update:modelValue',
-        'blur',
-        'focus',
-        'change',
-        'errorChange',
-    ],
-    setup(__props, { expose: __expose, emit: __emit }) {
-        const props = __props;
-        const emit = __emit;
-        const dom = ref();
-        let instance;
-        const monacoProviderRef = ref();
-        const monacoTypescriptProviderRef = ref();
-        // codeTipItem.dispose() // 销毁自定义提示
-        const handleSuggestions = (suggestions, range) => {
-            return Array.isArray(suggestions)
-                ? suggestions.map((item) => ({ ...item, range }))
-                : [];
-        };
-        const disposeRegister = () => {
-            _optionalChain([monacoProviderRef, 'access', _ => _.value, 'optionalAccess', _2 => _2.dispose, 'call', _3 => _3()]);
-            monacoProviderRef.value = null;
-        };
-        /**
-         * 代码提示注册
-         */
-        const registerCompletionItemProvider = () => {
-            disposeRegister();
-            if (monaco.languages && _optionalChain([props, 'access', _4 => _4.registrationTips, 'optionalAccess', _5 => _5.suggestions])) {
-                const { name, suggestions } = props.registrationTips;
-                monacoProviderRef.value =
-                    monaco.languages.registerCompletionItemProvider(name || 'json', {
-                        provideCompletionItems: function (model, position) {
-                            const word = model.getWordUntilPosition(position); // 获取提示代码范围位置
-                            const range = {
-                                startLineNumber: position.lineNumber,
-                                endLineNumber: position.lineNumber,
-                                startColumn: word.startColumn,
-                                endColumn: word.endColumn,
-                            };
-                            return {
-                                suggestions: handleSuggestions(suggestions, range),
-                            };
-                        },
-                    });
-            }
-        };
-        const disposeTypescript = () => {
-            _optionalChain([monacoTypescriptProviderRef, 'access', _6 => _6.value, 'optionalAccess', _7 => _7.dispose, 'call', _8 => _8()]);
-            monacoTypescriptProviderRef.value = null;
-        };
-        const registerTypescript = () => {
-            disposeTypescript();
-            if (monaco.languages && _optionalChain([props, 'access', _9 => _9.registrationTypescript, 'optionalAccess', _10 => _10.typescript])) {
-                const { name, typescript } = props.registrationTypescript;
-                monacoTypescriptProviderRef.value =
-                    monaco.languages.typescript.javascriptDefaults.addExtraLib(typescript);
-            }
-        };
-        /**
-         * 代码格式化
-         */
-        const editorFormat = () => {
-            if (!instance)
-                return;
-            setTimeout(() => {
-                _optionalChain([instance, 'access', _11 => _11.getAction, 'call', _12 => _12('editor.action.formatDocument'), 'optionalAccess', _13 => _13.run, 'call', _14 => _14()]);
-            }, 300);
-            if (props.hasOwnProperty('readOnly')) {
-                setTimeout(() => {
-                    instance.updateOptions({
-                        readOnly: props.readOnly !== false,
-                    });
-                }, 400);
-            }
-        };
-        monaco.editor.onDidChangeMarkers(([uri]) => {
-            const markers = monaco.editor.getModelMarkers({ resource: uri });
-            emit('errorChange', markers);
-        });
-        onMounted(async () => {
-            const _model = monaco.editor.createModel(props.modelValue, props.language);
-            instance = monaco.editor.create(dom.value, {
-                model: _model,
-                tabSize: 2,
-                automaticLayout: true,
-                scrollBeyondLastLine: false,
-                theme: props.theme,
-                formatOnPaste: true,
-                ...(omit(props.options, ['readOnly']) || {}),
-            });
-            instance.onDidChangeModelContent(() => {
-                //
-                const value = instance.getValue();
-                nextTick(() => {
-                    emit('update:modelValue', value);
-                    emit('change', value);
-                });
-            });
-            instance.onDidBlurEditorText(() => {
-                emit('blur');
-                if (props.blurFormat) {
-                    editorFormat();
-                }
-            });
-            instance.onDidFocusEditorText(() => {
-                emit('focus');
-            });
-            if (props.modelValue) {
-                setTimeout(() => {
-                    editorFormat();
-                }, 200);
-            }
-            _optionalChain([props, 'access', _15 => _15.init, 'optionalCall', _16 => _16(instance, monaco)]);
-        });
-        /**
-         * 光标位置插入内容
-         * @param {String} val
-         * @param position
-         */
-        const insert = (val, position) => {
-            if (!instance)
-                return;
-            const _position = position || instance.getPosition();
-            const value = instance.getValue();
-            if (position && position.lineNumber) {
-                instance.setPosition(position);
-            }
-            instance.executeEdits(value, [
-                {
-                    range: new monaco.Range(_optionalChain([_position, 'optionalAccess', _17 => _17.lineNumber]), _optionalChain([_position, 'optionalAccess', _18 => _18.column]), _optionalChain([_position, 'optionalAccess', _19 => _19.lineNumber]), _optionalChain([_position, 'optionalAccess', _20 => _20.column])),
-                    text: val,
-                },
-            ]);
-        };
-        watch(() => props.modelValue, (val) => {
-            if (!instance ||
-                (instance &&
-                    props.modelValue === instance.getValue()))
-                return;
-            // setValue之前获取光标位置
-            const position = instance.getPosition();
-            // setValue之后光标位置改变
-            instance.setValue(val);
-            // 设置光标位置为setValue之前的位置
-            instance.setPosition(position);
-            editorFormat();
-        });
-        watch(() => JSON.stringify(props.registrationTips), () => {
-            registerCompletionItemProvider();
-        }, { immediate: true });
-        watch(() => JSON.stringify(props.registrationTypescript), () => {
-            registerTypescript();
-        }, { immediate: true });
-        onUnmounted(() => {
-            disposeRegister();
-            disposeTypescript();
-            _optionalChain([instance, 'access', _21 => _21.editor, 'optionalAccess', _22 => _22.dispose, 'optionalCall', _23 => _23()]);
-        });
-        __expose({
-            editorFormat,
-            insert,
-        });
-        return (_ctx, _cache) => {
-            return (_openBlock(), _createElementBlock("div", {
-                ref_key: "dom",
-                ref: dom,
-                class: "j-monaco-editor"
-            }, null, 512 /* NEED_PATCH */));
-        };
-    }
-});
-export default __sfc_main__;

package/lib/MonacoEditor/index.js

@@ -1,12 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _Monaco = _interopRequireDefault(require("./Monaco.js"));
-_Monaco.default.install = function (app) {
-  app.component(_Monaco.default.name, _Monaco.default);
-};
-var _default = exports.default = _Monaco.default;

package/lib/MonacoEditor/style/index.css

@@ -1,4 +0,0 @@
-.j-monaco-editor {
-  min-height: 50px;
-  height: 100%;
-}

package/lib/MonacoEditor/style/index.js

@@ -1,3 +0,0 @@
-"use strict";
-
-require("./index.less");

package/lib/MonacoEditor/style/index.less

@@ -1,4 +0,0 @@
-.j-monaco-editor {
-  min-height: 50px;
-  height: 100%;
-}