jufubao-admin-library 1.1.120 → 1.1.121

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/components/PeopleManage.vue

@@ -251,6 +251,7 @@ export default {
           tipsformet: '上传文件格式：@imageType@，不超过@size@MB.<a style="color:#409EFF" href="https://img.jufubao.cn/xlsx/mobile_user.xlsx">模版下载</a>',
           type: ['docx', 'doc', 'xlsx'],
           styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+          showType: 'name', //其值：name=>显示文件名 url=>显示路径
           uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
           size: 5, //5M
           action: 'aliyun',

package/library/viewModules/viewsDynamicForm/viewsDynamicForm/components/dialogUser.vue

@@ -51,6 +51,9 @@
           @onApiSuccessUrl="handleApiSuccessUrl"
           @onGetParamsAndHeader="handlePrivateGetParamsAndHeader"
         >
+        <template slot="download" slot-scope="scope">
+          <el-link :style="{marginLeft:scope.width}" type="primary" @click="handleDown">点击下载模板</el-link>
+        </template>
         </xd-base-dynamic-field>
       </div>
       <div slot="btn" class="xd-dialog__box-footer">
@@ -169,22 +172,33 @@ export default {
       console.log(params, "initForm")
       this.listForm = [
         {
-          label: "请上传文件:",
-          ele: "xd-saas-upload-file",
+          label: '', //label
+          ele: 'slot', //package 名称
+          slot: 'download',
+        },
+        {
+          label: "文件:",
+          ele: "xd-upload",
           valueKey: "path_file",
-          value: null,
-          defaultValue: params.path_file ? { url: params.path_file} : null,
-          setting: {
-            type: ['xls', 'xlsx', 'csv'],
-          },
-          handleCustom: (action) => {
-            console.log("action", action);
-            if(action == 'download'){
-              window.open(this.download,'_self');
-            }
-          },
+          value: {},
+          defaultValue: {},
+          slot: false,
+          elinputClassName: "input40",
+          tipsformet: "上传文件格式：@imageType@，不超过@size@MB.",
+          type: ["xls", "xlsx", "csv"],
+          styleType: "one",
+          showType:'name', //显示类型 name:名称  url:地址
+          uploadType: "aliyun",
+          size: 5,
+          action: "aliyun",
+          sort: true,
+          maxlen: 100,
           rules: [
-            { required: true, message: "请上传文件", trigger: ["blur", "change"] },
+            {
+              required: true,
+              message: "请上传文件",
+              trigger: ["blur", "change"],
+            },
           ],
         },
         {
@@ -213,6 +227,9 @@ export default {
     handleCancelUpload(){
       this.dialogFormShow = false;
     },
+    handleDown() {
+      window.open(this.download,'_self');
+    },
     handleConfirmUpload(){
       this.$refs.poster.submit().then(res => {
         console.log("res", this.listValue)

package/library/viewModules/viewsMaterial/viewsMaterial/common/common.scss

@@ -17,8 +17,9 @@
 
 .material {
   flex: 1;
-  margin-left: 20px;
+  margin-left: 15px;
   padding-top: 30px;
+  margin-right: 15px;
 
   &-wrap {
     height: 560px;
@@ -47,31 +48,32 @@
       display: flex;
       flex-wrap: nowrap;
 
-      .el-button {
+      & > .el-button {
         margin-left: 15px;
       }
     }
   }
 
   &-list {
-    margin-top: 20px;
     display: flex;
     flex-wrap: wrap;
-    max-height: 460px;
-    min-height: 460px;
     overflow-y: auto;
+    margin-bottom: 10px;
+    justify-content: flex-start;
+    align-content: flex-start;
 
     &-item {
-      margin-right: 30px;
-      margin-bottom: 16px;
+      margin-right: 15px;
+      margin-bottom: 15px;
       position: relative;
-      width: 110px;
+      width: 127px;
       cursor: pointer;
 
       &-img {
         width: 110px;
         height: 110px;
         background: #f6f7f9;
+        margin: 0 auto;
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -80,9 +82,10 @@
       }
 
       &-name {
+        width: 110px;
         font-size: 16px;
         color: #666;
-        margin: 12px 0;
+        margin: 12px auto;
         text-align: left;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -94,6 +97,13 @@
         color: #999;
       }
     }
+
+    &.c5 .material-list-item:nth-child(5n) {
+      margin-right: 0;
+    }
+    &.c7 .material-list-item:nth-child(7n) {
+      margin-right: 0;
+    }
   }
 
   .active {
@@ -122,8 +132,8 @@
 }
 
 .el-empty {
-  height: 480px;
-  min-height: 480px;
+  height: 100%;
+  width: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -131,4 +141,4 @@
   text-align: center;
   box-sizing: border-box;
   padding: 40px 0;
-}
+}

package/library/viewModules/viewsMaterial/viewsMaterial/common/platform.scss

@@ -1,7 +1,5 @@
 .platform-wrap {
-  height: 570px;
-  overflow-y: auto;
-  margin-left: 20px;
+  height: 100%;
 }
 
 .platform-header {
@@ -101,4 +99,4 @@
     left: 31%;
     transform: translate(-50%, -50%);
   }
-}
+}

package/library/viewModules/viewsMaterial/viewsMaterial/components/CusUpload.vue

@@ -7,8 +7,8 @@
           <slot :image="oneItem">
             <el-button size="small" type="primary" :disabled="disabled">{{uploadName}}</el-button>
           </slot>
-          <div v-if="(oneItem && (oneItem.path || oneItem.url)) && !disabled " class="xd-upload__one-btn-del" @click.stop="delOne()">
-            <i v-if="item['slot'] || isShowDel" class="el-icon-delete"></i>
+          <div  v-if="isShowDel && (oneItem && (oneItem.path || oneItem.url)) && !disabled " class="xd-upload__one-btn-del" @click.stop="delOne()">
+            <i v-if="item['slot']" class="el-icon-delete"></i>
           </div>
           <div class="xd-upload__disabled" v-if="disabled"></div>
         </div>
@@ -61,7 +61,7 @@
             :disabled="isBtnMaterialMore || disabled"
             @click="isDialogShow=true"
           >{{materialBtnName}}</el-button></div>
-          <div v-if="showtype" slot="tip" class="xd-upload__tip">
+          <div v-if="showType" slot="tip" class="xd-upload__tip">
             <slot name="tip"><span v-html="tooltip"></span></slot>
           </div>
         </div>
@@ -95,13 +95,13 @@
             <slot :image="oneItem">
               <el-button size="small" type="primary" :disabled="disabled">{{uploadName}}</el-button>
             </slot>
-            <div v-if="(oneItem && (oneItem.path || oneItem.url)) && !disabled " class="xd-upload__one-btn-del" @click.stop="delOne()">
+            <div v-if="isShowDel && (oneItem && (oneItem.path || oneItem.url)) && !disabled " class="xd-upload__one-btn-del" @click.stop="delOne()">
               <i v-if="item['slot']" class="el-icon-delete"></i>
             </div>
             <div class="xd-upload__disabled" v-if="disabled"></div>
           </div>
         </el-upload>
-        <div v-if="showtype" slot="tip" class="xd-upload__tip">
+        <div v-if="showType" slot="tip" class="xd-upload__tip">
           <slot name="tip"><span v-html="tooltip"></span></slot>
         </div>
       </template>
@@ -177,7 +177,7 @@
               </div>
             </el-upload>
           </div>
-          <div v-if="showtype" slot="tip" class="xd-upload__tip">
+          <div v-if="showType" slot="tip" class="xd-upload__tip">
             <slot name="tip"><span v-html="tooltip"></span></slot>
           </div>
         </div>
@@ -257,7 +257,7 @@
             </div>
           </el-upload>
            <el-upload
-            v-else            
+            v-else
             :disabled="disabled"
             class="xd-upload__list-ele"
             ref="xd-upload__list"
@@ -281,7 +281,7 @@
               <div class="xd-upload__disabled" v-if="disabled&&!isRealse"></div>
             </div>
           </el-upload>
-          <div v-if="showtype" slot="tip" class="xd-upload__tip">
+          <div v-if="showType" slot="tip" class="xd-upload__tip">
             <slot name="tip"><span v-html="tooltip"></span></slot>
           </div>
         </div>
@@ -367,7 +367,7 @@
 			/**
        * @description 是否显示提示语
        */
-			showtype: {
+			showType: {
 				type: Boolean,
 				default: false
       },
@@ -1058,6 +1058,9 @@
             if(this.$xdHelper.isEmpty(this.defaultValue))  this.update('', 'init');
             else this.update(this.$xdHelper.cloneDeep(this.defaultValue), 'init');
           }
+          else if(this.$xdHelper.checkVarType(this.defaultValue) === 'string' && this.defaultValue.length > 0){
+            this.update({url: this.defaultValue}, 'init');
+          }
           else {
             this.update('', 'init');
           }
@@ -1342,7 +1345,7 @@
     &__tip {
       font-size: 10px;
       padding-top: 10px;
-      line-height: 24px;
+      line-height: 16px;
     }
 
     &__one {

package/library/viewModules/viewsMaterial/viewsMaterial/components/dialogSearch.vue

@@ -0,0 +1,319 @@
+<template>
+  <div class="search" v-if="options.length > 0">
+    <div class="search-wrap">
+      <div class="cus-options">
+        <div class="search-options">
+          <div
+            class="search-options-group"
+            v-for="(item, index) in searchOptions"
+            :key="index"
+          >
+            <div class="search-options-group-label">{{ item.label }}</div>
+            <div class="search-options-group-content">
+              <div
+                :class="{ active: isActive(option.value, item.value) }"
+                class="search-options-group-item"
+                v-for="(option, oindex) in item.children"
+                :key="oindex"
+                @click="handleChoseOption(option.value, item.value)"
+              >{{ option.label }}</div>
+            </div>
+          </div>
+        </div>
+        <div v-if="options.length > 1" class="show">
+          <xd-font-icon
+            @click="handleClick"
+            v-if="isFold"
+            icon="iconjiantou_you"
+            class="rotateDown"
+          ></xd-font-icon>
+          <xd-font-icon
+            @click="handleClick"
+            v-else
+            icon="iconjiantou_you"
+            class="rotateUp"
+          ></xd-font-icon>
+        </div>
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import XdFontIcon from "@/components/XdFontIcon.vue";
+export default {
+  name: "search",
+  props: {
+    options: {
+      type: Array,
+      default: () => [],
+    },
+    statusList: {
+      type: Array,
+      default: () => [],
+    },
+    isDialog: {
+      type: Boolean,
+      default: false,
+    },
+    isShowStatus: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  components: {
+    XdFontIcon,
+  },
+  watch: {
+    isFold(n, o) {
+      if (n) {
+        let arr = this.$xdHelper.cloneDeep(this.options);
+        this.searchOptions = arr.splice(0, 1);
+      } else {
+        this.searchOptions = this.$xdHelper.cloneDeep(this.options);
+      }
+    },
+    file_name(n, o) {
+      this.handleUpdate();
+    },
+    status(n, o) {
+      this.handleUpdate();
+    },
+    specs: {
+      handler(n, o) {
+        this.handleUpdate();
+      },
+      deep: true,
+    },
+  },
+  data() {
+    return {
+      searchOptions: [],
+      searchStatusList: [],
+      isFold: false,
+      specs: [],
+      status: "",
+    };
+  },
+  created() {
+    if (this.options && this.options.length > 0) {
+      if (this.options.length > 1) {
+        this.isFold = true;
+      }
+      this.searchOptions = this.$xdHelper.cloneDeep(this.options);
+      this.searchOptions.map((item) => {
+        this.specs.push({
+          spec_key: item.value,
+          spec_value: ["all"],
+        });
+      });
+    } else {
+      this.searchOptions = [];
+      this.specs = [];
+    }
+    if (this.statusList && this.statusList.length > 0) {
+      this.searchStatusList = this.$xdHelper.cloneDeep(this.statusList);
+      if (this.isDialog) {
+        this.status = "Y";
+      } else {
+        this.status = "all";
+      }
+    } else {
+      this.searchStatusList = [];
+      this.status = "";
+    }
+    this.handleUpdate();
+    this.handleSearch("search");
+  },
+  mounted() {
+    this.$nextTick(()=>{
+      this.$emit('onChange');
+    })
+  },
+  methods: {
+    handleClick(){
+      this.isFold = !this.isFold;
+      this.$nextTick(()=>{
+        this.$emit('onChange');
+      })
+    },
+    isActive(value, key) {
+      let flag = this.specs.find((item) => item.spec_key === key);
+      if (flag) {
+        return flag.spec_value.includes(value);
+      } else {
+        return false;
+      }
+    },
+    handleReset() {
+      this.file_name = "";
+      this.specs = [];
+      this.options.map((item) => {
+        this.specs.push({
+          spec_key: item.value,
+          spec_value: ["all"],
+        });
+      });
+      if (this.isDialog) {
+        this.status = "Y";
+      } else {
+        this.status = "all";
+      }
+      this.handleSearch("reset");
+    },
+    handleChoseStatus(value) {
+      this.status = value;
+      this.handleSearch("search");
+    },
+
+    handleChoseOption(value, key) {
+      // 查找specs数组中是否存在spec_key为key的元素
+      let flag = this.specs.find((item) => item.spec_key === key);
+      // 如果存在
+      if (flag) {
+        // 如果flag.spec_value中包含value
+        if (flag.spec_value.includes(value)) {
+          // 将value从flag.spec_value中移除
+          flag.spec_value = flag.spec_value.filter((item) => item !== value);
+          // 如果flag.spec_value为空
+          if (flag.spec_value.length === 0) {
+            // 将flag从specs数组中移除
+            this.specs = this.specs.filter((item) => item.spec_key !== key);
+          }
+        } else {
+          // 如果value的值为"all"，则将flag.spec_value设置为["all"]，并返回
+          if (value === "all") {
+            flag.spec_value = ["all"];
+          } else {
+            // 如果flag.spec_value中包含"all"，则将"all"从flag.spec_value中移除
+            if (flag.spec_value.includes("all")) {
+              flag.spec_value = flag.spec_value.filter(
+                (item) => item !== "all"
+              );
+            }
+            // 将value添加到flag.spec_value中
+            flag.spec_value.push(value);
+          }
+        }
+      } else {
+        // 如果specs数组中不存在spec_key为key的元素，则将key和value添加到specs数组中
+        this.specs.push({
+          spec_key: key,
+          spec_value: [value],
+        });
+      }
+      this.handleSearch("search");
+    },
+    handleSearch(action) {
+      let params = {
+        specs: this.specs,
+        status: this.status,
+      };
+      this.$emit("onSearch", { action, params });
+    },
+    handleUpdate() {
+      let params = {
+        file_name: this.file_name,
+        specs: this.specs,
+        status: this.status,
+      };
+      this.$emit("input", params);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.search {
+  // min-height: 130px;
+  &-wrap {
+  }
+  &-input {
+    display: flex;
+    justify-content: flex-end;
+    span {
+      color: #333333;
+      font-size: 14px;
+    }
+  }
+  &-options {
+    flex: 1;
+    &-group {
+      display: flex;
+      align-items: baseline;
+      &-content {
+        display: flex;
+        flex-wrap: wrap;
+      }
+      &-label {
+        color: #333333;
+        font-size: 14px;
+        flex-shrink: 0;
+        width: 70px;
+        white-space: nowrap; /* 确保文本在一行内显示 */
+        overflow: hidden; /* 超出容器部分的文本隐藏 */
+        text-overflow: ellipsis; /* 使用省略号显示文本的溢出部分 */
+      }
+      &-item {
+        margin-right: 12px;
+        margin-bottom: 10px;
+        border-radius: 4px;
+        border: 1px solid #dfdfdf;
+        padding: 6px 12px 4px 12px;
+        color: #333;
+        font-size: 12px;
+        cursor: pointer;
+        flex-shrink: 0;
+      }
+    }
+  }
+}
+.cus-options {
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-end;
+  align-content: flex-end;
+  margin-bottom: 10px;
+  border-bottom: 1px solid #eee;
+
+  .show {
+    flex-shrink: 0;
+    margin-left: 10px;
+  }
+}
+
+.rotateDown {
+  transform: rotate(90deg);
+  background: #f5f5f5;
+  color: #999;
+  font-size: 10px;
+  padding: 3px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+.rotateUp {
+  transform: rotate(-90deg);
+  background: #f5f5f5;
+  color: #999;
+  font-size: 10px;
+  padding: 4px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+.active {
+  border: 1px solid #409eff;
+  color: #409eff;
+}
+.show {
+  display: flex;
+  justify-content: space-between;
+  background: #fff;
+  align-items: center;
+  margin-bottom: 10px;
+  &-text {
+    font-size: 14px;
+    color: #cccccc;
+  }
+}
+</style>

package/library/viewModules/viewsMaterial/viewsMaterial/components/form.vue

@@ -76,9 +76,7 @@
               v-for="(option, oindex) in item.children"
               :key="oindex"
               @click="handleChoseOption(option.value, item.value)"
-            >
-              {{ option.label }}
-            </div>
+            >{{ option.label }}</div>
           </div>
         </div>
       </div>
@@ -320,4 +318,4 @@ export default {
   color: #409eff;
   background: #ecf5ff;
 }
-</style>
+</style>

package/library/viewModules/viewsMaterial/viewsMaterial/components/list.vue

@@ -52,7 +52,7 @@ export default {
     if (this.list && this.list.length > 0) {
       this.materialList = this.$xdHelper.cloneDeep(this.list);
       this.materialList = this.materialList.map((item) => {
-        item.file_url = `${this.getImageFullPath(item.file_url)}&time=${new Date().getTime()}`;
+        item.file_url = `${this.getImageFullPath(item.file_url, 'size4')}&time=${new Date().getTime()}`;
         return item;
       });
     }
@@ -102,4 +102,4 @@ export default {
     }
   }
 }
-</style>
+</style>

package/library/viewModules/viewsMaterial/viewsMaterial/components/search.vue

@@ -10,7 +10,7 @@
       >
         <div
           v-if="isShowStatus"
-          style="margin-top: 0px"
+          style="margin-top: 0"
           class="search-options-group"
         >
           <div class="search-options-group-label">状态</div>
@@ -20,9 +20,7 @@
             v-for="(item, index) in searchStatusList"
             :key="index"
             @click="handleChoseStatus(item.value)"
-          >
-            {{ item.label }}
-          </div>
+          >{{ item.label }}</div>
         </div>
         <div class="search-input">
           <div>
@@ -35,9 +33,7 @@
           </div>
           <div>
             <el-button @click="handleReset">重置</el-button>
-            <el-button @click="handleSearch('search')" type="primary"
-              >搜索</el-button
-            >
+            <el-button @click="handleSearch('search')" type="primary">搜索</el-button>
           </div>
         </div>
       </div>
@@ -340,4 +336,4 @@ export default {
     color: #cccccc;
   }
 }
-</style>
+</style>