w-web-perm 1.0.48 → 1.0.50

package/src/components/LayoutContentGrups.vue

@@ -39,6 +39,7 @@
 
             <!-- 功能區 -->
             <div
+                data-fmid="grups-toolbar"
                 style="padding:5px; border-top:1px solid #ddd; display:flex; align-items:center;"
                 _v-if="showIsEditable || isEditable"
             >
@@ -185,6 +186,7 @@
                         :iconColor="'#eee'"
                         :iconColorHover="'#fff'"
                         :shadow="false"
+                        :promiseUnlock="true"
                         @click="saveGrups"
                     ></WButtonCircle>
 
@@ -294,7 +296,6 @@ export default {
             mdiPencilOutline,
             mdiContentCopy,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -622,7 +623,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.snew.offsetWidth
             vo.panelHeight = msg.snew.offsetHeight
 
         },
@@ -1177,20 +1177,28 @@ export default {
 
         },
 
-        saveGrups: function() {
-            // console.log('method saveGrups')
+        saveGrups: function(msg) {
 
             let vo = this
 
-            async function core() {
-                let errTemp = null
+            //第一行立刻釋放按鈕視覺鎖
+            msg.pm.resolve()
 
-                //show loading
-                vo.$ui.updateLoading(true)
+            //fire-and-forget, 不 await
+            vo.doSaveGrups()
 
-                //check
+        },
+
+        doSaveGrups: function() {
+            // console.log('method doSaveGrups')
+
+            let vo = this
+
+            async function core() {
+
+                //1) 同步檢測 (在開 loading 之前)
                 if (isestr(vo.isError)) {
-                    vo.$alert(`${vo.isError}`, { type: 'error' })
+                    await vo.$dg.showCheckYes(`${vo.isError}`)
                     return
                 }
 
@@ -1199,35 +1207,34 @@ export default {
 
                 //check
                 if (size(rows) === 0) {
-                    vo.$alert(`${vo.$t('grupAddEmpty')}`, { type: 'error' })
+                    await vo.$dg.showCheckYes(`${vo.$t('grupAddEmpty')}`)
                     return
                 }
 
-                //updateGrups
+                //2) 確定打 API 才開 loading
+                vo.$ui.updateLoading(true)
+
+                //3) updateGrups, 各自 catch + 旗標短路
+                let okSave = false
                 await vo.$fapi.updateGrups(rows)
-                    .catch((err) => {
-                        errTemp = err
+                    .then(() => { okSave = true })
+                    .catch(async (err) => {
+                        vo.$ui.updateLoading(false) //showCheckYes 前關 loading（modal 阻斷期間避免 loading 疊在底下）
+                        await vo.$dg.showCheckYes(`${vo.$t('grupSaveGrupsFail')}: ${vo.$tErr(err)}`)
                     })
-
-                //check
-                if (errTemp !== null) {
-                    vo.$alert(`${vo.$t('grupSaveGrupsFail')}: ${errTemp}`, { type: 'error' })
-                    return
-                }
+                if (!okSave) return
 
                 //isModified
                 vo.isModified = false
 
-                //alert
-                vo.$alert(vo.$t('grupSaveGrupsSuccess'))
+                //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
+                vo.$ui.updateLoading(false)
+                await vo.$dg.showCheckYes(vo.$t('grupSaveGrupsSuccess'), { type: 'success' })
 
             }
 
             //core
             core()
-                // .then((res) => {
-                //     console.log('then', res)
-                // })
                 .catch((err) => {
                     console.log('catch', err)
                     vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' })

package/src/components/LayoutContentPemis.vue

@@ -39,6 +39,7 @@
 
             <!-- 功能區 -->
             <div
+                data-fmid="pemis-toolbar"
                 style="padding:5px; border-top:1px solid #ddd; display:flex; align-items:center;"
                 _v-if="showIsEditable || isEditable"
             >
@@ -185,6 +186,7 @@
                         :iconColor="'#eee'"
                         :iconColorHover="'#fff'"
                         :shadow="false"
+                        :promiseUnlock="true"
                         @click="savePemis"
                     ></WButtonCircle>
 
@@ -294,7 +296,6 @@ export default {
             mdiPencilOutline,
             mdiContentCopy,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -622,7 +623,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.snew.offsetWidth
             vo.panelHeight = msg.snew.offsetHeight
 
         },
@@ -1179,20 +1179,28 @@ export default {
 
         },
 
-        savePemis: function() {
-            // console.log('method savePemis')
+        savePemis: function(msg) {
 
             let vo = this
 
-            async function core() {
-                let errTemp = null
+            //第一行立刻釋放按鈕視覺鎖
+            msg.pm.resolve()
 
-                //show loading
-                vo.$ui.updateLoading(true)
+            //fire-and-forget, 不 await
+            vo.doSavePemis()
 
-                //check
+        },
+
+        doSavePemis: function() {
+            // console.log('method doSavePemis')
+
+            let vo = this
+
+            async function core() {
+
+                //1) 同步檢測 (在開 loading 之前)
                 if (isestr(vo.isError)) {
-                    vo.$alert(`${vo.isError}`, { type: 'error' })
+                    await vo.$dg.showCheckYes(`${vo.isError}`)
                     return
                 }
 
@@ -1201,35 +1209,34 @@ export default {
 
                 //check
                 if (size(rows) === 0) {
-                    vo.$alert(`${vo.$t('pemiAddEmpty')}`, { type: 'error' })
+                    await vo.$dg.showCheckYes(`${vo.$t('pemiAddEmpty')}`)
                     return
                 }
 
-                //updatePemis
+                //2) 確定打 API 才開 loading
+                vo.$ui.updateLoading(true)
+
+                //3) updatePemis, 各自 catch + 旗標短路
+                let okSave = false
                 await vo.$fapi.updatePemis(rows)
-                    .catch((err) => {
-                        errTemp = err
+                    .then(() => { okSave = true })
+                    .catch(async (err) => {
+                        vo.$ui.updateLoading(false) //showCheckYes 前關 loading（modal 阻斷期間避免 loading 疊在底下）
+                        await vo.$dg.showCheckYes(`${vo.$t('pemiSavePemisFail')}: ${vo.$tErr(err)}`)
                     })
-
-                //check
-                if (errTemp !== null) {
-                    vo.$alert(`${vo.$t('pemiSavePemisFail')}: ${errTemp}`, { type: 'error' })
-                    return
-                }
+                if (!okSave) return
 
                 //isModified
                 vo.isModified = false
 
-                //alert
-                vo.$alert(vo.$t('pemiSavePemisSuccess'))
+                //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
+                vo.$ui.updateLoading(false)
+                await vo.$dg.showCheckYes(vo.$t('pemiSavePemisSuccess'), { type: 'success' })
 
             }
 
             //core
             core()
-                // .then((res) => {
-                //     console.log('then', res)
-                // })
                 .catch((err) => {
                     console.log('catch', err)
                     vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' })