clickgo 3.11.0 → 3.11.1

package/README.md

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

package/dist/app/demo/form/control/panel/test1.js

@@ -38,6 +38,7 @@ class default_1 extends clickgo.form.AbstractPanel {
         super(...arguments);
         this.scount = 0;
         this.data = {};
+        this.rootMountData = 'none';
     }
     onShow(d) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -68,5 +69,8 @@ class default_1 extends clickgo.form.AbstractPanel {
             yield clickgo.form.dialog('Hello panel!');
         });
     }
+    onMounted() {
+        this.rootMountData = this.rootForm.mountData;
+    }
 }
 exports.default = default_1;

package/dist/app/demo/form/control/panel/test1.xml

@@ -4,6 +4,7 @@
     <label>Data: {{data}}</label>
     <label>Parent data: {{rootForm.parentData}}</label>
     <label>Qs: {{qs}}</label>
+    <label>rootMountData: {{rootMountData}}</label>
     <button @click="click" style="height: 30px;">Hi</button>
     <layout>
         <button style="padding: 15px 30px;" area="split">

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

@@ -99,6 +99,7 @@ class default_1 extends clickgo.form.AbstractForm {
     }
     openForm(name, data) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.loading = true;
             let frm;
             switch (name) {
                 case 'cblock': {
@@ -343,6 +344,7 @@ class default_1 extends clickgo.form.AbstractForm {
                     frm = yield clickgo.form.create(backpanel_1.default, data);
                 }
             }
+            this.loading = false;
             frm.show();
         });
     }

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

@@ -116,7 +116,7 @@
         <flow v-else class="inner" direction="v">
             <layout gutter="10" direction="v">
                 <button @click="openForm('sbackpanel')">Backend panel</button>
-                <button @click="openForm('sbackpanel', {'hash': 'test2?p=6'})">Backend panel with hash</button>
+                <button @click="openForm('sbackpanel', {'hash': 'test1?a=1&b=2'})">Backend panel with hash</button>
             </layout>
         </flow>
     </tab>

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

@@ -71,6 +71,29 @@ class default_1 extends clickgo.form.AbstractForm {
             this.loading = false;
         });
     }
