cloud-web-corejs 1.0.54-dev.790 → 1.0.54-dev.792

package/src/views/bd/project/core/branchTreeBar.vue

@@ -0,0 +1,81 @@
+<template>
+  <!-- 分支模块：挂在左侧树顶部、「表单分类」之上 -->
+  <div class="bd-branch-tree-bar">
+    <div class="branch-info">
+      <span class="value" :title="branchLabel">{{ branchLabel }}</span>
+    </div>
+    <el-tooltip
+      :enterable="false"
+      effect="dark"
+      :content="$t1('打开新分支')"
+      placement="top"
+      popper-class="tooltip-skin"
+    >
+      <el-button
+        class="open-new"
+        icon="el-icon-plus"
+        @click="$emit('open-new')"
+      ></el-button>
+    </el-tooltip>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "bdBranchTreeBar",
+  props: {
+    branchLabel: String,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+/* 与树上方的 .tree-userChange 保持同一套模块样式 */
+.bd-branch-tree-bar {
+  flex: none;
+  display: flex;
+  align-items: center;
+  margin: 9px 10px 0;
+  padding: 7px 7px 7px 10px;
+  background: #f4f6fa;
+  border-radius: 5px;
+
+  .branch-info {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    align-items: flex-start;
+    font-size: 14px;
+    line-height: 20px;
+
+    .value {
+      flex: 1;
+      min-width: 0;
+      /* 长分支名换行显示，最多两行，超出再省略 */
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      word-break: break-all;
+      font-weight: 600;
+      /* 与详情页标题栏的分支标记同色 */
+      color: #ff731c;
+    }
+  }
+
+  .open-new {
+    flex: none;
+    width: 26.5px;
+    height: 26.5px;
+    margin-left: 8px;
+    padding: 0;
+    line-height: 26.5px;
+    text-align: center;
+    background: #fff;
+    border: solid 1px rgba(99, 134, 250, 0.15);
+    border-radius: 5px;
+    color: #6386fa;
+  }
+}
+</style>

package/src/views/bd/setting/formVersion/button.vue

@@ -13,6 +13,7 @@
       :objType="objType"
       :objCode="objCode"
       :relationCode="relationCode"
+      :sid="sid"
       @reverCallback="reverCallback"
     />
   </el-button>
@@ -33,6 +34,10 @@ export default {
       type: String,
       default: null,
     },
+    sid: {
+      type: String,
+      default: null,
+    },
   },
   components: {
     ftHistoryDialog: () =>

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -199,7 +199,7 @@ import { selectDialogMixins } from "@base/mixins/selectDialog";
 
 export default {
   name: "ftHistoryDialog",
-  props: ["visiable", "objType", "objCode", "relationCode"],
+  props: ["visiable", "objType", "objCode", "relationCode", "sid"],
   mixins: [selectDialogMixins],
   components: {
     formDesignerDialog: () =>
@@ -326,8 +326,7 @@ export default {
           return {
             ...this.formData,
             objType: this.objType,
-            objCode: this.objCode,
-            relationCode: this.relationCode,
+            sid: this.sid,
           };
         },
         columns: [
@@ -373,6 +372,16 @@ export default {
             field: "modifyDate",
             width: 150,
           },
+          {
+            title: this.$t1("导入发布人"),
+            field: "importBy",
+            width: 150,
+          },
+          {
+            title: this.$t1("导入发布时间"),
+            field: "importDate",
+            width: 150,
+          },
           {
             width: 90,
             fixed: "right",
@@ -478,13 +487,13 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
-  .designer-drawer{
-    left:0;top:50px;
-  }
-  ::v-deep .dialog-style.list-dialog{
-    .designer-drawer .el-drawer__body .designer-box{
-      height:100%
-    }
-  }
+<style scoped lang="scss">
+  .designer-drawer{
+    left:0;top:50px;
+  }
+  ::v-deep .dialog-style.list-dialog{
+    .designer-drawer .el-drawer__body .designer-box{
+      height:100%
+    }
+  }
 </style>

package/src/views/bd/setting/formVersion/link.vue

@@ -14,6 +14,7 @@
           :objType="objType"
           :objCode="objCode"
           :relationCode="relationCode"
+          :sid="sid"
           @reverCallback="reverCallback"
         />
       </i>
@@ -36,6 +37,10 @@ export default {
       type: String,
       default: null,
     },
+    sid: {
+      type: String,
+      default: null,
+    },
   },
   components: {
     ftHistoryDialog: () =>

package/src/views/bd/setting/form_script/edit.vue

@@ -13,6 +13,7 @@
               objType="FormScript"
               :objCode="formScript.scriptCode"
               :relationCode="formScript.formCode"
+              :sid="formScript.sid"
               @reverCallback="$baseReload()"
             ></formVersionButton>
             <reverButton

package/src/views/bd/setting/form_script/edit1.vue

@@ -12,6 +12,7 @@
             objType="FormScript"
             :objCode="formScript.scriptCode"
             :relationCode="formScript.formCode"
+            :sid="formScript.sid"
             @reverCallback="$baseReload()"
           ></formVersionButton>
           <reverButton

package/src/views/bd/setting/form_script/form_list.vue

@@ -122,6 +122,7 @@
                 objType="FormScript"
                 :objCode="row.scriptCode"
                 :relationCode="row.formCode"
+                :sid="row.sid"
                 @reverCallback="searchEvent"
               ></formVersionButton>
             </template>

package/src/views/bd/setting/form_script/list.vue

@@ -76,6 +76,7 @@
                 objType="FormScript"
                 :objCode="row.scriptCode"
                 :relationCode="row.formCode"
+                :sid="row.sid"
                 @reverCallback="searchEvent"
               ></formVersionButton>
               <a

package/src/views/bd/setting/form_script/list1.vue

@@ -14,6 +14,7 @@
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="tree-box fl">
+          <slot name="treeTop"></slot>
           <div class="tit">
             <b>{{ $t1("表单分类") }}</b>
           </div>
@@ -144,6 +145,7 @@
                   objType="FormScript"
                   :objCode="row.scriptCode"
                   :relationCode="row.formCode"
+                  :sid="row.sid"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a

package/src/views/bd/setting/form_template/edit.vue

@@ -11,6 +11,7 @@
             v-if="!hData && formTemplate.id && !readonly"
             objType="FormTemplate"
             :objCode="formTemplate.formCode"
+            :sid="formTemplate.sid"
             @reverCallback="$baseReload()"
           ></formVersionButton>
           <reverButton

package/src/views/bd/setting/form_template/list.vue

@@ -15,6 +15,7 @@
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="tree-box fl">
+          <slot name="treeTop"></slot>
           <div class="tit">
             <b>{{ $t1("表单分类") }}</b>
           </div>
@@ -159,6 +160,7 @@
                 <formVersionButton
                   objType="FormTemplate"
                   :objCode="row.formCode"
+                  :sid="row.sid"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a

package/src/views/bd/setting/table_model/edit.vue

@@ -11,6 +11,7 @@
             v-if="!hData && szTaMb.id && !readonly"
             objType="SzTaMb"
             :objCode="szTaMb.taCode"
+            :sid="szTaMb.sid"
             @reverCallback="$baseReload()"
           ></formVersionButton>
           <reverButton

package/src/views/bd/setting/table_model/list.vue

@@ -148,6 +148,7 @@
                 <formVersionButton
                   objType="SzTaMb"
                   :objCode="row.taCode"
+                  :sid="row.sid"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a

package/src/views/user/wf/wfReport/index.vue

@@ -526,8 +526,31 @@ export default {
   }
 }
 .filter-btns {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  gap: 8px;
   .f-btn {
-    margin-right: 25px;
+    margin-right: 0;
+  }
+  // 内联的 128px !important 无法被覆盖，但 flex-shrink 依然生效，
+  // 让各查询项按比例收缩，保证刷新/搜索按钮不换行掉下去
+  ::v-deep .el-select,
+  ::v-deep .el-input,
+  ::v-deep .el-date-editor {
+    flex: 0 1 auto;
+    min-width: 76px;
+  }
+  .button-sty {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    min-width: 0;
+    margin: 0;
+  }
+  > .el-button {
+    flex: none;
+    white-space: nowrap;
   }
 }
 .sum-statistics {