w-web-perm 1.1.12 → 1.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +158 -123
- package/dist/css/app.f09c7433.css +1 -0
- package/dist/index.tmp +1 -1
- package/dist/js/app-legacy.8af87052.js +1 -0
- package/dist/js/app.8af87052.js +1 -0
- package/dist/js/{chunk-vendors.3e9e3ef1.js → chunk-vendors-legacy.ece5a361.js} +1 -1
- package/dist/js/{chunk-vendors-legacy.3e9e3ef1.js → chunk-vendors.ece5a361.js} +1 -1
- package/dist/w-web-perm.umd.js +2 -2
- package/dist/w-web-perm.umd.js.map +1 -1
- package/docs/WWebPerm.html +84 -4
- package/docs/global.html +23023 -1125
- package/docs/index.html +2 -2
- package/docs/server_WWebPerm.mjs.html +232 -32
- package/docs/server_cascadeWrite.mjs.html +225 -0
- package/docs/server_dataChannel.mjs.html +2 -2
- package/docs/server_keyCheck.mjs.html +353 -0
- package/docs/server_lockSave.mjs.html +2 -2
- package/docs/server_maskLog.mjs.html +2 -2
- package/docs/server_procCore.mjs.html +180 -41
- package/docs/server_staLogs_resolveShellWorker.mjs.html +2 -2
- package/docs/server_syncKeep.mjs.html +311 -0
- package/docs/server_tools_authRefsAudit.mjs.html +247 -0
- package/docs/server_tools_authRefsClean.mjs.html +335 -0
- package/docs/server_tools_fromTools.mjs.html +797 -0
- package/docs/server_tools_isMain.mjs.html +103 -0
- package/docs/server_tools_nameDupReport.mjs.html +280 -0
- package/docs/server_validateRows.mjs.html +2 -2
- package/docs/server_wrapInjected.mjs.html +3 -3
- package/docs/src_fetchJson.mjs.html +2 -2
- package/docs/src_js_cvKpToArr.mjs.html +2 -2
- package/docs/src_js_cvKpToObj.mjs.html +44 -33
- package/docs/src_js_draftSync.mjs.html +142 -0
- package/docs/src_js_eachOwn.mjs.html +3 -3
- package/docs/src_js_editorRefRows.mjs.html +356 -0
- package/docs/src_js_externalRows.mjs.html +338 -0
- package/docs/src_js_externalUi.mjs.html +230 -0
- package/docs/src_js_findRefRows.mjs.html +107 -0
- package/docs/src_js_findTouchedDup.mjs.html +150 -0
- package/docs/src_js_fmtLossyMsg.mjs.html +2 -2
- package/docs/src_js_fromAudit.mjs.html +489 -0
- package/docs/src_js_getAddImpact.mjs.html +269 -0
- package/docs/src_js_getAuthWarn.mjs.html +463 -0
- package/docs/src_js_getCascadePreview.mjs.html +258 -0
- package/docs/src_js_getDelRefCount.mjs.html +210 -0
- package/docs/src_js_getEffMode.mjs.html +92 -0
- package/docs/src_js_getKpLossy.mjs.html +47 -52
- package/docs/src_js_getNameErrs.mjs.html +266 -0
- package/docs/src_js_getOwn.mjs.html +3 -3
- package/docs/src_js_getPropKey.mjs.html +109 -0
- package/docs/src_js_getRuleEnable.mjs.html +2 -2
- package/docs/src_js_isAuthMode.mjs.html +4 -4
- package/docs/src_js_joinNames.mjs.html +2 -2
- package/docs/src_js_legendFit.mjs.html +2 -2
- package/docs/src_js_pairRowsToSnapshot.mjs.html +156 -0
- package/docs/src_js_refAudit.mjs.html +359 -0
- package/docs/src_js_refCascade.mjs.html +572 -0
- package/docs/src_js_relDialogSend.mjs.html +199 -0
- package/docs/src_js_rowDigest.mjs.html +265 -0
- package/docs/src_plugins_dataReloadGuard.mjs.html +109 -0
- package/docs/src_plugins_reuseDeletedIds.mjs.html +2 -2
- package/docs/src_plugins_submitGuard.mjs.html +2 -2
- package/g_authRefsClean.mjs +79 -0
- package/g_fixFromType.mjs +92 -0
- package/g_initialData.mjs +3 -3
- package/g_purgeFrom.mjs +127 -0
- package/package.json +1 -1
- package/server/WWebPerm.mjs +230 -30
- package/server/cascadeWrite.mjs +153 -0
- package/server/keyCheck.mjs +281 -0
- package/server/procCore.mjs +178 -39
- package/server/procLang.mjs +270 -3
- package/server/syncKeep.mjs +239 -0
- package/server/tools/authRefsAudit.mjs +175 -0
- package/server/tools/authRefsClean.mjs +263 -0
- package/server/tools/fromTools.mjs +725 -0
- package/server/tools/isMain.mjs +31 -0
- package/server/tools/nameDupReport.mjs +208 -0
- package/server/wrapInjected.mjs +1 -1
- package/src/components/LayoutContentGrups.vue +396 -75
- package/src/components/LayoutContentPemis.vue +395 -75
- package/src/components/LayoutContentTargets.vue +261 -25
- package/src/components/LayoutContentUsers.vue +334 -97
- package/src/components/VeCgrups.vue +88 -129
- package/src/components/VeCpemis.vue +86 -129
- package/src/components/VeCrules.vue +15 -5
- package/src/components/VeGrupBlngUsers.vue +202 -89
- package/src/components/VePemiBlngGrups.vue +209 -99
- package/src/js/cvKpToObj.mjs +42 -31
- package/src/js/draftSync.mjs +70 -0
- package/src/js/eachOwn.mjs +1 -1
- package/src/js/editorRefRows.mjs +284 -0
- package/src/js/externalRows.mjs +266 -0
- package/src/js/externalUi.mjs +158 -0
- package/src/js/findRefRows.mjs +35 -0
- package/src/js/findTouchedDup.mjs +78 -0
- package/src/js/fromAudit.mjs +417 -0
- package/src/js/getAddImpact.mjs +197 -0
- package/src/js/getAuthWarn.mjs +391 -0
- package/src/js/getCascadePreview.mjs +186 -0
- package/src/js/getDelRefCount.mjs +138 -0
- package/src/js/getEffMode.mjs +20 -0
- package/src/js/getKpLossy.mjs +44 -49
- package/src/js/getNameErrs.mjs +194 -0
- package/src/js/getOwn.mjs +1 -1
- package/src/js/getPropKey.mjs +37 -0
- package/src/js/isAuthMode.mjs +2 -2
- package/src/js/pairRowsToSnapshot.mjs +84 -0
- package/src/js/refAudit.mjs +287 -0
- package/src/js/refCascade.mjs +500 -0
- package/src/js/relDialogSend.mjs +127 -0
- package/src/js/rowDigest.mjs +193 -0
- package/src/plugins/dataReloadGuard.mjs +37 -0
- package/src/plugins/mShare.mjs +144 -140
- package/src/plugins/mUI.mjs +3 -8
- package/src/schema/tables/users.mjs +152 -152
- package/dist/css/app.6918ec45.css +0 -1
- package/dist/js/app-legacy.7cb7e394.js +0 -1
- package/dist/js/app.7cb7e394.js +0 -1
- package/docs/src_js_getKeyOrderLost.mjs.html +0 -121
- package/docs/src_js_getKpWriteLost.mjs.html +0 -100
- package/docs/src_js_keepKeyOrder.mjs.html +0 -139
- package/src/js/getKeyOrderLost.mjs +0 -49
- package/src/js/getKpWriteLost.mjs +0 -28
- package/src/js/keepKeyOrder.mjs +0 -67
|
@@ -198,6 +198,30 @@
|
|
|
198
198
|
|
|
199
199
|
</div>
|
|
200
200
|
|
|
201
|
+
<!-- 外部列提示與外部同步警示橫幅(bannerLines 為空時 v-for 不渲染任何節點, 畫面與 DOM 同未啟用前) -->
|
|
202
|
+
<div
|
|
203
|
+
v-for="(b, kb) in bannerLines"
|
|
204
|
+
:key="kb"
|
|
205
|
+
:data-fmid="`grups-banner-${b.kind}`"
|
|
206
|
+
:style="getBannerStyle(b.kind)"
|
|
207
|
+
>
|
|
208
|
+
<svg v-if="b.kind==='ext'" style="vertical-align:sub; margin-right:4px;" width="16" height="16" viewBox="0 0 24 24"><path :d="mdiLock" fill="#666"></path></svg>
|
|
209
|
+
<img v-else style="vertical-align:sub; width:16px; height:16px; margin-right:4px;" :src="$ui.getIcon('warning')" />
|
|
210
|
+
<span>{{ b.text }}</span>
|
|
211
|
+
</div>
|
|
212
|
+
|
|
213
|
+
<!-- 資料已被更新提示(R-PRINCIPLE-00 原則 7): 有未存編輯而他人或外部同步改了本表時, 保留草稿並提示, 存檔將被伺服端拒收; 以 v-for 渲染(無提示時不渲染任何節點, 畫面與 DOM 同未啟用前) -->
|
|
214
|
+
<div
|
|
215
|
+
v-for="ks in (staleNotice ? 1 : 0)"
|
|
216
|
+
:key="`stale-${ks}`"
|
|
217
|
+
data-fmid="grups-banner-stale"
|
|
218
|
+
:style="getBannerStyle('warn')"
|
|
219
|
+
>
|
|
220
|
+
<img style="vertical-align:sub; width:16px; height:16px; margin-right:4px;" :src="$ui.getIcon('warning')" />
|
|
221
|
+
<span>{{ $t('staleDraftNotice') }}</span>
|
|
222
|
+
<button class="staleReloadBtn" data-fmid="grups-banner-stale-reload" @click="reloadDraft">{{ $t('staleDraftReload') }}</button>
|
|
223
|
+
</div>
|
|
224
|
+
|
|
201
225
|
</div>
|
|
202
226
|
|
|
203
227
|
<template
|
|
@@ -213,10 +237,15 @@
|
|
|
213
237
|
>
|
|
214
238
|
<template v-slot:cell-render="props">
|
|
215
239
|
<template v-if="props.key==='name'">
|
|
240
|
+
<span v-for="loc in lockOfRow(props.row)" :key="loc.from" :title="getLockTitle(loc)" style="margin-right:4px;"><svg style="vertical-align:sub;" width="16" height="16" viewBox="0 0 24 24"><path :d="mdiLock" fill="#666"></path></svg></span>
|
|
216
241
|
<span v-if="errItemsByName[props.value]" :title="errItemsByName[props.value]">
|
|
217
242
|
<span style="color:#F57C00;">{{ props.value }}</span>
|
|
218
243
|
<img style="vertical-align:sub; width:16px; height:16px;" :src="$ui.getIcon('warning')" />
|
|
219
244
|
</span>
|
|
245
|
+
<span v-else-if="warnItemsByName[props.value]" :title="warnItemsByName[props.value]">
|
|
246
|
+
<img style="vertical-align:sub; width:16px; height:16px; margin-right:4px;" :src="$ui.getIcon('warning')" />
|
|
247
|
+
<span style="color:#F57C00;">{{ props.value }}</span>
|
|
248
|
+
</span>
|
|
220
249
|
<span v-else>{{ props.value }}</span>
|
|
221
250
|
</template>
|
|
222
251
|
<template v-else-if="props.key==='belongUsers'">
|
|
@@ -225,7 +254,13 @@
|
|
|
225
254
|
</div>
|
|
226
255
|
</template>
|
|
227
256
|
<template v-else-if="props.key==='cpemis'">
|
|
228
|
-
<div @click.stop.prevent @mousedown.stop.prevent>
|
|
257
|
+
<div v-if="warnCpemisById[props.row.id]" style="display:flex; align-items:center; gap:4px;" @click.stop.prevent @mousedown.stop.prevent>
|
|
258
|
+
<span :title="warnCpemisById[props.row.id]" style="display:flex; align-items:center; flex:0 0 auto;">
|
|
259
|
+
<img style="vertical-align:sub; width:16px; height:16px;" :src="$ui.getIcon('warning')" />
|
|
260
|
+
</span>
|
|
261
|
+
<button style="flex:1 1 auto; min-width:0; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;" @click="$dg.showVeCpemisById(props.row.id)">{{ getCpemisText(props.value) }}</button>
|
|
262
|
+
</div>
|
|
263
|
+
<div v-else @click.stop.prevent @mousedown.stop.prevent>
|
|
229
264
|
<button style="width:100%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;" @click="$dg.showVeCpemisById(props.row.id)">{{ getCpemisText(props.value) }}</button>
|
|
230
265
|
</div>
|
|
231
266
|
</template>
|
|
@@ -247,7 +282,7 @@
|
|
|
247
282
|
</template>
|
|
248
283
|
|
|
249
284
|
<script>
|
|
250
|
-
import { mdiSelectGroup, mdiVectorPolylinePlus, mdiCheckboxMarkedCircle, mdiCloudUploadOutline, mdiTrashCanOutline, mdiTableHeadersEye, mdiPlus, mdiPencilOutline, mdiContentCopy } from '@mdi/js/mdi.js'
|
|
285
|
+
import { mdiSelectGroup, mdiVectorPolylinePlus, mdiCheckboxMarkedCircle, mdiCloudUploadOutline, mdiTrashCanOutline, mdiTableHeadersEye, mdiPlus, mdiPencilOutline, mdiContentCopy, mdiLock } from '@mdi/js/mdi.js'
|
|
251
286
|
import JSON5 from 'json5'
|
|
252
287
|
import get from 'lodash-es/get.js'
|
|
253
288
|
import set from 'lodash-es/set.js'
|
|
@@ -265,6 +300,15 @@ import cdbl from 'wsemi/src/cdbl.mjs'
|
|
|
265
300
|
import arrPull from 'wsemi/src/arrPull.mjs'
|
|
266
301
|
import eachOwn from '../js/eachOwn.mjs'
|
|
267
302
|
import cvKpToObj from '../js/cvKpToObj.mjs'
|
|
303
|
+
import { getRefWarns, getRefWarnText, fmtWarn } from '../js/getAuthWarn.mjs'
|
|
304
|
+
import { getNameErrs, mapNameKp } from '../js/getNameErrs.mjs'
|
|
305
|
+
import { getDelImpact, getDelConfirmText } from '../js/getDelRefCount.mjs'
|
|
306
|
+
import { getSavePreview } from '../js/getCascadePreview.mjs'
|
|
307
|
+
import { getAddImpact, getAddConfirmText } from '../js/getAddImpact.mjs'
|
|
308
|
+
import { isExternalRow } from '../js/externalRows.mjs'
|
|
309
|
+
import { makeBaseline } from '../js/rowDigest.mjs'
|
|
310
|
+
import { refsChanged, planDraftSync, isDraftStale } from '../js/draftSync.mjs'
|
|
311
|
+
import { fmtVars, getBannerLines, splitCheckedRows, getExternalEdits } from '../js/externalUi.mjs'
|
|
268
312
|
import WIcon from 'w-component-vue/src/components/WIcon.vue'
|
|
269
313
|
import WSwitch from 'w-component-vue/src/components/WSwitch.vue'
|
|
270
314
|
import WButtonCircle from 'w-component-vue/src/components/WButtonCircle.vue'
|
|
@@ -299,6 +343,7 @@ export default {
|
|
|
299
343
|
mdiPlus,
|
|
300
344
|
mdiPencilOutline,
|
|
301
345
|
mdiContentCopy,
|
|
346
|
+
mdiLock,
|
|
302
347
|
|
|
303
348
|
panelHeight: 100,
|
|
304
349
|
headHeight: 100,
|
|
@@ -306,6 +351,7 @@ export default {
|
|
|
306
351
|
firstLoading: true,
|
|
307
352
|
firstSetting: true,
|
|
308
353
|
systemProcing: false, //程式端載入/重載清單資料期間為 true, 用於排除非使用者操作之 rowsChange (見 $ui.markDataReload)
|
|
354
|
+
postSaving: false, //儲存成功後至成功訊息框關閉(再加短暫緩衝)期間為 true: 刪除或改名連帶更新引用端表(ADR-036), 一次儲存使 store 先後推播兩張表而多次重建清單, 其後非同步觸發之 rowsChange 不得視為使用者變更(markDataReload 之 1ms 窗口可能短於 ag-grid 渲染, 儲存鈕殘留的間歇現象); 成功訊息框期間使用者無從編輯
|
|
309
355
|
showIsEditable: false,
|
|
310
356
|
isEditable: false,
|
|
311
357
|
isModified: false,
|
|
@@ -349,11 +395,22 @@ export default {
|
|
|
349
395
|
widthGrupsDescription: null,
|
|
350
396
|
|
|
351
397
|
items: [],
|
|
398
|
+
baseline: [], //載入基準([[id, 內容指紋]]): 與 items 於 changeParams 同一處由同一份來源列產生(草稿所依據之版本), 存檔時隨 RPC 送伺服端比對是否過期(F-26, R-BASELINE-01); 不得於存檔當下由最新 store 重算
|
|
399
|
+
baseRows: [], //草稿所依據之那份 store 列(與 baseline 同時產生): 存檔前之預覽、外部列守門以它為「舊」, 不用已變新之 store(有未存編輯時 store 可能已被推播更新, 見 draftSync)
|
|
400
|
+
staleNotice: false, //草稿所依據之整表已被他人/外部同步更新(R-PRINCIPLE-00 原則 7): true 時顯示「資料已被更新」橫幅與重新載入鈕
|
|
401
|
+
syncTick: 0, //重新載入觸發器(reloadDraft 遞增): changeParams 讀它而於重算時於 computed 內重建草稿, 使 genOpt 讀取之反應式來源(語系等)的依賴重新收集——保留草稿(keep)時 changeParams 不呼叫 genOpt, 依賴會收縮, 若在 computed 外直接重建則不會恢復(外審 sol 第 4 點)
|
|
352
402
|
itemsCheck: [],
|
|
353
403
|
opt: null,
|
|
354
404
|
|
|
355
405
|
}
|
|
356
406
|
},
|
|
407
|
+
created: function() {
|
|
408
|
+
//syncMark(非響應式; changeParams 讀它而不因它建立響應式依賴, 見 draftSync.planDraftSync): refs/editable 為上次建立草稿時之各表 store 參照與編輯模式, dirty 為未存編輯旗標(isModified)之鏡像(由 watch 維護),
|
|
409
|
+
//baseline 為草稿載入時之基準之副本(供保留草稿時判定是否已過期). 不讓 changeParams 依賴 isModified/baseline: 旗標切換或重新載入不得觸發它重算(其重算=重建草稿, 見 draftSync)
|
|
410
|
+
this.syncMark = { refs: null, editable: undefined, dirty: false, baseline: [], tick: 0 }
|
|
411
|
+
//saveMark(非響應式, 同 syncMark 之理由): saving 為「自己之存檔請求進行中」(送出前設真, 回應〔成功或失敗〕一到歸零)——此期間伺服端寫入所致之推播若先於回應抵達, 不是他人更新(planDraftSync 回 'keepQuiet': 保留草稿但不顯示過期橫幅; run12)
|
|
412
|
+
this.saveMark = { saving: false }
|
|
413
|
+
},
|
|
357
414
|
mounted: function() {
|
|
358
415
|
// console.log('mounted')
|
|
359
416
|
|
|
@@ -384,6 +441,17 @@ export default {
|
|
|
384
441
|
}
|
|
385
442
|
|
|
386
443
|
},
|
|
444
|
+
watch: {
|
|
445
|
+
//未存編輯旗標: 維護 syncMark.dirty 鏡像(changeParams 以之判斷「有未存編輯」而不依賴旗標本身). 旗標歸零(已儲存或已放棄)而 store 於保留草稿期間已變新者, 立即依最新 store 重建
|
|
446
|
+
//(儲存成功之推播若先於儲存回應抵達, 其時有未存編輯而被保留; 回應回來旗標歸零時須補上這次重建, 否則畫面停在儲存前之草稿而基準已過期)
|
|
447
|
+
isModified: function(b) {
|
|
448
|
+
let vo = this
|
|
449
|
+
vo.syncMark.dirty = b === true
|
|
450
|
+
if (b !== true && vo.syncMark.refs !== null && refsChanged(vo.syncMark.refs, vo.curRefs())) {
|
|
451
|
+
vo.reloadDraft()
|
|
452
|
+
}
|
|
453
|
+
},
|
|
454
|
+
},
|
|
387
455
|
computed: {
|
|
388
456
|
|
|
389
457
|
syncState: function() {
|
|
@@ -494,6 +562,22 @@ export default {
|
|
|
494
562
|
return kp
|
|
495
563
|
},
|
|
496
564
|
|
|
565
|
+
lockExternalRows: function() {
|
|
566
|
+
//後台是否不得改外部列(from 為非空字串者; 伺服端 opt.lockExternalRows 經 getWebInfor 帶來, 'y'/'n'; 舊伺服端無此鍵視為未啟用)
|
|
567
|
+
return get(this, 'webInfor.lockExternalRows', '')
|
|
568
|
+
},
|
|
569
|
+
|
|
570
|
+
isLockExternal: function() {
|
|
571
|
+
return this.lockExternalRows === 'y'
|
|
572
|
+
},
|
|
573
|
+
|
|
574
|
+
bannerLines: function() {
|
|
575
|
+
let vo = this
|
|
576
|
+
|
|
577
|
+
//清單上方橫幅各行: 外部列提示(啟用保護且有外部列)+本表之外部同步警示(疑似 id 重編); 皆無為空陣列, 不渲染任何節點
|
|
578
|
+
return getBannerLines({ keyTable: 'grups', kind: 'Grup', rows: vo.grups, lock: vo.isLockExternal, syncWarns: get(vo, 'webInfor.syncWarns', []), $t: (k) => vo.$t(k) })
|
|
579
|
+
},
|
|
580
|
+
|
|
497
581
|
changeParams: function() {
|
|
498
582
|
// console.log('computed changeParams')
|
|
499
583
|
|
|
@@ -501,20 +585,24 @@ export default {
|
|
|
501
585
|
|
|
502
586
|
//trigger
|
|
503
587
|
let isEditable = vo.isEditable
|
|
504
|
-
let
|
|
505
|
-
let
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
588
|
+
let rows = vo.grups
|
|
589
|
+
let kpUse = vo.kpUseGrupUser
|
|
590
|
+
|
|
591
|
+
//草稿同步(R-PRINCIPLE-00 原則 7, draftSync.planDraftSync): store(本表或使用者表)變新(推播)時, 無未存編輯 → 重建 items 與基準(同修改前); 有未存編輯 → 保留草稿與其載入時之基準, 不重建;
|
|
592
|
+
//提示「資料已被更新」只看本表基準(儲存群組只寫群組表; 使用者表之變動只影響顯示用之所屬使用者欄)
|
|
593
|
+
let act = planDraftSync({
|
|
594
|
+
first: vo.syncMark.refs === null || vo.syncMark.tick !== vo.syncTick, //首次載入或使用者按了「重新載入」(syncTick 遞增)
|
|
595
|
+
editChanged: vo.syncMark.editable !== isEditable,
|
|
596
|
+
storeChanged: refsChanged(vo.syncMark.refs, [rows, kpUse]),
|
|
597
|
+
hasDraft: () => vo.syncMark.dirty === true,
|
|
598
|
+
saving: () => vo.saveMark.saving === true, //自己之存檔請求進行中所致之推播 → 'keepQuiet'(不改過期提示)
|
|
599
|
+
})
|
|
600
|
+
if (act === 'rebuild') {
|
|
601
|
+
vo.rebuildDraft(rows, kpUse, isEditable)
|
|
602
|
+
}
|
|
603
|
+
else if (act === 'keep') {
|
|
604
|
+
vo.staleNotice = isDraftStale({ keys: vo.$ds.grups.keys, rows, baseline: vo.syncMark.baseline })
|
|
605
|
+
}
|
|
518
606
|
|
|
519
607
|
return ''
|
|
520
608
|
},
|
|
@@ -547,44 +635,51 @@ export default {
|
|
|
547
635
|
return b
|
|
548
636
|
},
|
|
549
637
|
|
|
550
|
-
|
|
638
|
+
nameErrs: function() {
|
|
551
639
|
let vo = this
|
|
552
640
|
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
let kpErr = Object.create(null)
|
|
558
|
-
let kpName = Object.create(null)
|
|
559
|
-
each(rows, (v, k) => {
|
|
560
|
-
|
|
561
|
-
//name
|
|
562
|
-
let name = get(v, 'name', '')
|
|
563
|
-
|
|
564
|
-
//check
|
|
565
|
-
if (!isestr(name)) {
|
|
641
|
+
//名稱擋存只針對「本次造成或觸及」者, 庫內既有的歷史同名(僅外部同步可造成)不擋、改為警告圖示(R-PRINCIPLE-00 g, R-NAME-UNIQ-02);
|
|
642
|
+
//判準與伺服端同一份(findTouchedDup), 基準為 store 之 grups(最近一次由伺服端載入的列, 儲存成功後 store 推播更新, 基準隨之更新)
|
|
643
|
+
return getNameErrs(get(vo, 'opt.rows', []), vo.baseRows, 'name')
|
|
644
|
+
},
|
|
566
645
|
|
|
567
|
-
|
|
568
|
-
|
|
646
|
+
errItemsByName: function() {
|
|
647
|
+
let vo = this
|
|
569
648
|
|
|
570
|
-
|
|
649
|
+
//擋存者(空名稱、本次造成或觸及之重複): 既有呈現(橘色名稱+圖示), 決定 isError;
|
|
650
|
+
//重複者之一為外部列(from 非空)時, 提示改為「外部來源 X 已使用此名稱」(dupExternal; 外部列由外部擁有, 須改自己之名稱)
|
|
651
|
+
return mapNameKp(vo.nameErrs.errBlock, (kind, name) => {
|
|
652
|
+
if (kind === 'dup' && name in vo.nameErrs.dupExternal) {
|
|
653
|
+
return fmtVars(vo.$t('nameUsedByExternal'), { name, from: vo.nameErrs.dupExternal[name] })
|
|
571
654
|
}
|
|
655
|
+
return vo.$t(kind === 'empty' ? `grupNameEmpty` : `grupNameDuplicate`)
|
|
656
|
+
})
|
|
657
|
+
},
|
|
572
658
|
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
//kpErr
|
|
577
|
-
kpErr[name] = vo.$t(`grupNameDuplicate`)
|
|
659
|
+
warnItemsByName: function() {
|
|
660
|
+
let vo = this
|
|
578
661
|
|
|
579
|
-
|
|
580
|
-
|
|
662
|
+
//歷史同名(不擋存, 與 errItemsByName 互斥): 同樣顯示橘色名稱+圖示, tooltip 說明為既有重複
|
|
663
|
+
return mapNameKp(vo.nameErrs.warnHist, (n) => {
|
|
664
|
+
return fmtWarn(vo.$t('warnNameHistDup'), { n })
|
|
665
|
+
})
|
|
666
|
+
},
|
|
581
667
|
|
|
582
|
-
|
|
583
|
-
|
|
668
|
+
warnCpemisById: function() {
|
|
669
|
+
let vo = this
|
|
584
670
|
|
|
671
|
+
//cpemis 引用清單之衝突提示(R-PRINCIPLE-00 b、c、d、e、f): 列 id → tooltip 文字, 只含有衝突之列(無衝突之列不入表, 畫面維持原樣);
|
|
672
|
+
//引用比對的被引用表為 store 之 pemis(權限頁已儲存之列), 判準與伺服端 getUserRules 同一份(findRefRows)
|
|
673
|
+
let kp = Object.create(null)
|
|
674
|
+
let rows = get(vo, 'opt.rows', [])
|
|
675
|
+
each(rows, (r) => {
|
|
676
|
+
let res = getRefWarns(get(r, 'cpemis', ''), vo.pemis)
|
|
677
|
+
if (res.hasWarn) {
|
|
678
|
+
kp[get(r, 'id', '')] = getRefWarnText(res, (k) => vo.$t(k), 'warnKindPemi')
|
|
679
|
+
}
|
|
585
680
|
})
|
|
586
681
|
|
|
587
|
-
return
|
|
682
|
+
return kp
|
|
588
683
|
},
|
|
589
684
|
|
|
590
685
|
isError: function() {
|
|
@@ -652,6 +747,72 @@ export default {
|
|
|
652
747
|
return head
|
|
653
748
|
},
|
|
654
749
|
|
|
750
|
+
lockOfRow: function(row) {
|
|
751
|
+
let vo = this
|
|
752
|
+
|
|
753
|
+
//啟用外部列保護且該列為外部列者回 [{ from }](首欄顯示鎖頭), 否則回空陣列(供 v-for 渲染 0 或 1 個節點: 無外部列時 DOM 同未啟用前, 不留 v-if 之註解節點)
|
|
754
|
+
if (vo.isLockExternal && isExternalRow(row)) {
|
|
755
|
+
return [{ from: row.from }]
|
|
756
|
+
}
|
|
757
|
+
return []
|
|
758
|
+
},
|
|
759
|
+
|
|
760
|
+
getLockTitle: function(loc) {
|
|
761
|
+
let vo = this
|
|
762
|
+
|
|
763
|
+
return fmtVars(vo.$t('externalRowLocked'), { from: loc.from })
|
|
764
|
+
},
|
|
765
|
+
|
|
766
|
+
getBannerStyle: function(kind) {
|
|
767
|
+
|
|
768
|
+
//橫幅樣式沿用既有色票與間距: 與功能區同為 border-top:1px solid #ddd; 字級 0.8rem(同副標題/waitingData)、水平內距 15px(同 waitingData)、垂直內距 5px(同功能區 padding:5px);
|
|
769
|
+
//外部列提示為中性灰底(#f2f2f2, 同按鈕 hover 底)、文字 #444(同工具鈕圖示色); 外部同步警示為淡橘底(#FFE0B2, 同編輯模式開關之橫條色)搭既有警告圖示; 長來源名稱以 overflow-wrap:anywhere 折行, 窄螢幕不溢出
|
|
770
|
+
let bg = kind === 'warn' ? '#FFE0B2' : '#f2f2f2'
|
|
771
|
+
return `padding:5px 15px; border-top:1px solid #ddd; background:${bg}; color:#444; font-size:0.8rem; overflow-wrap:anywhere;`
|
|
772
|
+
},
|
|
773
|
+
|
|
774
|
+
rebuildDraft: function(rows, kpUse, isEditable) {
|
|
775
|
+
let vo = this
|
|
776
|
+
|
|
777
|
+
//grups, kpUseGrupUser
|
|
778
|
+
let grups = cloneDeep(rows)
|
|
779
|
+
let kpUseGrupUser = cloneDeep(kpUse)
|
|
780
|
+
|
|
781
|
+
//baseline, 與 items 同一處由同一份來源列(grups, genItems 之前)計算: 草稿所依據之版本(F-26), 重建 items 時一併更新, 存檔時不重算
|
|
782
|
+
let baseline = makeBaseline(grups, vo.$ds.grups.keys)
|
|
783
|
+
|
|
784
|
+
//items
|
|
785
|
+
let items = vo.genItems(grups, kpUseGrupUser)
|
|
786
|
+
|
|
787
|
+
//save; 重建即放棄未存編輯(isModified 歸零)與過期提示, syncMark 記下本次所依據之 store 參照與編輯模式
|
|
788
|
+
vo.items = items
|
|
789
|
+
vo.baseline = baseline
|
|
790
|
+
vo.baseRows = rows
|
|
791
|
+
vo.isModified = false
|
|
792
|
+
vo.staleNotice = false
|
|
793
|
+
vo.syncMark = { refs: [rows, kpUse], editable: isEditable, dirty: false, baseline, tick: vo.syncTick }
|
|
794
|
+
|
|
795
|
+
//genOpt
|
|
796
|
+
vo.genOpt({ isEditable })
|
|
797
|
+
|
|
798
|
+
//firstLoading
|
|
799
|
+
vo.firstLoading = false
|
|
800
|
+
|
|
801
|
+
},
|
|
802
|
+
|
|
803
|
+
curRefs: function() {
|
|
804
|
+
//目前各來源 store 之參照(與 changeParams 之 refsChanged 同一組)
|
|
805
|
+
let vo = this
|
|
806
|
+
return [vo.grups, vo.kpUseGrupUser]
|
|
807
|
+
},
|
|
808
|
+
|
|
809
|
+
reloadDraft: function() {
|
|
810
|
+
//「重新載入」鈕(資料已被更新橫幅): 使用者明確放棄未存編輯, 以目前 store 重建草稿與基準. 不在此直接呼叫 rebuildDraft: 遞增 syncTick 使 changeParams 重算並於 computed 內重建,
|
|
811
|
+
//genOpt 之反應式依賴(語系等)才會重新收集(保留草稿期間 changeParams 未呼叫 genOpt, 依賴已收縮; 於 computed 外重建不會恢復, 重新載入後再切換語系表頭將停留舊值, 外審 sol 第 4 點)
|
|
812
|
+
let vo = this
|
|
813
|
+
vo.syncTick++
|
|
814
|
+
},
|
|
815
|
+
|
|
655
816
|
genOpt: function() {
|
|
656
817
|
// console.log('methods genOpt')
|
|
657
818
|
|
|
@@ -676,10 +837,13 @@ export default {
|
|
|
676
837
|
let kpRowDrag = {}
|
|
677
838
|
let kpHeadCheckBox = {}
|
|
678
839
|
if (vo.isEditable) {
|
|
840
|
+
|
|
841
|
+
//外部列(from 非空)之身分/結構欄逐列唯讀(啟用保護時以函數判定: w-aggrid-vue 之 setobj 原樣取 kpCellEditable[key] 指給 ag-grid colDef.editable, 其接受 (params) => boolean);
|
|
842
|
+
//指派欄(cpemis)走開窗按鈕, 不受影響; from 欄於所有列皆唯讀(外部同步所擁有, 後台新增列 from 恆為空)
|
|
843
|
+
let editable = vo.isLockExternal ? (params) => !isExternalRow(params.data) : true
|
|
679
844
|
kpCellEditable = {
|
|
680
|
-
'name':
|
|
681
|
-
'description':
|
|
682
|
-
'from': true,
|
|
845
|
+
'name': editable,
|
|
846
|
+
'description': editable,
|
|
683
847
|
}
|
|
684
848
|
kpRowDrag = {
|
|
685
849
|
'name': true,
|
|
@@ -755,7 +919,7 @@ export default {
|
|
|
755
919
|
// console.log('rowsChange cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
|
|
756
920
|
|
|
757
921
|
//check
|
|
758
|
-
if (!vo.syncState || vo.firstLoading || vo.firstSetting || vo.systemProcing) {
|
|
922
|
+
if (!vo.syncState || vo.firstLoading || vo.firstSetting || vo.systemProcing || vo.postSaving) {
|
|
759
923
|
return
|
|
760
924
|
}
|
|
761
925
|
|
|
@@ -941,6 +1105,7 @@ export default {
|
|
|
941
1105
|
let nameOld = r.name
|
|
942
1106
|
let _r = vo.$ds.grups.funNew()
|
|
943
1107
|
r.id = _r.id //使用新建方式預先產生id避免重複
|
|
1108
|
+
r.from = '' //複製出之列為後台新增列, 不繼承來源(來源非空即外部列, 後台新增列 from 須為空, 否則伺服端 saveFromNotAllowed; 不論是否啟用外部列保護)
|
|
944
1109
|
r.name = vo.$s.getNameNew(rows, 'name', nameOld, vo.$t('grupCopyNameNew'))
|
|
945
1110
|
r.userId = `{${vo.$t('grupAddIdNew')}}`
|
|
946
1111
|
r.timeCreate = `{${vo.$t('grupAddIdNew')}}`
|
|
@@ -986,34 +1151,94 @@ export default {
|
|
|
986
1151
|
return
|
|
987
1152
|
}
|
|
988
1153
|
|
|
989
|
-
|
|
990
|
-
|
|
1154
|
+
//外部列保護(啟用時): 外部列(from 非空)不得刪除(伺服端 saveExternalRowChanged), 先過濾掉並以 showCheckYes 提示被略過之筆數(警告, 非 success), 使用者按確定後其餘照常(含既有刪除確認框);
|
|
1155
|
+
//全為外部列則不刪除任何列, 亦不進入刪除流程(不會出現空的確認框); 提示框與刪除確認框依序而非並存
|
|
1156
|
+
let sp = splitCheckedRows(vo.itemsCheck, vo.isLockExternal)
|
|
1157
|
+
if (sp.nBlocked > 0) {
|
|
1158
|
+
vo.$dg.showCheckYes(fmtVars(vo.$t('externalRowDelBlocked'), { n: sp.nBlocked }), { type: 'warning' })
|
|
1159
|
+
.then(() => {
|
|
1160
|
+
if (size(sp.rows) > 0) {
|
|
1161
|
+
vo.deleteItems(sp.rows)
|
|
1162
|
+
}
|
|
1163
|
+
})
|
|
1164
|
+
return
|
|
1165
|
+
}
|
|
991
1166
|
|
|
992
|
-
|
|
993
|
-
rows = cloneDeep(rows)
|
|
1167
|
+
vo.deleteItems(sp.rows)
|
|
994
1168
|
|
|
995
|
-
|
|
996
|
-
|
|
1169
|
+
},
|
|
1170
|
+
|
|
1171
|
+
deleteItems: function(itemsDel) {
|
|
1172
|
+
// console.log('method deleteItems')
|
|
1173
|
+
|
|
1174
|
+
let vo = this
|
|
1175
|
+
|
|
1176
|
+
//delIds
|
|
1177
|
+
let delIds = []
|
|
1178
|
+
each(itemsDel, (v) => {
|
|
997
1179
|
// console.log('v', v)
|
|
998
1180
|
let id = get(v, 'data.id', '')
|
|
999
1181
|
if (!isestr(id)) {
|
|
1000
1182
|
console.log(`invalid id`)
|
|
1001
1183
|
return true //跳出換下一個
|
|
1002
1184
|
}
|
|
1003
|
-
|
|
1004
|
-
return vv.id !== id
|
|
1005
|
-
})
|
|
1185
|
+
delIds.push(id)
|
|
1006
1186
|
})
|
|
1007
1187
|
|
|
1008
|
-
//
|
|
1009
|
-
|
|
1188
|
+
//getRowsRemain, 由「現在」之 opt.rows 剔除被刪之列(確認框開啟期間 store 推播可能重建 opt.rows, 故確認後再算一次)
|
|
1189
|
+
let getRowsRemain = () => {
|
|
1190
|
+
let rows = get(vo, 'opt.rows', [])
|
|
1010
1191
|
|
|
1011
|
-
|
|
1012
|
-
|
|
1013
|
-
// console.log('deleteItemsCheck cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
|
|
1192
|
+
//cloneDeep
|
|
1193
|
+
rows = cloneDeep(rows)
|
|
1014
1194
|
|
|
1015
|
-
|
|
1016
|
-
|
|
1195
|
+
//filter
|
|
1196
|
+
each(delIds, (id) => {
|
|
1197
|
+
rows = filter(rows, (vv) => {
|
|
1198
|
+
return vv.id !== id
|
|
1199
|
+
})
|
|
1200
|
+
})
|
|
1201
|
+
|
|
1202
|
+
return rows
|
|
1203
|
+
}
|
|
1204
|
+
|
|
1205
|
+
//doDelete
|
|
1206
|
+
let doDelete = () => {
|
|
1207
|
+
|
|
1208
|
+
//rows
|
|
1209
|
+
let rows = getRowsRemain()
|
|
1210
|
+
|
|
1211
|
+
//clear
|
|
1212
|
+
vo.itemsCheck = []
|
|
1213
|
+
|
|
1214
|
+
//save
|
|
1215
|
+
vo.opt.rows = rows
|
|
1216
|
+
// console.log('deleteItemsCheck cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
|
|
1217
|
+
|
|
1218
|
+
//isModified
|
|
1219
|
+
vo.isModified = true
|
|
1220
|
+
|
|
1221
|
+
}
|
|
1222
|
+
|
|
1223
|
+
//impact, 對使用者(引用端)之影響, 刪除前須提示(單一框): nRefs 為儲存時將被連帶清理(自其 cgrups 移除對被刪群組之引用)之使用者數(任何 mode、含停用項目;
|
|
1224
|
+
//與伺服端同一純函數 planRefChanges, 只算本次刪除, ADR-036、R-REF-CASCADE-01), nAnd 為其中以 AND 引用且刪除後查無該群組者(引用被移除後其限制解除, 授權可能變多, R-PRINCIPLE-00 c),
|
|
1225
|
+
//nWiden 為引用的群組名稱有多筆同名而只刪其一之使用者數(各候選之交集變寬, 授權可能變多, R-PRINCIPLE-00 d);
|
|
1226
|
+
//被刪名稱只取基準(store 之 grups, 已儲存)列中存在者: 尚未儲存的新增列刪除不影響他人
|
|
1227
|
+
let impact = getDelImpact(delIds, vo.baseRows, vo.users, 'Grup', getRowsRemain())
|
|
1228
|
+
let confirmText = getDelConfirmText(impact, (k) => vo.$t(k), 'Grup')
|
|
1229
|
+
|
|
1230
|
+
//無影響他人之授權時維持現行流程(直接刪除, 不彈框)
|
|
1231
|
+
if (confirmText === '') {
|
|
1232
|
+
doDelete()
|
|
1233
|
+
return
|
|
1234
|
+
}
|
|
1235
|
+
|
|
1236
|
+
//有影響: 確認框(單一框, 多種影響併入同一框); 使用者取消(No)則不刪除
|
|
1237
|
+
vo.$dg.showCheckYesNo(confirmText)
|
|
1238
|
+
.then(() => {
|
|
1239
|
+
doDelete()
|
|
1240
|
+
})
|
|
1241
|
+
.catch(() => {})
|
|
1017
1242
|
|
|
1018
1243
|
},
|
|
1019
1244
|
|
|
@@ -1151,11 +1376,9 @@ export default {
|
|
|
1151
1376
|
|
|
1152
1377
|
//find
|
|
1153
1378
|
let r = null
|
|
1154
|
-
|
|
1155
|
-
each(rows, (v, k) => {
|
|
1379
|
+
each(rows, (v) => {
|
|
1156
1380
|
if (get(v, 'id', '') === id) {
|
|
1157
1381
|
r = v
|
|
1158
|
-
kr = k
|
|
1159
1382
|
return false //跳出
|
|
1160
1383
|
}
|
|
1161
1384
|
})
|
|
@@ -1166,6 +1389,10 @@ export default {
|
|
|
1166
1389
|
return
|
|
1167
1390
|
}
|
|
1168
1391
|
|
|
1392
|
+
//baseline0: 開啟編輯器當下之載入基準(整表, F-26、原則 7 表級比對, 外審 sol R1 與 run11 第 1 點): 編輯器開著時若他人/外部同步改了任何一列或增刪列, 而父頁當時無未存編輯, 推播會重建 items 與基準,
|
|
1393
|
+
//編輯器回傳之字串仍是舊版內容, 回填後存檔會以「新基準」證明過期內容新鮮(還原已被撤銷之授權, 或繞過同表別列已被改動之整表比對); 故回填前比對「草稿現所依據之那份表」與開框時之基準, 有異即放棄回填並提示重新載入.
|
|
1394
|
+
//父頁已有未存編輯時推播只保留草稿與其基準(baseRows 不變), 此比對不誤擋, 存檔時由伺服端表級比對拒收
|
|
1395
|
+
let baseline0 = cloneDeep(vo.baseline)
|
|
1169
1396
|
//showVeCpemis
|
|
1170
1397
|
vo.$dg.showVeCpemis({
|
|
1171
1398
|
isEditable: vo.isEditable,
|
|
@@ -1174,9 +1401,28 @@ export default {
|
|
|
1174
1401
|
.then((cpemis) => {
|
|
1175
1402
|
// console.log('cpemis', cpemis)
|
|
1176
1403
|
|
|
1404
|
+
//以 id 於「現在」之 opt.rows 重新找列(R-REL-PAIR-01): 對話框開啟期間 store 更新會重建 opt.rows(他人增刪、改 order), 開框時之列索引可能已指向另一列; 該列已不存在則提示並放棄回填
|
|
1405
|
+
let krNow = -1
|
|
1406
|
+
each(get(vo, 'opt.rows', []), (v, k) => {
|
|
1407
|
+
if (get(v, 'id', '') === id) {
|
|
1408
|
+
krNow = k
|
|
1409
|
+
return false //跳出
|
|
1410
|
+
}
|
|
1411
|
+
})
|
|
1412
|
+
if (krNow < 0) {
|
|
1413
|
+
vo.$alert(`${vo.$t('grupEditBlngNoGrupData')}`, { type: 'error' })
|
|
1414
|
+
return
|
|
1415
|
+
}
|
|
1416
|
+
|
|
1417
|
+
//草稿所依據之表於編輯器開啟後已被改動(整表指紋與開框時之基準不同; 僅 order/伺服器管理欄不同不算): 放棄回填並提示重新載入(同伺服端 saveStale 之語意)
|
|
1418
|
+
if (isDraftStale({ keys: vo.$ds.grups.keys, rows: vo.baseRows, baseline: baseline0 })) {
|
|
1419
|
+
vo.$alert(`${vo.$t('saveStale')}`, { type: 'warning' })
|
|
1420
|
+
return
|
|
1421
|
+
}
|
|
1422
|
+
|
|
1177
1423
|
//set
|
|
1178
|
-
set(vo, `opt.rows[${
|
|
1179
|
-
// console.log('vo.opt.rows[
|
|
1424
|
+
set(vo, `opt.rows[${krNow}].cpemis`, cpemis)
|
|
1425
|
+
// console.log('vo.opt.rows[krNow]', cloneDeep(vo.opt.rows[krNow]))
|
|
1180
1426
|
|
|
1181
1427
|
//refresh
|
|
1182
1428
|
vo.refresh()
|
|
@@ -1211,8 +1457,9 @@ export default {
|
|
|
1211
1457
|
return
|
|
1212
1458
|
}
|
|
1213
1459
|
|
|
1214
|
-
//rows
|
|
1460
|
+
//rows, baseline: 與 rows 同一刻(同步)擷取——兩者於 changeParams 同一處同時產生, 之後確認框期間若推播重建清單, 仍帶「草稿所依據之那一版」之基準(F-26), 不由最新 store 重算
|
|
1215
1461
|
let rows = get(vo, 'opt.rows', [])
|
|
1462
|
+
let baseline = cloneDeep(vo.baseline)
|
|
1216
1463
|
|
|
1217
1464
|
//check
|
|
1218
1465
|
if (size(rows) === 0) {
|
|
@@ -1221,28 +1468,85 @@ export default {
|
|
|
1221
1468
|
return
|
|
1222
1469
|
}
|
|
1223
1470
|
|
|
1471
|
+
//外部列保護(啟用時): 外部列之身分/結構欄以逐列唯讀與刪除過濾擋下, 但貼上(Ctrl+V)等路徑可繞過逐列唯讀, 送出前再比對一次(基準為 store 之 grups);
|
|
1472
|
+
//有違規即不送出並提示(伺服端同樣整次拒收 saveExternalRowChanged); 於開 loading 之前, 訊息框前釋放按鈕鎖
|
|
1473
|
+
if (vo.isLockExternal && getExternalEdits({ keyTable: 'grups', keys: vo.$ds.grups.keys, rowsNew: rows, rowsOld: vo.baseRows }) !== null) {
|
|
1474
|
+
unlockBtn()
|
|
1475
|
+
await vo.$dg.showCheckYes(vo.$t('saveExternalRowChanged'), { type: 'warning' })
|
|
1476
|
+
return
|
|
1477
|
+
}
|
|
1478
|
+
|
|
1224
1479
|
//新增列之 transient 欄位 _isNew(addItem / copyItem 標記)隨列送後端: 後端據以拒絕「標為新增但 id 已存在」之列
|
|
1225
1480
|
//(同一包重送時不把剛建立之列當修改覆寫, 回 saveNewRowExists), 檢查後由 ltdtmapping 依 schema 取欄時剝除不入庫 (ADR-025)
|
|
1226
1481
|
|
|
1227
|
-
//2)
|
|
1482
|
+
//2) 引用連帶預覽(ADR-036、R-REF-CASCADE-01; 與伺服端同一純函數 planRefChanges, 基準為 store 之 grups/users, 筆數以伺服端實際為準): 群組改名時引用它之使用者 cgrups 於同一次寫入內連帶改名,
|
|
1483
|
+
//有引用端將被更新時先確認(確認框文字與成功訊息之判定見 src/js/getCascadePreview.mjs); plan.err 非 null(新名撞懸空名等)不彈框、照常送出, 伺服端以固定語系鍵拒存並由下方 showCheckYes 顯示
|
|
1484
|
+
let pv = getSavePreview({ kind: 'Grup', rowsOld: vo.baseRows, rowsNew: rows, holdersOld: vo.users, cascadeRename: get(vo, 'webInfor.cascadeRename', true), $t: (k) => vo.$t(k) })
|
|
1485
|
+
|
|
1486
|
+
//新增撞懸空名(F-23/F-26 原則 7; src/js/getAddImpact.mjs): 本次新增之群組名稱查無既有同名實體, 而仍有啟用中之使用者 cgrups 引用該名稱——新增後即解到新群組而取得或受其限制,
|
|
1487
|
+
//須明確同意才送出; 與改名預覽同於開 loading 之前同步計算(基準為 store 之 grups/users), 無懸空引用時不彈框; 與改名確認框依序(先改名預覽、再新增確認), 各自只在需要時彈出
|
|
1488
|
+
let addText = getAddConfirmText(getAddImpact({ keyTable: 'grups', rowsOld: vo.baseRows, rowsNew: rows, holders: vo.users }), (k) => vo.$t(k), 'Grup')
|
|
1489
|
+
|
|
1490
|
+
if (pv.confirmText !== '') {
|
|
1491
|
+
|
|
1492
|
+
//先開確認框之流程: 開框前 unlockBtn() 釋放儲存鈕之 promiseUnlock 鎖(同上, 按鈕鎖只涵蓋請求期間); 流程狀態仍由 runSubmit 保持至本流程結束,
|
|
1493
|
+
//確認框與後續請求期間之重入(焦點仍在儲存鈕時 Enter)皆被略過 (ADR-025)
|
|
1494
|
+
unlockBtn()
|
|
1495
|
+
let isGo = await vo.$dg.showCheckYesNo(pv.confirmText)
|
|
1496
|
+
.then(() => true)
|
|
1497
|
+
.catch(() => false)
|
|
1498
|
+
|
|
1499
|
+
//選否(或確認框被取代而視同選否): 中止儲存, 不送出; 尚未開 loading, 資料與 isModified 保留, 由 runSubmit 於回傳後結束流程
|
|
1500
|
+
if (!isGo) {
|
|
1501
|
+
return
|
|
1502
|
+
}
|
|
1503
|
+
|
|
1504
|
+
}
|
|
1505
|
+
|
|
1506
|
+
//新增撞懸空名之確認(同上之鎖釋放與選否中止; 單一框、單一問句)
|
|
1507
|
+
if (addText !== '') {
|
|
1508
|
+
unlockBtn()
|
|
1509
|
+
let isGoAdd = await vo.$dg.showCheckYesNo(addText)
|
|
1510
|
+
.then(() => true)
|
|
1511
|
+
.catch(() => false)
|
|
1512
|
+
if (!isGoAdd) {
|
|
1513
|
+
return
|
|
1514
|
+
}
|
|
1515
|
+
}
|
|
1516
|
+
|
|
1517
|
+
//3) 確定打 API 才開 loading
|
|
1228
1518
|
vo.$ui.updateLoading(true)
|
|
1229
1519
|
|
|
1230
|
-
//
|
|
1520
|
+
//4) updateGrups, 各自 catch + 旗標短路; 第 2 參 { baseline } 為載入基準(伺服端於表鎖內比對本次將寫入之列是否仍與草稿所依據之版本相同, 否則整次拒收 saveStale)
|
|
1231
1521
|
let okSave = false
|
|
1232
|
-
|
|
1233
|
-
|
|
1522
|
+
vo.saveMark.saving = true //自己之存檔請求進行中: 此期間之推播不是他人更新(changeParams 的 planDraftSync 回 'keepQuiet'); 回應(成功或失敗)一到即歸零
|
|
1523
|
+
await vo.$fapi.updateGrups(rows, { baseline })
|
|
1524
|
+
.then(() => {
|
|
1525
|
+
okSave = true
|
|
1526
|
+
vo.saveMark.saving = false
|
|
1527
|
+
})
|
|
1234
1528
|
.catch(async (err) => {
|
|
1529
|
+
vo.saveMark.saving = false
|
|
1530
|
+
vo.staleNotice = isDraftStale({ keys: vo.$ds.grups.keys, rows: vo.grups, baseline: vo.syncMark.baseline }) //失敗(含 saveStale 被拒): 請求進行中被安靜保留之推播, 此時依目前 store 重算過期提示(同 changeParams 之保留分支)
|
|
1235
1531
|
vo.$ui.updateLoading(false) //showCheckYes 前關 loading(modal 阻斷期間避免 loading 疊在底下)
|
|
1236
1532
|
await vo.$dg.showCheckYes(`${vo.$t('grupSaveGrupsFail')}: ${vo.$tErr(err)}`)
|
|
1237
1533
|
})
|
|
1238
1534
|
if (!okSave) return
|
|
1239
1535
|
|
|
1240
|
-
//isModified
|
|
1536
|
+
//isModified; postSaving 自此至成功訊息框關閉後 300ms 內排除 rowsChange(見 data 註解)
|
|
1537
|
+
vo.postSaving = true
|
|
1241
1538
|
vo.isModified = false
|
|
1242
1539
|
|
|
1243
1540
|
//alert(showCheckYes 前關 loading,避免 modal 等待期間 loading 疊在底下)
|
|
1244
1541
|
vo.$ui.updateLoading(false)
|
|
1245
|
-
|
|
1542
|
+
try {
|
|
1543
|
+
await vo.$dg.showCheckYes(pv.successText !== '' ? pv.successText : vo.$t('grupSaveGrupsSuccess'), { type: 'success' }) //只有改名且有使用者之引用被連帶更新才附筆數(刪除所致之清理不改, 已於刪除確認框告知), 否則維持原成功訊息
|
|
1544
|
+
}
|
|
1545
|
+
finally {
|
|
1546
|
+
setTimeout(() => {
|
|
1547
|
+
vo.postSaving = false
|
|
1548
|
+
}, 300)
|
|
1549
|
+
}
|
|
1246
1550
|
|
|
1247
1551
|
}
|
|
1248
1552
|
|
|
@@ -1255,6 +1559,9 @@ export default {
|
|
|
1255
1559
|
})
|
|
1256
1560
|
.finally(() => {
|
|
1257
1561
|
|
|
1562
|
+
//非預期例外時亦歸零, 避免之後之推播永遠被當成自己存檔所致
|
|
1563
|
+
vo.saveMark.saving = false
|
|
1564
|
+
|
|
1258
1565
|
//hide loading
|
|
1259
1566
|
vo.$ui.updateLoading(false)
|
|
1260
1567
|
|
|
@@ -1268,4 +1575,18 @@ export default {
|
|
|
1268
1575
|
</script>
|
|
1269
1576
|
|
|
1270
1577
|
<style scoped>
|
|
1578
|
+
/* 「資料已被更新」橫幅之重新載入鈕: 底色 #fff(同工具鈕底)、hover #f2f2f2(同工具鈕 hover)、邊線 #ddd(同橫幅邊線)、文字 #444(同橫幅文字), 與橫幅同字級 */
|
|
1579
|
+
.staleReloadBtn {
|
|
1580
|
+
margin-left: 8px;
|
|
1581
|
+
padding: 1px 10px;
|
|
1582
|
+
font-size: 0.8rem;
|
|
1583
|
+
color: #444;
|
|
1584
|
+
background: #fff;
|
|
1585
|
+
border: 1px solid #ddd;
|
|
1586
|
+
border-radius: 4px;
|
|
1587
|
+
cursor: pointer;
|
|
1588
|
+
}
|
|
1589
|
+
.staleReloadBtn:hover {
|
|
1590
|
+
background: #f2f2f2;
|
|
1591
|
+
}
|
|
1271
1592
|
</style>
|