+    toEnterStep() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rtn = yield this.enterStep([
+                {
+                    'value': 'step1',
+                    'label': 'step1'
+                },
+                {
+                    'value': 'step2'
+                },
+                {
+                    'icon': '/package/res/marker.svg',
+                    'value': 'icon'
+                },
+                {
+                    'label': 'successful',
+                    'value': 'step3',
+                    'desc': 'qq'
+                }
+            ]);
+            yield clickgo.form.dialog('Result: ' + (rtn ? 'true' : 'false'));
+        });
+    }
     onMounted() {
         this.watch('test', () => __awaiter(this, void 0, void 0, function* () {
             yield clickgo.form.dialog('test changed.');

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

@@ -1,4 +1,4 @@
-<form width="350" height="400" title="Abstract Form">
+<form width="550" height="400" title="Abstract Form">
     <flow direction="v" style="flex: 1; padding: 10px;">
         <layout gutter="10" direction="v" style="flex: 1;">
             <label>filename: {{filename}}</label>
@@ -42,6 +42,15 @@
                 <label>result: {{dr}}</label>
             </layout>
             <button @click="close">close()</button>
+            <label>enterStep: [ {{formHash}} ]</label>
+            <button @click="toEnterStep">enterStep</button>
+            <layout gutter="10">
+                <button @click="formHash = 'step1'" style="flex: 1;">fh = 'step1'</button>
+                <button @click="formHash = 'step2'" style="flex: 1;">step2</button>
+                <button @click="formHash = 'step3'" style="flex: 1;">step3</button>
+                <button @click="formHash = 'step4'" style="flex: 1;">step4</button>
+                <button @click="doneStep()" style="flex: 1;">done</button>
+            </layout>
         </layout>
     </flow>
 </form>

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

@@ -15,8 +15,8 @@
             </layout>
             <layout gutter="10">
                 <layout ref="watch" align-v="center" align-h="center" style="flex: 1; background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color);">{{watchInner ? 'inner' : 'Inner'}}</layout>
-                <button @click="wwatch" style="padding: 0 5px;">{{watchText ? '' : '!'}}watch</button>
-                <button @click="watchInner = !watchInner" style="padding: 0 5px;">Change</button>
+                <button @click="wwatch">{{watchText ? '' : '!'}}watch</button>
+                <button @click="watchInner = !watchInner">Change</button>
             </layout>
             <layout gutter="10">
                 <button style="flex: 1;" @click="getWatchCount()">getWatchCount()</button>
@@ -26,7 +26,7 @@
             <button @click="isWatchStyle" >isWatchStyle(this.refs.watchStyle.$el)</button>
             <!-- getWatchInfo -->
             <text :model-value="getWatchInfoText" readonly multi style="height: 300px;"></text>
-            <button @click="getWatchInfo" :disabled="getWatchInfoDisabled" style="padding: 0 10px;">getWatchInfo 20s</button>
+            <button @click="getWatchInfo" :disabled="getWatchInfoDisabled">getWatchInfo 20s</button>
             <block @mousedown="bindGesture" @touchstart="bindGesture" style="height: 50px; display: flex; justify-content: center; align-items: center; font-size: 14px; background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color);">{{bindGestureText ? bindGestureText : 'bindGesture(e: Touch | Mouse, { ... })'}}</block>
             <block @wheel="bindGestureWheel" style="height: 50px; display: flex; justify-content: center; align-items: center; font-size: 14px; background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color);">{{bindGestureWheelText ? bindGestureWheelText : 'bindGesture(e: Wheel, { ... })'}}</block>
             <button @click="bindLong" ref="bindLong" @mousedown="bindLongDown" @touchstart="bindLongDown" >{{bindLongText ? 'Yeah!' : 'bindLong(e, () => { ... })'}}</button>

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

@@ -71,7 +71,7 @@ class default_1 extends clickgo.form.AbstractForm {
     }
     hashBack() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield clickgo.form.dialog(JSON.stringify(clickgo.form.hashBack(parseInt(this.fid))));
+            yield clickgo.form.dialog(JSON.stringify(yield clickgo.form.hashBack(parseInt(this.fid))));
         });
     }
     tohash() {

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

@@ -42,6 +42,7 @@ class default_1 extends clickgo.form.AbstractForm {
         super(...arguments);
         this.fh = '';
         this.name = '';
+        this.mountData = 'none';
         this.map = {
             'test1': test1_1.default,
             'test2': '../../control/panel/test2'
@@ -60,10 +61,14 @@ class default_1 extends clickgo.form.AbstractForm {
         });
     }
     onMounted(data) {
-        if (!data.hash) {
-            return;
-        }
-        this.formHash = data.hash;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!data.hash) {
+                return;
+            }
+            this.formHash = data.hash;
+            yield clickgo.tool.sleep(500);
+            this.mountData = 'ok';
+        });
     }
 }
 exports.default = default_1;

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

package/dist/lib/form.js

