clickgo 3.11.33 → 3.12.0

package/README.md

@@ -25,7 +25,7 @@ Load the module loader first, and then load it using the module loader.
 **index.html**
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.1/dist/loader.min.js?path=index&npm={'clickgo':'3.11.33'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.2/dist/loader.min.js?path=index&npm={'clickgo':'3.12.0'}"></script>
 ```
 
 **index.js**

package/dist/app/demo/config.json

@@ -20,10 +20,10 @@
         "/clickgo/control/xterm",
         "/clickgo/control/echarts",
         "/clickgo/control/map",
-        "/clickgo/control/markdownit",
         "/clickgo/control/tuieditor",
+        "/clickgo/control/tuiviewer",
         "/clickgo/control/arteditor",
-        "/clickgo/control/markdownit"
+        "/clickgo/control/weditor"
     ],
     "style": "/package/global",
 
@@ -81,8 +81,6 @@
         "/form/control/loading/loading.xml",
         "/form/control/map/map.js",
         "/form/control/map/map.xml",
-        "/form/control/markdownit/markdownit.js",
-        "/form/control/markdownit/markdownit.xml",
         "/form/control/marquee/marquee.js",
         "/form/control/marquee/marquee.xml",
         "/form/control/menu/menu.js",
@@ -123,11 +121,15 @@
         "/form/control/tip/tip.xml",
         "/form/control/tuieditor/tuieditor.js",
         "/form/control/tuieditor/tuieditor.xml",
+        "/form/control/tuiviewer/tuiviewer.js",
+        "/form/control/tuiviewer/tuiviewer.xml",
         "/form/control/vflow/vflow.css",
         "/form/control/vflow/vflow.js",
         "/form/control/vflow/vflow.xml",
         "/form/control/video/video.js",
         "/form/control/video/video.xml",
+        "/form/control/weditor/weditor.js",
+        "/form/control/weditor/weditor.xml",
         "/form/control/xterm/xterm.js",
         "/form/control/xterm/xterm.xml",
         "/form/event/form/form.css",

package/dist/app/demo/form/control/select/select.xml

@@ -51,7 +51,7 @@
                     <select :data="['1','2','3','4','5']" :disabled="disabled" :editable="editable" :multi="multi" :plain="plain" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" style="height: 60px;" @load="onLoad" @remote="onRemote" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
                     <label>Always editable: {{aemodel}}</label>
                     <layout gutter="10">
-                        <select v-model="aemodel" :data="editableData ? ['1','2','3',{'label':'is 4','value':'4'},'5'] : ['6','7','8','9','10']" :disabled="disabled" editable editablelabel :multi="multi" :plain="plain" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" placeholder="Please enter" @load="onLoad" @remote="onRemote" style="flex: 1;" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
+                        <select v-model="aemodel" :data="editableData ? ['1','2','3',{'label':'is gDa','value':'gDa'},'5'] : ['6','7','8','9','10']" :disabled="disabled" editable editablelabel :multi="multi" :plain="plain" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" placeholder="Please enter" @load="onLoad" @remote="onRemote" style="flex: 1;" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
                         <button @click="aemodel.length=0">clear</button>
                         <button @click="aemodel[0] = '4'">4</button>
                         <button @click="aemodel[0] = '22'">22</button>

package/dist/app/demo/form/control/tuieditor/tuieditor.js

@@ -47,6 +47,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.family = false;
         this.visual = false;
         this.text = 'a**b**c';
+        this.html = '';
     }
     imgselect(cb) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/app/demo/form/control/tuieditor/tuieditor.xml

@@ -1,7 +1,13 @@
-<form title="Tuieditor" width="500" height="450" padding="10">
+<form title="Tuieditor" width="600" height="450" padding="10">
     <layout gutter="10" direction="v" style="flex: 1; width: 0;">
         <label>Length: {{text.length}}</label>
-        <tuieditor v-model="text" :disabled="disabled" :theme="theme[0]" :visual="visual" @imgselect="imgselect" style="flex: 1; height: 0;" :style="{'font-size': size[0], 'font-family': family ? 'Consolas, \'Courier New\', monospace' : undefined}"></tuieditor>
+        <layout gutter="10" style="flex: 1;">
+            <tuieditor v-model="text" @html="html = $event" :disabled="disabled" :theme="theme[0]" :visual="visual" @imgselect="imgselect" style="flex: 1;" :style="{'font-size': size[0], 'font-family': family ? 'Consolas, \'Courier New\', monospace' : undefined}"></tuieditor>
+            <layout gutter="10" direction="v" style="flex: 1;">
+                <text style="flex: 1;" v-model="text" readonly type="multi"></text>
+                <text style="flex: 1;" v-model="html" readonly type="multi"></text>
+            </layout>
+        </layout>
         <layout gutter="10">
             <button @click="disabled = !disabled" style="flex: 1;">{{disabled ? '' : '!'}}disabled</button>
             <button @click="family = !family" style="flex: 1;">{{family ? '' : '!'}}Family CCM</button>

package/dist/app/demo/form/control/{markdownit/markdownit.js → tuiviewer/tuiviewer.js}

@@ -27,10 +27,9 @@ const clickgo = __importStar(require("clickgo"));
 class default_1 extends clickgo.form.AbstractForm {
     constructor() {
         super(...arguments);
-        this.md = '';
-        this.html = '';
-        this.text1 = `# abc\n[ ] OK`;
-        this.text2 = `> 123  \n> 456`;
+        this.text = 'a**b**c';
+        this.size = ['12px'];
+        this.family = false;
     }
 }
 exports.default = default_1;

