cloud-web-corejs 1.0.54-dev.801 → 1.0.54-dev.803

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.801",
+  "version": "1.0.54-dev.803",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/baseArea/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="base-area">
     <el-popover
+      ref="popoverRef"
       v-model="popoverVisible"
       placement="bottom-start"
       trigger="click"
@@ -268,13 +269,28 @@ export default {
       if (this.labelValue) {
         return this.labelValue;
       }
-      const pathLabel = this.selectedPath.length
+      /* 弹层浏览中的选择未确认，输入框只回显打开弹层时的已提交值 */
+      if (this.popoverVisible) {
+        return this.committedPathLabel;
+      }
+      if (!this.selectedPath.length) {
+        return "";
+      }
+      /* 外部未回传 label 时的兜底：仅当浏览路径与已绑定值一致才回显 */
+      const leafId = this.getLeafIdFromValue(this.value);
+      return this.isValueSynced(leafId)
         ? this.buildPathLabel(this.selectedPath)
         : "";
-      if (this.popoverVisible && pathLabel) {
-        return pathLabel;
+    },
+    committedPathLabel() {
+      const snapshot = this.committedBrowseSnapshot;
+      if (!snapshot || !snapshot.selectedPath || !snapshot.selectedPath.length) {
+        return "";
       }
-      return pathLabel || "";
+      if (!this.isSameBoundValue(this.value, snapshot.boundValue)) {
+        return "";
+      }
+      return this.buildPathLabel(snapshot.selectedPath);
     },
     tabs() {
       const tabs = [];
@@ -336,8 +352,43 @@ export default {
   },
   beforeDestroy() {
     clearTimeout(this.searchTimer);
+    this.unbindOutsideClick();
   },
   methods: {
+    bindOutsideClick() {
+      /* 捕获阶段监听：外层若阻止了 click 冒泡，el-popover 自带的 document 监听收不到，弹层不会关闭 */
+      document.addEventListener("mousedown", this.handleOutsideClick, true);
+    },
+    unbindOutsideClick() {
+      document.removeEventListener("mousedown", this.handleOutsideClick, true);
+    },
+    isInsidePopover(target) {
+      if (!target || !target.nodeType) {
+        return false;
+      }
+      /* 触发器（含输入框）在组件根节点内 */
+      if (this.$el && this.$el.contains(target)) {
+        return true;
+      }
+      /* 弹层默认 append 到 body，需单独判断 */
+      const popoverRef = this.$refs.popoverRef;
+      const popper = popoverRef && popoverRef.$refs && popoverRef.$refs.popper;
+      return !!(popper && popper.contains(target));
+    },
+    handleOutsideClick(evt) {
+      if (!this.popoverVisible) {
+        return;
+      }
+      const target = evt.target;
+      /* 已从文档移除的节点无法判断归属，不做处理 */
+      if (!target || !document.contains(target)) {
+        return;
+      }
+      if (this.isInsidePopover(target)) {
+        return;
+      }
+      this.popoverVisible = false;
+    },
     getResolveDepthLimit(item) {
       if (item && item.treePath) {
         const ids = this.parseTreePathIds(item.treePath);
@@ -565,6 +616,7 @@ export default {
     },
     handlePopoverShow() {
       this.pendingLeaf = false;
+      this.bindOutsideClick();
       this.saveCommittedBrowseSnapshot();
       this.$emit("popover-open");
       this.$nextTick(() => {
@@ -1060,6 +1112,7 @@ export default {
       this.emitResolvedLabelIfNeeded();
     },
     handlePopoverHide() {
+      this.unbindOutsideClick();
       this.searchKeyword = "";
       this.searchList = [];
       this.searchDropdownVisible = false;
@@ -1299,13 +1352,13 @@ export default {
 }
 
 .base-area-panel {
-  padding: 4px 0 0;
+  padding: 0;
   overflow: visible;
 }
 
 .base-area-search {
   position: relative;
-  margin-bottom: 8px;
+  margin-bottom: 6px;
   z-index: 2;
 }
 
@@ -1360,8 +1413,8 @@ export default {
 }
 
 .base-area-path {
-  padding: 6px 10px;
-  margin-bottom: 10px;
+  padding: 3px 8px;
+  margin-bottom: 6px;
   background: #f5f7fa;
   border: 1px solid #ebeef5;
   border-radius: 4px;
@@ -1380,7 +1433,7 @@ export default {
   padding: 0 2px;
   font-size: 12px;
   color: #c0c4cc;
-  line-height: 24px;
+  line-height: 22px;
   user-select: none;
 }
 
@@ -1389,8 +1442,8 @@ export default {
   min-width: 0;
   max-width: 100%;
   padding: 0 4px;
-  height: 24px;
-  line-height: 24px;
+  height: 22px;
+  line-height: 22px;
   border: none;
   border-bottom: 2px solid transparent;
   border-radius: 0;
@@ -1427,7 +1480,7 @@ export default {
 }
 
 .base-area-grid-wrap {
-  padding: 8px;
+  padding: 6px;
   background: #fff;
   border: 1px solid #eee;
   border-radius: 8px;
@@ -1436,20 +1489,22 @@ export default {
 .base-area-grid {
   display: flex;
   flex-wrap: wrap;
-  min-height: 120px;
-  max-height: 294px;
+  align-content: flex-start;
+  min-height: 82px;
+  /* 5 行：(28 + 6) * 5 + 4 */
+  max-height: 174px;
   overflow-y: auto;
   margin: 0 -4px;
 }
 
 .base-area-item {
   width: calc(25% - 8px);
-  margin: 0 4px 8px;
+  margin: 0 4px 6px;
   padding: 0 10px;
-  height: 34px;
-  line-height: 34px;
+  height: 28px;
+  line-height: 28px;
   border: 1px solid #eee;
-  border-radius: 8px;
+  border-radius: 6px;
   font-size: 12px;
   cursor: pointer;
   overflow: hidden;
@@ -1470,7 +1525,7 @@ export default {
 
 .base-area-empty {
   width: 100%;
-  padding: 24px 0;
+  padding: 16px 0;
   text-align: center;
   color: #909399;
   font-size: 12px;
@@ -1480,12 +1535,12 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-top: 8px;
+  margin-top: 6px;
 
   .base-area-nav-btn {
     min-width: 32px;
-    padding: 7px 10px;
-    border-radius: 8px;
+    padding: 5px 10px;
+    border-radius: 6px;
     color: #fff;
     border-color: $baseColor;
     background-color: $baseColor;
@@ -1522,7 +1577,7 @@ export default {
     text-align: center;
     font-size: 12px;
     color: #606266;
-    line-height: 28px;
+    line-height: 24px;
     user-select: none;
   }
 }
@@ -1531,8 +1586,8 @@ export default {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  margin-top: 8px;
-  padding-top: 8px;
+  margin-top: 6px;
+  padding-top: 6px;
   border-top: 1px solid #ebeef5;
 }
 </style>
@@ -1577,7 +1632,7 @@ export default {
 }
 
 .base-area-popover {
-  padding: 10px 12px;
+  padding: 8px 10px;
   overflow: visible;
   box-sizing: border-box;
 
@@ -1599,7 +1654,7 @@ export default {
   }
 
   .base-area-nav-btn.el-button {
-    border-radius: 8px;
+    border-radius: 6px;
     color: #fff;
     border-color: $baseColor;
     background-color: $baseColor;

package/src/components/table/tableForm.vue

@@ -222,13 +222,18 @@
         <el-table
           ref="singleTable"
           width="100%"
-          :data="tableColumns"
+          :data="dialogColumns"
           border=""
           row-key="field"
           stripe=""
+          :row-class-name="dialogRowClassName"
         >
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
-          <el-table-column label="" width="38"><i class="iconfont icon-tuodongweizhi drag-option"></i></el-table-column>
+          <el-table-column label="" width="38">
+            <template slot-scope="scope">
+              <i v-if="!scope.row.lockValue" class="iconfont icon-tuodongweizhi drag-option"></i>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t2('名称', 'components.table.name')" width="150" prop="title">
             <template slot-scope="scope">
               {{ scope.row.title }}
@@ -236,8 +241,12 @@
           </el-table-column>
           <el-table-column :label="$t2('默认值', 'components.table.defaultValue')" width="375" prop="defaultValue">
             <template slot-scope="scope">
+              <!-- 固定查询条件的值由业务通道注入，这里不给改，也不参与还原/确定的写值 -->
+              <span v-if="scope.row.lockValue" class="text-tip">
+                {{ $t1('固定条件') }}
+              </span>
               <template
-                v-if="scope.row.defaultValueEnabled!==false && (scope.row.defaultValueEnabled || !scope.row.slot)">
+                v-else-if="scope.row.defaultValueEnabled!==false && (scope.row.defaultValueEnabled || !scope.row.slot)">
                 <template v-if="scope.row.type =='input'">
                   <el-input v-model="scope.row.defaultValue" size="small" clearable></el-input>
                 </template>
@@ -280,7 +289,7 @@
           </el-table-column>
           <el-table-column :label="$t2('是否常用', 'components.table.common')" width="70" prop="common">
             <template slot-scope="scope">
-              <el-switch v-model="scope.row.common"></el-switch>
+              <el-switch v-model="scope.row.common" :disabled="scope.row.lockValue === true"></el-switch>
             </template>
           </el-table-column>
         </el-table>
@@ -315,5 +324,7 @@ export default {
 </script>
 
 <style scoped>
-
+.text-tip {
+  color: #909399;
+}
 </style>

package/src/components/table/tableFormMixin.js

@@ -15,7 +15,10 @@ modules = {
       showAdvancedSearch: false,
       form1Fields: [],
       form2Fields: [],
+      /* 全量列，「确定」按它回写，隐藏列也在里面（不能丢，它照样往上送条件） */
       tableColumns: [],
+      /* 弹框实际渲染的列，是 tableColumns 里非隐藏项的**引用**（同一批对象，改默认值直接生效） */
+      dialogColumns: [],
       dialogVisible: false,
       advancedFormData: {},
       formDataClone: {},
@@ -213,13 +216,17 @@ modules = {
     },
     openTableColumnsDialog() {
       let $grid = this.$parent;
-      let tableColumns = (tableColumns = this.$baseLodash.cloneDeep(
+      // 原写法 let tableColumns = (tableColumns = ...) 自引用触发 TDZ，
+      // 只因 Babel 把 let 降成 var 才没在浏览器里炸
+      let tableColumns = this.$baseLodash.cloneDeep(
         $grid.params.searchColumns || []
-      ));
+      );
       tableColumns.forEach((item) => {
         if (!item.widgetConfig) item.widgetConfig = {};
       });
       this.tableColumns = tableColumns;
+      // 隐藏字段（如查询区里存树ID的隐藏输入框）是内部条件，不给用户看也不给拖
+      this.dialogColumns = tableColumns.filter((item) => !item.hidden);
       this.dialogVisible = true;
       this.$nextTick(() => {
         this.$nextTick(() => {
@@ -231,20 +238,34 @@ modules = {
       let e = this.$refs.singleTable.$el.querySelectorAll(
           ".el-table__body-wrapper > table > tbody"
         )[0],
-        t = this.tableColumns;
+        t = this.tableColumns,
+        visible = this.dialogColumns;
       this.sortable = Sortable.create(e, {
         ghostClass: "sortable-ghost",
+        // 固定查询条件不可拖动（它的位置由配置决定，个性化也不该记）
+        filter: ".drag-disabled",
         setData: function (e) {
           e.setData("Text", "");
         },
         onEnd: function (e) {
-          let i = t.splice(e.oldIndex, 1)[0];
-          t.splice(e.newIndex, 0, i);
-          /*t[e.newIndex].value;
-          t[e.newIndex - 1] && t[e.newIndex - 1].value, t[e.newIndex + 1] && t[e.newIndex + 1].value;*/
+          // 拖拽发生在「可见列」上，隐藏列不在其中，所以要把新次序同步回全量列：
+          // 先在可见列里挪好，再按「新位置的后一个可见列」定位插到全量列的哪里。
+          let moved = visible.splice(e.oldIndex, 1)[0];
+          visible.splice(e.newIndex, 0, moved);
+          let fullIndex = t.indexOf(moved);
+          if (fullIndex > -1) {
+            t.splice(fullIndex, 1);
+          }
+          let nextVisible = visible[e.newIndex + 1];
+          let insertAt = nextVisible ? t.indexOf(nextVisible) : t.length;
+          t.splice(insertAt < 0 ? t.length : insertAt, 0, moved);
         },
       });
     },
+    /** 固定查询条件行加标记类：禁拖拽（Sortable filter）+ 视觉上区分 */
+    dialogRowClassName({ row }) {
+      return row && row.lockValue ? "drag-disabled" : "";
+    },
     dialogPrimary(newTableColumns) {
       let searchColumns = this.$baseLodash.cloneDeep(
         newTableColumns || this.tableColumns
@@ -266,6 +287,13 @@ modules = {
       // this.$set(this, "formData", {});
       // this.$set(this, "advancedFormData", {});
       searchColumns.forEach((form1Field) => {
+        // 固定查询条件：值由业务通道（树点选 / 脚本 setValue / 页面回填）注入，
+        // 「确定」「还原」都不许覆盖它，否则一点设置就把当前上下文查丢了。
+        // 注意只认 lockValue，不认 fixed —— 手写页面的 fixed 列（如分支）
+        // 正是靠这里按 defaultValue 回填的，跳过它们会打掉原有行为。
+        if (form1Field.lockValue) {
+          return;
+        }
         let nullValue = this.getNullValue(form1Field);
         let defaultValue = nullValue;
         if (form1Field.defaultValueEnabled !== false) {

package/src/components/wf/content.vue

@@ -7,7 +7,8 @@
   >
     <template #default>
       <!-- 审批按钮条留在流程模块内，不随 wfActionInHeaderEnabled 搬走或隐藏。
-           开了该开关时，详情标题栏另挂一份「流程操作」下拉（wfActionDropdown.vue）。 -->
+           开了该开关时，详情标题栏另挂一份（wfActionDropdown.vue）：通过/驳回/撤回平铺，
+           其余收进「流程操作」下拉。 -->
       <div
         ref="wfActionBar"
         style="margin: -36px 0 8px 124px; position: relative; z-index: 2; height: 28px"
@@ -629,6 +630,8 @@
         </span>
       </el-dialog>
 
+      <!-- append-to-body 必须留着：本弹框在 baseTabPane 的 v-show 子树里，
+           「流程信息」一折叠就跟着 display:none，标题栏那份审批入口点了会毫无反应 -->
       <el-dialog
         v-if="rejectDialogVisible"
         :visible.sync="rejectDialogVisible"
@@ -638,6 +641,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"
@@ -715,6 +719,7 @@
           </el-button>
         </span>
       </el-dialog>
+      <!-- 同上：折叠态下要能弹出来，append-to-body 不能去掉 -->
       <el-dialog
         v-if="agreeDialogVisible"
         :visible.sync="agreeDialogVisible"
@@ -724,6 +729,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"
@@ -939,6 +945,7 @@
           >
         </span>
       </el-dialog>
+      <!-- 同上：折叠态下要能弹出来，append-to-body 不能去掉 -->
       <el-dialog
         v-if="revokeDialogVisible"
         :visible.sync="revokeDialogVisible"
@@ -948,6 +955,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"

package/src/components/wf/wfActionDropdown.vue

@@ -1,13 +1,23 @@
 <template>
-  <div class="button-sty" v-show="items.length">
-    <el-dropdown trigger="hover">
+  <div class="wf-action-dropdown-wrap button-sty" v-show="items.length">
+    <!-- 通过 / 驳回 / 撤回 挪出下拉，在标题栏直接平铺；其余操作仍收在「流程操作」下拉里 -->
+    <el-button
+      v-for="item in standaloneItems"
+      :key="item.key"
+      :type="item.buttonType || 'primary'"
+      :icon="item.iconClass || item.elIcon"
+      class="button-sty"
+      @click="item.run(wfVm)"
+      >{{ itemLabel(item) }}
+    </el-button>
+    <el-dropdown trigger="hover" v-if="dropdownItems.length">
       <el-button type="primary" class="button-sty">
         {{ $t1("流程操作") }}
         <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item
-          v-for="item in items"
+          v-for="item in dropdownItems"
           :key="item.key"
           :icon="item.elIcon"
           @click.native="item.run(wfVm)"
@@ -21,7 +31,10 @@
 </template>
 
 <script>
-import { getVisibleWfActionItems } from "./wfActionItems";
+import {
+  getVisibleWfActionItems,
+  HEADER_STANDALONE_KEYS,
+} from "./wfActionItems";
 
 export default {
   name: "WfActionDropdown",
@@ -31,14 +44,28 @@ export default {
       type: Object,
       required: true,
     },
+    // 不收进下拉、直接平铺成独立按钮的操作 key
+    standaloneKeys: {
+      type: Array,
+      default: () => HEADER_STANDALONE_KEYS,
+    },
   },
   computed: {
     // 求值时会读 wfVm 上的响应式字段，跨实例也能跟着流程状态更新
     items() {
       return getVisibleWfActionItems(this.wfVm);
     },
+    standaloneItems() {
+      return this.items.filter((item) => this.isStandalone(item));
+    },
+    dropdownItems() {
+      return this.items.filter((item) => !this.isStandalone(item));
+    },
   },
   methods: {
+    isStandalone(item) {
+      return (this.standaloneKeys || []).indexOf(item.key) > -1;
+    },
     itemLabel(item) {
       if (item.i18nPath) {
         return this.$t2(item.defaultLabel, item.i18nPath);
@@ -50,9 +77,9 @@ export default {
 </script>
 
 <style scoped>
+/* 标题栏 .fr 内其余按钮都是行内元素，包裹层必须跟着行内排，否则会另起一行 */
 .wf-action-dropdown-wrap {
   display: inline-block;
   vertical-align: middle;
-  margin-right: 10px;
 }
 </style>

package/src/components/wf/wfActionItems.js

@@ -3,17 +3,26 @@
  * 避免两处各写一遍之后漂移。
  *
  * vm 是 content.vue 实例（挂了 wfContentMixin）。
+ *
+ * buttonType 只在「平铺成独立按钮」时用得上（见 HEADER_STANDALONE_KEYS），
+ * 取值与流程模块按钮条里同名按钮保持一致。
  */
+
+/* 详情标题栏里不收进下拉、直接平铺成独立按钮的操作。
+   顺序按 getWfActionItems 的定义序，不按这里的书写序。 */
+export const HEADER_STANDALONE_KEYS = ["agree", "reject", "revoke"];
+
 export function getWfActionItems(vm) {
   let wfInfo = (vm && vm.wfInfo) || {};
-  let toTransfer =
-    wfInfo.toTransfer === null || wfInfo.toTransfer === undefined
+  let toTransfer
+    = wfInfo.toTransfer === null || wfInfo.toTransfer === undefined
       ? !!wfInfo.toSubmit
       : !!wfInfo.toTransfer;
 
   return [
     {
       key: "agree",
+      buttonType: "success",
       show: !!wfInfo.toSubmit,
       defaultLabel: "通过",
       i18nPath: "components.wf.agree",
@@ -22,6 +31,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "manual",
+      buttonType: "warning",
       show: !!wfInfo.toInterrupt,
       defaultLabel: "中断",
       i18nPath: "components.wf.manual",
@@ -30,6 +40,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "reject",
+      buttonType: "danger",
       show: !!wfInfo.toReject,
       defaultLabel: "驳回",
       i18nPath: "components.wf.reject",
@@ -38,6 +49,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "transfer",
+      buttonType: "primary",
       show: toTransfer,
       defaultLabel: "转办",
       i18nPath: "components.wf.transfer",
@@ -46,6 +58,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "urging",
+      buttonType: "primary",
       show: !!wfInfo.toInterrupt,
       defaultLabel: "催办",
       i18nPath: "components.wf.urging",
@@ -54,6 +67,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "addIncreaseSign",
+      buttonType: "primary",
       show: !!(vm.increaseSignEnabled && wfInfo.toAddIncreaseSign),
       defaultLabel: "加签",
       i18nPath: "components.wf.addIncreaseSign",
@@ -62,6 +76,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "deleteIncreaseSign",
+      buttonType: "primary",
       show: !!(vm.increaseSignEnabled && wfInfo.toDeleteIncreaseSign),
       defaultLabel: "减签",
       i18nPath: "components.wf.deleteIncreaseSign",
@@ -70,6 +85,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "talk",
+      buttonType: "primary",
       show: !!(vm.toTalk && wfInfo.toLinkup),
       defaultLabel: "沟通",
       i18nPath: "components.wf.talk",
@@ -78,6 +94,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "setCandidate",
+      buttonType: "primary",
       show: !!wfInfo.toSetCandidate,
       defaultLabel: "修改候选人",
       i18nPath: "components.wf.setCandidate",
@@ -86,6 +103,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "revoke",
+      buttonType: "danger",
       show: !!wfInfo.toRevoke,
       defaultLabel: "撤回",
       i18nPath: "components.wf.revoke",
@@ -94,6 +112,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "addOpinion",
+      buttonType: "primary",
       show: !!vm.showAddOpinionButton,
       defaultLabel: "补充意见",
       run: (wfVm) => {
@@ -103,6 +122,7 @@ export function getWfActionItems(vm) {
     },
     {
       key: "editScript",
+      buttonType: "primary",
       show: !!wfInfo.wfAdmin,
       defaultLabel: "修改脚本",
       elIcon: "el-icon-edit",