@@ -55,84 +55,96 @@ const info = {
             'yes': 'Yes',
             'no': 'No',
             'cancel': 'Cancel',
-            'search': 'Search'
+            'search': 'Search',
+            'confirmExitStep': 'This operation will exit the current process. Are you sure you want to exit?'
         },
         'sc': {
             'ok': '好',
             'yes': '是',
             'no': '否',
             'cancel': '取消',
-            'search': '搜索'
+            'search': '搜索',
+            'confirmExitStep': '此操作将退出当前流程，确定退出吗？'
         },
         'tc': {
             'ok': '好',
             'yes': '是',
             'no': '否',
             'cancel': '取消',
-            'search': '檢索'
+            'search': '檢索',
+            'confirmExitStep': '此操作將結束目前的流程，確定退出嗎？'
         },
         'ja': {
             'ok': '好',
             'yes': 'はい',
             'no': 'いいえ',
             'cancel': 'キャンセル',
-            'search': '検索'
+            'search': '検索',
+            'confirmExitStep': 'この操作は現在のプロセスを終了します。本当に終了しますか？'
         },
         'ko': {
             'ok': '확인',
             'yes': '예',
             'no': '아니오',
             'cancel': '취소',
-            'search': '검색'
+            'search': '검색',
+            'confirmExitStep': '이 작업은 현재 프로세스를 종료합니다. 종료하시겠습니까?'
         },
         'th': {
             'ok': 'ตกลง',
             'yes': 'ใช่',
             'no': 'ไม่',
             'cancel': 'ยกเลิก',
-            'search': 'ค้นหา'
+            'search': 'ค้นหา',
+            'confirmExitStep': 'การดำเนินการนี้จะออกจากกระบวนการปัจจุบัน ยืนยันที่จะออกไหม？'
         },
         'es': {
             'ok': 'Aceptar',
             'yes': 'Sí',
             'no': 'No',
             'cancel': 'Cancelar',
-            'search': 'Buscar'
+            'search': 'Buscar',
+            'confirmExitStep': 'Esta operación cerrará el proceso actual. ¿Estás seguro de que quieres salir?'
         },
         'de': {
             'ok': 'OK',
             'yes': 'Ja',
             'no': 'Nein',
             'cancel': 'Abbrechen',
-            'search': 'Suchen'
+            'search': 'Suchen',
+            'confirmExitStep': 'Diese Aktion beendet den aktuellen Prozess. Möchten Sie wirklich beenden?'
         },
         'fr': {
             'ok': 'OK',
             'yes': 'Oui',
             'no': 'Non',
             'cancel': 'Annuler',
-            'search': 'Rechercher'
+            'search': 'Rechercher',
+            'confirmExitStep': 'Cette opération va quitter le processus en cours. Êtes-vous sûr de vouloir quitter ?'
         },
         'pt': {
             'ok': 'OK',
             'yes': 'Sim',
             'no': 'Não',
             'cancel': 'Cancelar',
-            'search': 'Buscar'
+            'search': 'Buscar',
+            'confirmExitStep': 'Esta operação encerrará o processo atual. Você tem certeza de que deseja sair?'
         },
         'ru': {
             'ok': 'OK',
             'yes': 'Да',
             'no': 'Нет',
             'cancel': 'Отмена',
-            'search': 'Поиск'
+            'search': 'Поиск',
+            'confirmExitStep': 'Эта операция завершит текущий процесс. Вы уверены, что хотите выйти?'
         },
         'vi': {
             'ok': 'OK',
             'yes': 'Có',
             'no': 'Không',
             'cancel': 'Hủy bỏ',
-            'search': 'Tìm kiếm'
+            'search': 'Tìm kiếm',
+            'confirmExitStep': 'Thao tác này sẽ thoát khỏi quy trình hiện tại. Bạn có chắc chắn muốn thoát không?'
         }
     }
 };
