saas-tenant-approve-app 0.2.46 → 0.2.48

package/lib/tips.common.js

@@ -14485,8 +14485,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var approveLine = (component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=template&id=520f8838&scoped=true
-var approveLineAllvue_type_template_id_520f8838_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=template&id=7a1c27a2&scoped=true
+var approveLineAllvue_type_template_id_7a1c27a2_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -14710,7 +14710,7 @@ var approveLineAllvue_type_template_id_520f8838_scoped_true_render = function re
     }
   })], 1);
 };
-var approveLineAllvue_type_template_id_520f8838_scoped_true_staticRenderFns = [];
+var approveLineAllvue_type_template_id_7a1c27a2_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/qs/lib/index.js
 var lib = __webpack_require__(9122);
@@ -15489,7 +15489,11 @@ function constrainDefaults(node, people) {
   const allowed = new Set(normalizeCandidates(node.selectionCandidates).map(p => p.userId));
   return normalizeCandidates(people).filter(p => allowed.has(p.userId));
 }
-const canChangeFutureApprovers = node => Boolean(node) && !(node.approvalControlsEnabled === true && (node.type !== 'check' || node.checker.lockApproverChanges === true)) && canEditApprovers(node);
+
+// Fixed approver types stay non-selectable at application time; preceding approval nodes may edit them
+// unless the node itself is locked.
+const isFixedApproval = node => Boolean(node) && node.type === 'check' && Boolean(node.checker) && [1, 3, 5, 6, 10].includes(Number(node.checker.type));
+const canChangeFutureApprovers = node => Boolean(node) && Boolean(node.checker) && node.checker.lockApproverChanges !== true && (node.type === 'copy' || isFixedApproval(node) || isSelectableApproval(node) && (node.checker.editApprover == null || String(node.checker.editApprover) === '1'));
 const canEditApprovers = node => isSelectableApproval(node) ? String(node.checker.editApprover) === '1' : node && node.type === 'copy' && String(node.isOptional) === '1';
 const canReduceDefaultApprovers = node => isSelectableApproval(node) && String(node.checker.editApprover) !== '1' && String(node.checker.defaultApprover) === '1' && String(node.checker.allowRemoveDefaultApprover) === '1';
 const canRemoveApprover = node => (canEditApprovers(node) || canReduceDefaultApprovers(node)) && (node.type !== 'check' || normalizeCandidates(node.list).length > 1);
@@ -15783,12 +15787,7 @@ var CandidatePicker_component = normalizeComponent(
       if (me.approveList && me.approveList.length > 0) {
         var node = me.approveList.find(item => item.id == step.nodeId);
         if (!node) return false;
-        if (node.approvalControlsEnabled === true) return me.approveStatus && canChangeFutureApprovers(node);
-        if ([7, 8, 9].includes(node.checkertype) && node.editApprover == 1 || node.type == "copy" && node.isOptional == 1) {
-          return true;
-        } else {
-          return false;
-        }
+        return me.approveStatus && canChangeFutureApprovers(node);
       }
     },
     async addApprover(step) {
@@ -15796,7 +15795,7 @@ var CandidatePicker_component = normalizeComponent(
       if (!this.ableEdit(step) || this.rangeLoading) return;
       if (me.approveList && me.approveList.length > 0) {
         var node = me.approveList.find(item => item.id == step.nodeId);
-        if (hasCandidateRange(node) || [7, 8].includes(Number(node.checkertype)) && String(node.checker.selectArea) === '2' && (node.selectedPersons || []).length) {
+        if (node.type === 'copy' || isFixedApproval(node) || Number(node.checkertype) === 9 || hasCandidateRange(node) || [7, 8].includes(Number(node.checkertype)) && String(node.checker.selectArea) === '2' && (node.selectedPersons || []).length) {
           this.rangeLoading = true;
           try {
             const response = await queryOptionalScopeUsers(this.SAAS_TENANT_API, {
@@ -15806,10 +15805,12 @@ var CandidatePicker_component = normalizeComponent(
               nodeId: node.id
             });
             if (Number(response.status) !== 200 || !Array.isArray(response.result && response.result.data)) throw new Error(response.message || '读取可选范围失败');
-            this.rangeCandidates = normalizeCandidates(response.result.data);
+            const candidates = normalizeCandidates(response.result.data);
+            // Fixed nodes keep their configured members as defaults even when they are not in the template range.
+            this.rangeCandidates = isFixedApproval(node) ? normalizeCandidates(candidates.concat(normalizeCandidates(step.approverDtoList))) : candidates;
             this.rangeSelected = step.nodeType === 'copy' ? step.copyerDtoList : step.approverDtoList;
             this.rangeSingle = String(node.selectPersonType) === '1';
-            this.rangeRequired = step.nodeType === 'check';
+            this.rangeRequired = true;
             this.rangeNode = node;
             this.rangeStep = step;
             this.rangeVisible = true;
@@ -16039,10 +16040,7 @@ var CandidatePicker_component = normalizeComponent(
           });
         }
         let optional = res.optional && res.optional.length > 0 ? res.optional : that.optionalList && that.optionalList.length > 0 ? JSON.stringify(that.optionalList) : null;
-        const controlsEnabled = that.approveList.some(node => node.approvalControlsEnabled === true);
-        if (controlsEnabled) {
-          optional = JSON.stringify(mergeOptionalSelections(that.optionalList, res.optional));
-        }
+        optional = JSON.stringify(mergeOptionalSelections(that.optionalList, res.optional));
         let formDataList = null;
         if (that.data.editMainDeptLeader) {
           formDataList = [{
@@ -16058,7 +16056,7 @@ var CandidatePicker_component = normalizeComponent(
           optional: optional,
           formDataList: formDataList
         }, res);
-        if (controlsEnabled) parm.optional = optional;
+        parm.optional = optional;
         console.log(parm);
         if (!that.ifBtn) return;
         that.ifBtn = false;
@@ -16123,10 +16121,10 @@ var CandidatePicker_component = normalizeComponent(
 });
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=script&lang=js
  /* harmony default export */ var components_approveLineAllvue_type_script_lang_js = (approveLineAllvue_type_script_lang_js); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=style&index=0&id=520f8838&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=style&index=0&id=7a1c27a2&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=520f8838&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=7a1c27a2&prod&scoped=true&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue
 
@@ -16139,11 +16137,11 @@ var CandidatePicker_component = normalizeComponent(
 
 var approveLineAll_component = normalizeComponent(
   components_approveLineAllvue_type_script_lang_js,
-  approveLineAllvue_type_template_id_520f8838_scoped_true_render,
-  approveLineAllvue_type_template_id_520f8838_scoped_true_staticRenderFns,
+  approveLineAllvue_type_template_id_7a1c27a2_scoped_true_render,
+  approveLineAllvue_type_template_id_7a1c27a2_scoped_true_staticRenderFns,
   false,
   null,
-  "520f8838",
+  "7a1c27a2",
   null
   
 )