clickgo 3.13.0 → 3.13.2

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.7/dist/loader.min.js?path=index&npm={'clickgo':'3.13.0'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.7/dist/loader.min.js?path=index&npm={'clickgo':'3.13.2'}"></script>
 ```
 
 **index.js**

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

@@ -219,7 +219,7 @@ class default_1 extends clickgo.form.AbstractForm {
             this.dr = yield clickgo.form.dialog({
                 'direction': 'v',
                 'gutter': 10,
-                'content': '<block>Hello text!</block><text :modelValue="data.txt">',
+                'content': '<block>Hello text!</block><text :modelValue="data.txt" />',
                 'data': {
                     'txt': 'Text\nLine 2.'
                 }

package/dist/app/demo/form/solution/backpanel/backpanel.xml

@@ -24,7 +24,7 @@
                 <label style="flex: 1; text-align: right; padding-right: var(--g-padding);">Panel</label>
             </template>
             <template v-slot:content>
-                <panel :map="map" style="flex: 1;" @go="loading = true" @went="loading = false"></panel>
+                <panel :map="map" style="flex: 1;" @go="loading = true; lockLoading = true" @went="lockLoading = false; loading = false"></panel>
             </template>
         </nav>
     </layout>

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.13.0';
+const version = '3.13.2';
 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.13.0';
+const version = '3.13.2';
 export function getVersion(): string {
     return version;
 }

package/dist/index.js

@@ -110,7 +110,7 @@ function launcher(boot) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const paths = [
-                `${loader.cdn}/npm/vue@3.4.21/dist/vue.global${boot.isDebug() ? '' : '.prod.min'}.js`
+                `${loader.cdn}/npm/vue@3.4.30/dist/vue.global${boot.isDebug() ? '' : '.prod.min'}.js`
             ];
             if (!(window.TouchEvent)) {
                 window.TouchEvent = CustomEvent;

package/dist/index.ts

@@ -192,7 +192,7 @@ export function launcher(boot: AbstractBoot): void {
     (async function() {
         // --- 通过标签加载库 ---
         const paths: string[] = [
-            `${loader.cdn}/npm/vue@3.4.21/dist/vue.global${boot.isDebug() ? '' : '.prod.min'}.js`
+            `${loader.cdn}/npm/vue@3.4.30/dist/vue.global${boot.isDebug() ? '' : '.prod.min'}.js`
         ];
         // --- 判断 TouchEvent 是否存在（例如某些浏览器可能不存在这个对象） ---
         if (!((window as any).TouchEvent)) {

package/dist/lib/core.js

@@ -194,7 +194,7 @@ const modules = {
         func: function () {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise(function (resolve, reject) {
-                    fetch(loader.cdn + '/npm/monaco-editor@0.46.0/min/vs/loader.js').then(function (r) {
+                    fetch(loader.cdn + '/npm/monaco-editor@0.50.0/min/vs/loader.js').then(function (r) {
                         return r.blob();
                     }).then(function (b) {
                         return tool.blob2DataUrl(b);

package/dist/lib/core.ts

@@ -268,7 +268,7 @@ const modules: Record<string, {
     'monaco': {
         func: async function() {
             return new Promise(function(resolve, reject) {
-                fetch(loader.cdn + '/npm/monaco-editor@0.46.0/min/vs/loader.js').then(function(r) {
+                fetch(loader.cdn + '/npm/monaco-editor@0.50.0/min/vs/loader.js').then(function(r) {
                     return r.blob();
                 }).then(function(b) {
                     return tool.blob2DataUrl(b);

package/dist/lib/form.js

@@ -331,7 +331,8 @@ class AbstractForm extends AbstractCommon {
         super(...arguments);
         this.isNativeSync = false;
         this.isReady = false;
-        this.loading = false;
+        this._loading = false;
+        this.lockLoading = false;
         this._inStep = false;
         this._stepValues = [];
         this._firstShow = true;
@@ -421,6 +422,15 @@ class AbstractForm extends AbstractCommon {
     sendToPanel(panel, data) {
         panel.send(data);
     }
+    get loading() {
+        return this._loading;
+    }
+    set loading(val) {
+        if (this.lockLoading) {
+            return;
+        }
+        this._loading = val;
+    }
     get inStep() {
         return this._inStep;
     }
@@ -2769,9 +2779,9 @@ function confirm(opt) {
             return false;
         }
         const locale = t.locale.lang || core.config.locale;
-        const buttons = [(_b = (_a = info.locale[locale]) === null || _a === void 0 ? void 0 : _a.yes) !== null && _b !== void 0 ? _b : info.locale['en'].yes, (_d = (_c = info.locale[locale]) === null || _c === void 0 ? void 0 : _c.no) !== null && _d !== void 0 ? _d : info.locale['en'].no];
+        const buttons = [(_b = (_a = info.locale[locale]) === null || _a === void 0 ? void 0 : _a.no) !== null && _b !== void 0 ? _b : info.locale['en'].no, (_d = (_c = info.locale[locale]) === null || _c === void 0 ? void 0 : _c.yes) !== null && _d !== void 0 ? _d : info.locale['en'].yes];
         if (opt.cancel) {
-            buttons.push((_f = (_e = info.locale[locale]) === null || _e === void 0 ? void 0 : _e.cancel) !== null && _f !== void 0 ? _f : info.locale['en'].cancel);
+            buttons.unshift((_f = (_e = info.locale[locale]) === null || _e === void 0 ? void 0 : _e.cancel) !== null && _f !== void 0 ? _f : info.locale['en'].cancel);
         }
         const res = yield dialog({
             'taskId': taskId,
@@ -2811,7 +2821,7 @@ function prompt(opt) {
             'title': opt.title,
             'direction': 'v',
             'gutter': 10,
-            'content': '<block>' + opt.content + '</block><text v-model="data.text">',
+            'content': '<block>' + opt.content + '</block><text v-model="data.text" />',
             'data': {
                 'text': (_a = opt.text) !== null && _a !== void 0 ? _a : ''
             },

package/dist/lib/form.ts

@@ -581,8 +581,23 @@ export abstract class AbstractForm extends AbstractCommon {
         panel.send(data);
     }
 
+    /** --- 覆盖整个窗体的 loading（实际值） --- */
+    private _loading: boolean = false;
+
     /** --- 覆盖整个窗体的 loading --- */
-    public loading: boolean = false;
+    public get loading(): boolean {
+        return this._loading;
+    }
+
+    public set loading(val: boolean) {
+        if (this.lockLoading) {
+            return;
+        }
+        this._loading = val;
+    }
+
+    /** --- 是否阻止任何人修改 loading --- */
+    public lockLoading: boolean = false;
 
     // --- step 相关 ---
 
@@ -3497,9 +3512,9 @@ export async function confirm(opt: string | types.IFormConfirmOptions): Promise<
         return false;
     }
     const locale = t.locale.lang || core.config.locale;
-    const buttons = [info.locale[locale]?.yes ?? info.locale['en'].yes, info.locale[locale]?.no ?? info.locale['en'].no];
+    const buttons = [info.locale[locale]?.no ?? info.locale['en'].no, info.locale[locale]?.yes ?? info.locale['en'].yes];
     if (opt.cancel) {
-        buttons.push(info.locale[locale]?.cancel ?? info.locale['en'].cancel);
+        buttons.unshift(info.locale[locale]?.cancel ?? info.locale['en'].cancel);
     }
     const res = await dialog({
         'taskId': taskId,
@@ -3542,7 +3557,7 @@ export async function prompt(opt: string | types.IFormPromptOptions): Promise<st
         'title': opt.title,
         'direction': 'v',
         'gutter': 10,
-        'content': '<block>' + opt.content + '</block><text v-model="data.text">',
+        'content': '<block>' + opt.content + '</block><text v-model="data.text" />',
         'data': {
             'text': opt.text ?? ''
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.13.0",
+  "version": "3.13.2",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",