@@ -282,8 +294,10 @@ class AbstractForm extends AbstractCommon {
     constructor() {
         super(...arguments);
         this.isNativeSync = false;
+        this.isReady = false;
         this.loading = false;
         this._inStep = false;
+        this._stepValues = [];
         this._firstShow = true;
         this.dialogResult = '';
     }
@@ -315,33 +329,82 @@ class AbstractForm extends AbstractCommon {
     }
     set showInSystemTask(v) {
     }
+    ready(cb) {
+        cb();
+    }
     formHashBack() {
-        const v = this;
-        if (!v.$data._historyHash.length) {
-            if (v.$data._formHash) {
-                v.$data._formHash = '';
-                core.trigger('formHashChange', this.taskId, this.formId, '');
+        return __awaiter(this, void 0, void 0, function* () {
+            const v = this;
+            if (!v.$data._historyHash.length) {
+                if (v.$data._formHash) {
+                    if (this.inStep) {
+                        if (!(yield clickgo.form.confirm({
+                            'taskId': this.taskId,
+                            'content': info.locale[this.locale].confirmExitStep
+                        }))) {
+                            return;
+                        }
+                        this._inStep = false;
+                        this.refs.form.stepHide();
+                    }
+                    v.$data._formHash = '';
+                    core.trigger('formHashChange', this.taskId, this.formId, '');
+                    return;
+                }
                 return;
             }
-            return;
-        }
-        const parent = v.$data._historyHash[v.$data._historyHash.length - 1];
-        v.$data._formHash = parent;
-        v.$data._historyHash.splice(-1);
-        core.trigger('formHashChange', this.taskId, this.formId, parent);
+            const parent = v.$data._historyHash[v.$data._historyHash.length - 1];
+            if (this.inStep) {
+                if (this._stepValues.includes(parent)) {
+                    this.refs.form.stepValue = parent;
+                }
+                else {
+                    if (!(yield clickgo.form.confirm({
+                        'taskId': this.taskId,
+                        'content': info.locale[this.locale].confirmExitStep
+                    }))) {
+                        return;
+                    }
+                    this._inStep = false;
+                    this.refs.form.stepHide();
+                }
+            }
+            v.$data._formHash = parent;
+            v.$data._historyHash.splice(-1);
+            core.trigger('formHashChange', this.taskId, this.formId, parent);
+        });
     }
     get inStep() {
         return this._inStep;
     }
-    enterStep(opt) {
-        if (this._inStep) {
-            return false;
-        }
-        if (opt.list[0].hash !== this.formHash) {
-            return false;
-        }
-        this._inStep = true;
-        return false;
+    enterStep(list) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._inStep) {
+                return false;
+            }
+            if (list[0].value !== this.formHash) {
+                return false;
+            }
+            this._inStep = true;
+            this._stepValues.length = 0;
+            for (const item of list) {
+                this._stepValues.push(item.value);
+            }
+            this.refs.form.stepData = list;
+            this.refs.form.stepValue = this.formHash;
+            yield this.nextTick();
+            this.refs.form.stepShow();
+            return true;
+        });
+    }
+    doneStep() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._inStep) {
+                return;
+            }
+            this._inStep = false;
+            yield this.refs.form.stepDone();
+        });
     }
     show() {
         const v = this;
@@ -1008,20 +1071,22 @@ function getHash(formId) {
 }
 exports.getHash = getHash;
 function hashBack(formId) {
-    const taskId = getTaskId(formId);
-    if (taskId === 0) {
-        return false;
-    }
-    const t = task.list[taskId];
-    if (!t) {
-        return false;
-    }
-    const item = task.list[taskId].forms[formId];
-    if (!item) {
-        return false;
-    }
-    item.vroot.formHashBack();
-    return true;
+    return __awaiter(this, void 0, void 0, function* () {
+        const taskId = getTaskId(formId);
+        if (taskId === 0) {
+            return false;
+        }
+        const t = task.list[taskId];
+        if (!t) {
+            return false;
+        }
+        const item = task.list[taskId].forms[formId];
+        if (!item) {
+            return false;
+        }
+        yield item.vroot.formHashBack();
+        return true;
+    });
 }
 exports.hashBack = hashBack;
 function changeFocus(formId = 0) {
@@ -2241,6 +2306,29 @@ function create(cls, data, opt = {}, taskId) {
                 if (v === this._formHash) {
                     return;
                 }
+                if (this.inStep) {
+                    (() => __awaiter(this, void 0, void 0, function* () {
+                        if (this._stepValues.includes(v)) {
+                            this.$refs.form.stepValue = v;
+                        }
+                        else {
+                            if (!(yield clickgo.form.confirm({
+                                'taskId': this.taskId,
+                                'content': info.locale[this.locale].confirmExitStep
+                            }))) {
+                                return;
+                            }
+                            this._inStep = false;
+                            this.$refs.form.stepHide();
+                        }
+                        if (this._formHash) {
+                            this._historyHash.push(this._formHash);
+                        }
+                        this._formHash = v;
+                        core.trigger('formHashChange', t.id, formId, v);
+                    }))();
+                    return;
+                }
                 if (this._formHash) {
                     this._historyHash.push(this._formHash);
                 }
@@ -2258,6 +2346,14 @@ function create(cls, data, opt = {}, taskId) {
                 core.trigger('formShowInSystemTaskChange', t.id, formId, v);
             }
         };
+        const cbs = [];
+        methods.ready = function (cb) {
+            if (this.isReady) {
+                cb();
+                return;
+            }
+            cbs.push(cb);
+        };
         exports.elements.list.insertAdjacentHTML('beforeend', `<div class="cg-form-wrap" data-form-id="${formId.toString()}" data-task-id="${t.id.toString()}"></div>`);
         exports.elements.popList.insertAdjacentHTML('beforeend', `<div data-form-id="${formId.toString()}" data-task-id="${t.id.toString()}"></div>`);
         if (style) {
@@ -2378,6 +2474,10 @@ function create(cls, data, opt = {}, taskId) {
                 rtn.vroot.$refs.form.setPropData('height', window.innerHeight);
             });
         }
+        rtn.vroot.isReady = true;
+        for (const cb of cbs) {
+            cb.call(rtn.vroot);
+        }
         return rtn.vroot;
     });
 }