package/dist/app/demo/form/control/tuiviewer/tuiviewer.xml

@@ -0,0 +1,14 @@
+<form title="Tuiviewer" width="600" height="450" padding="10">
+    <layout gutter="10" direction="v" style="flex: 1; width: 0;">
+        <label>Length: {{text.length}}</label>
+        <layout gutter="10" style="flex: 1;">
+            <tuiviewer v-model="text" style="flex: 1;" :style="{'font-size': size[0], 'font-family': family ? 'Consolas, \'Courier New\', monospace' : undefined}"></tuiviewer>
+            <text style="flex: 1;" v-model="text" type="multi"></text>
+        </layout>
+        <layout gutter="10">
+            <button @click="family = !family" style="flex: 1;">{{family ? '' : '!'}}Family CCM</button>
+            <button @click="text = '1**2**3'" style="flex: 1;">v = '1**2**3'</button>
+            <select v-model="size" :data="['12px', '13px', '14px', '15px', '16px']" style="flex: 1;"></select>
+        </layout>
+    </layout>
+</form>

package/dist/app/demo/form/control/weditor/weditor.js

@@ -0,0 +1,69 @@
+"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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const clickgo = __importStar(require("clickgo"));
+const img_1 = __importDefault(require("../arteditor/img"));
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.theme = ['light'];
+        this.themes = ['light', 'dark'];
+        this.disabled = false;
+        this.readonly = false;
+        this.size = ['12px'];
+        this.family = false;
+        this.visual = false;
+        this.text = '';
+        this.html = '<p align="center">123</p>';
+    }
+    videoselect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield clickgo.form.dialog('Sorry, video can not be upload.');
+        });
+    }
+    imgselect(cb) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const frm = yield clickgo.form.create(img_1.default);
+            const path = yield frm.showDialog();
+            if (!path) {
+                return;
+            }
+            cb('https://cdn.jsdelivr.net/npm/clickgo@3.7.0/dist/app/demo/' + path);
+        });
+    }
+}
+exports.default = default_1;

package/dist/app/demo/form/control/weditor/weditor.xml

@@ -0,0 +1,22 @@
+<form title="Weditor" width="700" height="450" padding="10">
+    <layout gutter="10" direction="v" style="flex: 1; width: 0;">
+        <label>Length: {{html.length}}</label>
+        <layout gutter="10" style="flex: 1; height: 0;">
+            <weditor v-model="html" @text="text = $event" :disabled="disabled" :readonly="readonly" :theme="theme[0]" :visual="visual" @imgselect="imgselect" @videoselect="videoselect" style="flex: 2;" :style="{'font-size': size[0], 'font-family': family ? 'Consolas, \'Courier New\', monospace' : undefined}"></weditor>
+            <layout gutter="10" direction="v" style="flex: 1;">
+                <text style="flex: 1;" v-model="text" readonly type="multi"></text>
+                <text style="flex: 1;" v-model="html" type="multi"></text>
+            </layout>
+        </layout>
+        <layout gutter="10">
+            <button @click="disabled = !disabled" style="flex: 1;">{{disabled ? '' : '!'}}disabled</button>
+            <button @click="readonly = !readonly" style="flex: 1;">{{readonly ? '' : '!'}}readonly</button>
+            <button @click="html = '1<b>2</b>3'" style="flex: 1;">v = '1&lt;b&gt;2&lt;/b&gt;3'</button>
+        </layout>
+        <layout gutter="10">
+            <button @click="family = !family" style="flex: 1;">{{family ? '' : '!'}}Family CCM</button>
+            <select v-model="size" :data="['12px', '13px', '14px', '15px', '16px']" style="flex: 1;"></select>
+            <!--<select v-model="theme" :data="themes" style="flex: 1;"></select>-->
+        </layout>
+    </layout>
+</form>

package/dist/app/demo/form/main.js

