doway-coms 1.3.6 → 1.3.8

package/dist/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "doway-coms",
+  "version": "1.0.0",
+  "description": "",
+  "main": "doway-coms.common.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

package/package.json

@@ -1,51 +1,51 @@
-{
-  "name": "doway-coms",
-  "version": "1.3.6",
-  "description": "doway组件库",
-  "author": "dowaysoft",
-  "main": "packages/index.js",
-  "license": "MIT",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "lib": "vue-cli-service build --target lib --name doway-coms --dest lib packages/index.js",
-    "build:test": "vue-cli-service build --report"
-  },
-  "dependencies": {
-    "ant-design-vue": "1.7.8",
-    "axios": "0.18.0",
-    "element-resize-detector": "^1.2.4",
-    "js-cookie": "2.2.0",
-    "vee-validate": "3.4.14",
-    "vue": "2.7.14",
-    "vue-router": "3.6.5",
-    "vuedraggable": "^2.24.3",
-    "vuex": "3.6.2",
-    "vxe-table": "3.5.4",
-    "xe-clipboard": "1.10.2",
-    "xe-utils": "3.5.4"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.2.0",
-    "@vue/cli-plugin-eslint": "~4.2.0",
-    "@vue/cli-plugin-vuex": "~4.2.0",
-    "@vue/cli-service": "~4.2.0",
-    "babel-eslint": "^10.0.3",
-    "babel-plugin-component": "^1.1.1",
-    "babel-plugin-import": "^1.13.6",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.1.2",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "less-loader": "^6.0.0",
-    "node-sass": "8.0.0",
-    "sass-loader": "10.4.1",
-    "vue-template-compiler": "^2.6.11"
-  },
-  "bundleDependencies": false,
-  "repository": {
-    "type": "git",
-    "url": "https://www.npmjs.com/package/doway-coms.git"
-  },
-  "keywords": []
-}
+{
+  "name": "doway-coms",
+  "version": "1.3.8",
+  "description": "doway组件库",
+  "author": "dowaysoft",
+  "main": "packages/index.js",
+  "license": "MIT",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "lib": "vue-cli-service build --target lib --name doway-coms --dest lib packages/index.js",
+    "build:test": "vue-cli-service build --report"
+  },
+  "dependencies": {
+    "ant-design-vue": "1.7.8",
+    "axios": "0.18.0",
+    "element-resize-detector": "^1.2.4",
+    "js-cookie": "2.2.0",
+    "vee-validate": "3.4.14",
+    "vue": "2.7.14",
+    "vue-router": "3.6.5",
+    "vuedraggable": "^2.24.3",
+    "vuex": "3.6.2",
+    "vxe-table": "3.5.4",
+    "xe-clipboard": "1.10.2",
+    "xe-utils": "3.5.4"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~4.2.0",
+    "@vue/cli-plugin-eslint": "~4.2.0",
+    "@vue/cli-plugin-vuex": "~4.2.0",
+    "@vue/cli-service": "~4.2.0",
+    "babel-eslint": "^10.0.3",
+    "babel-plugin-component": "^1.1.1",
+    "babel-plugin-import": "^1.13.6",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.1.2",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "less-loader": "^6.0.0",
+    "node-sass": "8.0.0",
+    "sass-loader": "10.4.1",
+    "vue-template-compiler": "^2.6.11"
+  },
+  "bundleDependencies": false,
+  "repository": {
+    "type": "git",
+    "url": "https://www.npmjs.com/package/doway-coms.git"
+  },
+  "keywords": []
+}

package/packages/BasePictureCard/src/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: inline-block">
-    <div class="file-card">
+    <div class="file-card" :class="isStyle? 'currentHeight' : ''">
       <div
         class="attach-wrapper"
         v-for="internalRow in internalRows.filter(
@@ -9,11 +9,14 @@
         :key="internalRow.attach.fileName"
       >
         <template v-if="internalRow.sysRowState !== sysRowState.delete">
+          <slot name='header' :row="internalRow"></slot>
           <div class="attach" v-if="internalRow.attach.content === 'image'">
             <img
               @click="attachFileClick(internalRow.attach)"
-              :style="{ width: width, height: height, lineHeight: height }"
+              :style="{ height: height, lineHeight: height }"
               style="
+                min-width: 100px;
+                width: 100%;
                 border: 1px solid #ccc;
                 border-radius: 6px;
                 overflow: hidden;
@@ -38,17 +41,18 @@
               type="eye"
               @click="viewAttach(internalRow.attach)"
             />
-            <VxeCheckbox
+            <!-- <VxeCheckbox
               class="attach-circle"
               v-model="internalRow.isDefault"
               @change="circleAttach(internalRow.attach, internalRow)"
               :disabled="formState == 'view'"
-            ></VxeCheckbox>
+            ></VxeCheckbox> -->
           </div>
           <div class="attach" v-else>
             <img
               @click="attachFileClick(internalRow.attach)"
               class="o_image"
+              style="width: 100%"
               :data-mimetype="internalRow.attach.contentType"
             />
             <a-icon
@@ -67,12 +71,12 @@
               type="eye"
               @click="viewAttach(internalRow.attach)"
             />
-            <VxeCheckbox
+            <!-- <VxeCheckbox
               class="attach-circle"
               v-model="internalRow.isDefault"
               @change="circleAttach(internalRow.attach, internalRow)"
               :disabled="formState == 'view'"
-            ></VxeCheckbox>
+            ></VxeCheckbox> -->
           </div>
           <div
             :style="{ width: width }"
@@ -199,6 +203,10 @@ export default {
     };
   },
   props: {
+    isStyle: {
+      type: Boolean,
+      default: false,
+    },
     showEmptyText: {
       type: Boolean,
       default: true,
@@ -279,7 +287,8 @@ export default {
       },
     },
   },
-  created() {},
+  created() {
+  },
   mounted() {
     // 请求头加入token
     this.uploadHeaders.Authorization = `Bearer ${this.$store.getters.token}`;
@@ -354,8 +363,8 @@ export default {
           sysRowState: sysRowState.add,
           attach: info.file.response.content,
         };
+
         this.internalRows.push(addRow);
-        this.$emit("add", this.dataName, info.file.response.content);
         let tempField;
         for (let i = 0; i < this.cols.length; i++) {
           // 赋值关联字段数据
@@ -374,6 +383,11 @@ export default {
             tempValue[tempField] = this.formRow[this.cols[i].linkValueField];
           }
         }
+        this.$emit(
+          "add",
+          this.dataName,
+          info.file.response.content
+        );
       }
     },
     beforeAvatarUpload(file) {
@@ -455,6 +469,8 @@ export default {
     narrowClick() {
       this.isFullscreen = false;
     },
+    // 单选改变事件
+    // change
   },
 };
 </script>
@@ -579,4 +595,8 @@ export default {
 .el-upload-list__item is-success {
   float: left;
 }
+.currentHeight {
+  display: flex;
+  align-items: center;
+}
 </style>

package/packages/utils/request.js

@@ -47,6 +47,7 @@ service.interceptors.response.use(
     }
     notification.error({
       message: '错误信息',
+      top:"100px",
       description: h => {
         return h('div', null, [
           h('p', { domProps: { innerHTML: res.msg } }, null)
@@ -74,7 +75,7 @@ service.interceptors.response.use(
     } else {
       errorMsg = error.msg
     }
-    notification['error']({ message: '错误信息', description: errorMsg })
+    notification['error']({ message: '错误信息', description: errorMsg, top:"100px" })
     return Promise.reject(error)
   }
 )