package/dist/lib/form.ts

@@ -45,6 +45,7 @@ const info: {
         'no': string;
         'cancel': string;
         'search': string;
+        'confirmExitStep': string;
     }>;
 } = {
     'lastId': 0,
@@ -58,84 +59,96 @@ const info: {
             'yes': 'Yes',
             'no': 'No',
             'cancel': 'Cancel',
-            'search': 'Search'
+            'search': 'Search',
+            'confirmExitStep': 'This operation will exit the current process. Are you sure you want to exit?'
         },
         'sc': {
             'ok': '好',
             'yes': '是',
             'no': '否',
             'cancel': '取消',
-            'search': '搜索'
+            'search': '搜索',
+            'confirmExitStep': '此操作将退出当前流程，确定退出吗？'
         },
         'tc': {
             'ok': '好',
             'yes': '是',
             'no': '否',
             'cancel': '取消',
-            'search': '檢索'
+            'search': '檢索',
+            'confirmExitStep': '此操作將結束目前的流程，確定退出嗎？'
         },
         'ja': {
             'ok': '好',
             'yes': 'はい',
             'no': 'いいえ',
             'cancel': 'キャンセル',
-            'search': '検索'
+            'search': '検索',
+            'confirmExitStep': 'この操作は現在のプロセスを終了します。本当に終了しますか？'
         },
         'ko': {
             'ok': '확인',
             'yes': '예',
             'no': '아니오',
             'cancel': '취소',
-            'search': '검색'
+            'search': '검색',
+            'confirmExitStep': '이 작업은 현재 프로세스를 종료합니다. 종료하시겠습니까?'
         },
         'th': {
             'ok': 'ตกลง',
             'yes': 'ใช่',
             'no': 'ไม่',
             'cancel': 'ยกเลิก',
-            'search': 'ค้นหา'
+            'search': 'ค้นหา',
+            'confirmExitStep': 'การดำเนินการนี้จะออกจากกระบวนการปัจจุบัน ยืนยันที่จะออกไหม？'
         },
         'es': {
             'ok': 'Aceptar',
             'yes': 'Sí',
             'no': 'No',
             'cancel': 'Cancelar',
-            'search': 'Buscar'
+            'search': 'Buscar',
+            'confirmExitStep': 'Esta operación cerrará el proceso actual. ¿Estás seguro de que quieres salir?'
         },
         'de': {
             'ok': 'OK',
             'yes': 'Ja',
             'no': 'Nein',
             'cancel': 'Abbrechen',
-            'search': 'Suchen'
+            'search': 'Suchen',
+            'confirmExitStep': 'Diese Aktion beendet den aktuellen Prozess. Möchten Sie wirklich beenden?'
         },
         'fr': {
             'ok': 'OK',
             'yes': 'Oui',
             'no': 'Non',
             'cancel': 'Annuler',
-            'search': 'Rechercher'
+            'search': 'Rechercher',
+            'confirmExitStep': 'Cette opération va quitter le processus en cours. Êtes-vous sûr de vouloir quitter ?'
         },
         'pt': {
             'ok': 'OK',
             'yes': 'Sim',
             'no': 'Não',
             'cancel': 'Cancelar',
-            'search': 'Buscar'
+            'search': 'Buscar',
+            'confirmExitStep': 'Esta operação encerrará o processo atual. Você tem certeza de que deseja sair?'
         },
         'ru': {
             'ok': 'OK',
             'yes': 'Да',
             'no': 'Нет',
             'cancel': 'Отмена',
-            'search': 'Поиск'
+            'search': 'Поиск',
+            'confirmExitStep': 'Эта операция завершит текущий процесс. Вы уверены, что хотите выйти?'
         },
         'vi': {
             'ok': 'OK',
             'yes': 'Có',
             'no': 'Không',
             'cancel': 'Hủy bỏ',
-            'search': 'Tìm kiếm'
+            'search': 'Tìm kiếm',
+            'confirmExitStep': 'Thao tác này sẽ thoát khỏi quy trình hiện tại. Bạn có chắc chắn muốn thoát không?'
         }
     }
 };