@@ -52,7 +52,6 @@ const link_1 = __importDefault(require("./control/link/link"));
 const label_1 = __importDefault(require("./control/label/label"));
 const layout_1 = __importDefault(require("./control/layout/layout"));
 const list_1 = __importDefault(require("./control/list/list"));
-const markdownit_1 = __importDefault(require("./control/markdownit/markdownit"));
 const map_1 = __importDefault(require("./control/map/map"));
 const marquee_1 = __importDefault(require("./control/marquee/marquee"));
 const menu_1 = __importDefault(require("./control/menu/menu"));
@@ -76,7 +75,9 @@ const video_1 = __importDefault(require("./control/video/video"));
 const step_1 = __importDefault(require("./control/step/step"));
 const xterm_1 = __importDefault(require("./control/xterm/xterm"));
 const echarts_1 = __importDefault(require("./control/echarts/echarts"));
+const weditor_1 = __importDefault(require("./control/weditor/weditor"));
 const tuieditor_1 = __importDefault(require("./control/tuieditor/tuieditor"));
+const tuiviewer_1 = __importDefault(require("./control/tuiviewer/tuiviewer"));
 const arteditor_1 = __importDefault(require("./control/arteditor/arteditor"));
 const form_2 = __importDefault(require("./event/form/form"));
 const other_1 = __importDefault(require("./event/other/other"));
@@ -225,10 +226,6 @@ class default_1 extends clickgo.form.AbstractForm {
                     });
                     break;
                 }
-                case 'cmarkdownit': {
-                    frm = yield clickgo.form.create(markdownit_1.default);
-                    break;
-                }
                 case 'cmap': {
                     frm = yield clickgo.form.create(map_1.default);
                     break;
@@ -297,10 +294,18 @@ class default_1 extends clickgo.form.AbstractForm {
                     frm = yield clickgo.form.create(text_1.default);
                     break;
                 }
+                case 'cweditor': {
+                    frm = yield clickgo.form.create(weditor_1.default);
+                    break;
+                }
                 case 'ctuieditor': {
                     frm = yield clickgo.form.create(tuieditor_1.default);
                     break;
                 }
+                case 'ctuiviewer': {
+                    frm = yield clickgo.form.create(tuiviewer_1.default);
+                    break;
+                }
                 case 'carteditor': {
                     frm = yield clickgo.form.create(arteditor_1.default);
                     break;

package/dist/app/demo/form/main.xml

@@ -89,11 +89,12 @@
                 <layout gutter="10">
                     <button @click="openForm('cecharts')">Echarts</button>
                     <button @click="openForm('cmap')">Map</button>
+                    <button @click="openForm('cweditor')">Weditor</button>
                 </layout>
                 <layout gutter="10">
                     <button @click="openForm('carteditor')">Arteditor</button>
                     <button @click="openForm('ctuieditor')">Tuieditor</button>
-                    <button @click="openForm('cmarkdownit')">Markdownit</button>
+                    <button @click="openForm('ctuiviewer')">Tuiviewer</button>
                 </layout>
             </layout>
         </flow>

package/dist/app/demo/form/method/aform/aform.xml

@@ -1,4 +1,4 @@
-<form width="550" height="400" title="Abstract Form">
+<form width="550" height="600" title="Abstract Form">
     <flow direction="v" style="flex: 1; padding: 10px;">
         <layout gutter="10" direction="v" style="flex: 1;">
             <label>filename: {{filename}}</label>

package/dist/app/demo/form/method/dom/dom.js

@@ -48,6 +48,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.moveTop = 0;
         this.moveWidth = 25;
         this.moveHeight = 25;
+        this.watchPositionText = false;
         this.getWatchInfoDisabled = false;
         this.getWatchInfoText = '{}';
     }
@@ -94,6 +95,17 @@ class default_1 extends clickgo.form.AbstractForm {
             clickgo.dom.unwatchSize(this.refs.watchSize.$el);
         }
     }