@@ -389,6 +402,9 @@ export abstract class AbstractForm extends AbstractCommon {
 
     // --- 以下为窗体有，但 control 没有 ---
 
+    /** --- 当前是否完全创建完毕 --- */
+    public isReady: boolean = false;
+
     /** --- 获取 form 的 hash 值，不是浏览器的 hash --- */
     public get formHash(): string {
         return '';
@@ -443,11 +459,27 @@ export abstract class AbstractForm extends AbstractCommon {
         // --- 会进行重写 ---
     }
 
+    /** --- 将在 form 完全装载完后执行，如果已经装载完则立即执行 --- */
+    public ready(cb: () => void | Promise<void>): void {
+        // --- 会进行重写 ---
+        cb() as any;
+    }
+
     /** --- form hash 回退 --- */
-    public formHashBack(): void {
+    public async formHashBack(): Promise<void> {
         const v = this as any;
         if (!v.$data._historyHash.length) {
             if (v.$data._formHash) {
+                if (this.inStep) {
+                    if (!await clickgo.form.confirm({
+                        'taskId': this.taskId,
+                        'content': info.locale[this.locale].confirmExitStep
+                    })) {
+                        return;
+                    }
+                    this._inStep = false;
+                    this.refs.form.stepHide();
+                }
                 v.$data._formHash = '';
                 core.trigger('formHashChange', this.taskId, this.formId, '');
                 return;
@@ -455,6 +487,21 @@ export abstract class AbstractForm extends AbstractCommon {
             return;
         }
         const parent = v.$data._historyHash[v.$data._historyHash.length - 1];
+        if (this.inStep) {
+            if (this._stepValues.includes(parent)) {
+                this.refs.form.stepValue = parent;
+            }
+            else {
+                if (!await clickgo.form.confirm({
+                    'taskId': this.taskId,
+                    'content': info.locale[this.locale].confirmExitStep
+                })) {
+                    return;
+                }
+                this._inStep = false;
+                this.refs.form.stepHide();
+            }
+        }
         v.$data._formHash = parent;
         v.$data._historyHash.splice(-1);
         core.trigger('formHashChange', this.taskId, this.formId, parent);
@@ -472,27 +519,43 @@ export abstract class AbstractForm extends AbstractCommon {
         return this._inStep;
     }
 
-    /** --- 进入 form hash 为源的步进条（Dev 版） --- */
-    public enterStep(opt: {
-        /** --- 当前的步骤名 --- */
-        'name'?: string;
-        /** --- hash list，第一个必须为当前的 formHash --- */
-        'list': Array<{
-            /** --- 子步骤名 --- */
-            'name': string;
-            /** --- 步骤 hash --- */
-            'hash': string;
-        }>;
-    }): boolean {
+    /** --- 序列化后的 step value 值 --- */
+    private readonly _stepValues: string[] = [];
+
+    /** --- 进入 form hash 为源的步进条 --- */
+    public async enterStep(list: Array<{
+        /** --- 步骤 hash，第一个必须为当前 hash --- */
+        'value': string;
+        'label'?: string;
+        'icon'?: string;
+        'desc'?: string;
+    }>): Promise<boolean> {
         if (this._inStep) {
             return false;
         }
-        if (opt.list[0].hash !== this.formHash) {
+        if (list[0].value !== this.formHash) {
             return false;
         }
         // --- 进入当前页面步骤 ---
         this._inStep = true;
-        return false;
+        this._stepValues.length = 0;
+        for (const item of list) {
+            this._stepValues.push(item.value);
+        }
+        this.refs.form.stepData = list;
+        this.refs.form.stepValue = this.formHash;
+        await this.nextTick();
+        this.refs.form.stepShow();
+        return true;
+    }
+
+    /** --- 完成当前步骤条 --- */
+    public async doneStep(): Promise<void> {
+        if (!this._inStep) {
+            return;
+        }
+        this._inStep = false;
+        await this.refs.form.stepDone();
     }
 
     /** --- 当前是不是初次显示 --- */
@@ -1390,7 +1453,7 @@ export function getHash(formId: number): string {
 /**
  * --- 将窗体的 hash 退回上一个 ---
  */
-export function hashBack(formId: number): boolean {
+export async function hashBack(formId: number): Promise<boolean> {
     const taskId = getTaskId(formId);
     if (taskId === 0) {
         return false;
@@ -1403,7 +1466,7 @@ export function hashBack(formId: number): boolean {
     if (!item) {
         return false;
     }
-    item.vroot.formHashBack();
+    await item.vroot.formHashBack();
     return true;
 }
 
@@ -2889,6 +2952,32 @@ export async function create<T extends AbstractForm>(
             if (v === this._formHash) {
                 return;
             }
+            if (this.inStep) {
+                // --- 在 step 中，要判断 step 是否正确 ---
+                (async (): Promise<void> => {
+                    if (this._stepValues.includes(v)) {
+                        this.$refs.form.stepValue = v;
+                    }
+                    else {
+                        // --- 不应该 ---
+                        if (!await clickgo.form.confirm({
+                            'taskId': this.taskId,
+                            'content': info.locale[this.locale].confirmExitStep
+                        })) {
+                            return;
+                        }
+                        // --- 退出了 ---
+                        this._inStep = false;
+                        this.$refs.form.stepHide();
+                    }
+                    if (this._formHash) {
+                        this._historyHash.push(this._formHash);
+                    }
+                    this._formHash = v;
+                    core.trigger('formHashChange', t.id, formId, v);
+                })() as any;
+                return;
+            }
             if (this._formHash) {
                 this._historyHash.push(this._formHash);
             }
@@ -2907,6 +2996,15 @@ export async function create<T extends AbstractForm>(
             core.trigger('formShowInSystemTaskChange', t.id, formId, v);
         }
     };
+    // --- ready 方法 ---
+    const cbs: Array<() => void | Promise<void>> = [];
+    methods.ready = function(cb: () => void | Promise<void>): void {
+        if (this.isReady) {
+            cb() as any;
+            return;
+        }
+        cbs.push(cb);
+    };
 
     // --- 插入 dom ---
     elements.list.insertAdjacentHTML('beforeend', `<div class="cg-form-wrap" data-form-id="${formId.toString()}" data-task-id="${t.id.toString()}"></div>`);
@@ -3042,6 +3140,11 @@ export async function create<T extends AbstractForm>(
             rtn.vroot.$refs.form.setPropData('height', window.innerHeight);
         });
     }
+    // --- 完全创建完毕 ---
+    rtn.vroot.isReady = true;
+    for (const cb of cbs) {
+        cb.call(rtn.vroot) as any;
+    }
     return rtn.vroot as any;
 }
 

package/dist/lib/task.ts

@@ -710,7 +710,7 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
             getHash: function(formId: number): string {
                 return form.getHash(formId);
             },
-            hashBack: function(formId: number): boolean {
+            hashBack: function(formId: number): Promise<boolean> {
                 return form.hashBack(formId);
             },
             changeFocus: function(fid: number = 0): void {

package/package.json

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