+    watchPosition() {
+        this.watchPositionText = !this.watchPositionText;
+        if (this.watchPositionText) {
+            clickgo.dom.watchPosition(this.refs.watchPosition.$el, (state) => {
+                console.log('watchPosition', state);
+            });
+        }
+        else {
+            clickgo.dom.unwatchPosition(this.refs.watchPosition.$el);
+        }
+    }
     wwatch() {
         this.watchText = !this.watchText;
         if (this.watchText) {

package/dist/app/demo/form/method/dom/dom.xml

@@ -9,6 +9,10 @@
                 <button @click="watchSize" ref="watchSize" :style="{'height': (watchSizeHeight ? 30 : 50) + 'px'}" style="padding: 0 5px; flex: 1;">{{watchSizeText ? '' : '!'}}watchSize</button>
                 <button @click="watchSizeHeight = !watchSizeHeight" style="padding: 0 5px; flex: 1;">Change</button>
             </layout>
+            <layout gutter="10" align-v="center">
+                <button @click="watchPosition" ref="watchPosition" style="flex: 1;">{{watchPositionText ? '' : '!'}}watchPosition</button>
+                <label>watch and scroll</label>
+            </layout>
             <layout gutter="10">
                 <button style="flex: 1;" @click="getWatchSizeCount()">getWatchSizeCount()</button>
                 <button style="flex: 1;" @click="getWatchSizeCount(taskId)">getWatchSizeCount({{taskId}})</button>

package/dist/app/demo/form/method/form/form.xml

@@ -44,7 +44,13 @@
             </layout>
             <button @click="showPop">showPop(e.currentTarget, this.refs.pop)</button>
             <teleport to="system">
-                <block ref="pop" style="border: solid 1px #000; background: #FFF; width: 200px; height: 100px; display: flex; justify-content: center; align-items: center;">refs.pop</block>
+                <layout ref="pop" gutter="10" direction="v" align-v="center" align-h="center" style="border: solid 1px #000; background: #FFF; width: 200px; height: 100px;">
+                    <label>refs.pop</label>
+                    <layout gutter="10">
+                        <select :data="[1,2,3]"></select>
+                        <select :data="[4,5,6]"></select>
+                    </layout>
+                </layout>
             </teleport>
             <button @click="create">create('test', undefined, { 'path': this.filename })</button>
             <label>Dialog result: {{dr}}.</label>

package/dist/clickgo.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zip = exports.tool = exports.theme = exports.task = exports.storage = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.hasFrame = exports.isImmersion = exports.getPlatform = exports.isNative = exports.getVersion = void 0;
-const version = '3.11.33';
+const version = '3.12.0';
 function getVersion() {
     return version;
 }

package/dist/clickgo.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const version = '3.11.33';
+const version = '3.12.0';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/control.js

@@ -255,6 +255,11 @@ function read(blob) {
             }
             const configContent = yield z.getContent('/' + sub.name + '/config.json');
             if (!configContent) {
+                form.notify({
+                    'title': 'Error',
+                    'content': `Control file not found.\nFile: "${'/' + sub.name + '/config.json'}".`,
+                    'type': 'danger'
+                });
                 continue;
             }
             const config = JSON.parse(configContent);

package/dist/lib/control.ts

@@ -364,6 +364,11 @@ export async function read(blob: Blob): Promise<false | types.TControlPackage> {
         }
         const configContent = await z.getContent('/' + sub.name + '/config.json');
         if (!configContent) {
+            form.notify({
+                'title': 'Error',
+                'content': `Control file not found.\nFile: "${'/' + sub.name + '/config.json'}".`,
+                'type': 'danger'
+            });
             continue;
         }
         // --- 读取本条控件内容 ---

package/dist/lib/core.js

@@ -278,16 +278,17 @@ const modules = {
         'loading': false,
         'resolve': []
     },
-    'markdownit': {
+    'weditor': {
         func: function () {
             return __awaiter(this, void 0, void 0, function* () {
                 yield loader.loadScripts([
-                    loader.cdn + '/npm/markdown-it@14.1.0/dist/markdown-it.min.js'
+                    loader.cdn + '/npm/@wangeditor/editor@5.1.23/dist/index.min.js'
                 ]);
-                if (!window.markdownit) {
-                    throw Error('Markdownit load failed.');
-                }
-                return window.markdownit;
+                yield loader.loadLinks([
+                    loader.cdn + '/npm/@wangeditor/editor@5.1.23/dist/css/style.min.css'
+                ]);
+                loader.loadStyle('.w-e-modal,.w-e-hover-bar,.w-e-drop-panel,.w-e-select-list,.w-e-bar-item-menus-container{z-index:2 !important;}');
+                return window.wangEditor;
             });
         },
         'obj': null,

package/dist/lib/core.ts

@@ -345,15 +345,16 @@ const modules: Record<string, {
         'loading': false,
         'resolve': []
     },
-    'markdownit': {
+    'weditor': {
         func: async function() {
             await loader.loadScripts([
-                loader.cdn + '/npm/markdown-it@14.1.0/dist/markdown-it.min.js'
+                loader.cdn + '/npm/@wangeditor/editor@5.1.23/dist/index.min.js'
             ]);
-            if (!(window as any).markdownit) {
-                throw Error('Markdownit load failed.');
-            }
-            return (window as any).markdownit;
+            await loader.loadLinks([
+                loader.cdn + '/npm/@wangeditor/editor@5.1.23/dist/css/style.min.css'
+            ]);
+            loader.loadStyle('.w-e-modal,.w-e-hover-bar,.w-e-drop-panel,.w-e-select-list,.w-e-bar-item-menus-container{z-index:2 !important;}');
+            return (window as any).wangEditor;
         },
         'obj': null,
         'loading': false,