doway-coms 1.4.61 → 1.4.63

package/package.json

@@ -1,52 +1,52 @@
-{
-  "name": "doway-coms",
-  "version": "1.4.61",
-  "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-contextmenujs": "^1.4.9",
-    "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.4.63",
+  "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-contextmenujs": "^1.4.9",
+    "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/BaseDate/src/index.vue

@@ -34,16 +34,26 @@
           {{ v.errors[0] }}
         </div>
       </ValidationProvider>
-      <span v-else>{{ moment(currentValue).format("YYYY-MM-DD") }}</span>
+      <Tooltip placement="topLeft" v-else>
+        <template slot="title">
+          {{ moment(currentValue).format("YYYY-MM-DD") }}
+        </template>
+        <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
+          {{ moment(currentValue).format("YYYY-MM-DD") }}
+        </span>
+      </Tooltip>
     </div>
   </div>
 </template>
   
-  <script>
-import { DatePicker } from "ant-design-vue";
+<script>
+//VXETable插件
+import VXETable from "vxe-table";
+//轻量级剪贴板复制函数
+import XEClipboard from "xe-clipboard";
+import { DatePicker, Tooltip } from "ant-design-vue";
 import { ValidationProvider } from "vee-validate";
 import moment from "moment";
-import { Tooltip } from "ant-design-vue";
 
 export default {
   name: "BaseDate",
@@ -143,6 +153,28 @@ export default {
   },
   created() {},
   methods: {
+    onContextmenu(event, currentValue) {
+      this.$contextmenu({
+        items: [
+          {
+            icon: 'ant-design:folder-open-filled',
+            label: "复制",
+            onClick: () => { 
+              if (XEClipboard.copy(currentValue)) {
+                VXETable.modal.message({
+                  content: "已复制到剪贴板！",
+                  status: "success",
+                });
+              }
+            }
+          }
+        ],
+        event,
+        zIndex: 100,
+        minWidth: 150
+      });
+      return false;
+    },
     change() {
       this.$emit("change");
     },

package/packages/BaseDateWeek/src/index.vue

@@ -29,12 +29,23 @@
           {{ v.errors[0] }}
         </div>
       </ValidationProvider>
-      <span v-else>{{ moment(currentValue).format("YYYY-MM-DD") }}</span>
+      <Tooltip placement="topLeft" v-else>
+        <template slot="title">
+          {{ moment(currentValue).format("YYYY-MM-DD") }}
+        </template>
+        <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
+          {{ moment(currentValue).format("YYYY-MM-DD") }}
+        </span>
+      </Tooltip>
     </div>
   </div>
 </template>
   
-  <script>
+<script>
+//VXETable插件
+import VXETable from "vxe-table";
+//轻量级剪贴板复制函数
+import XEClipboard from "xe-clipboard";
 import moment from "moment";
 import { DatePicker } from "ant-design-vue";
 import { ValidationProvider } from "vee-validate";
@@ -122,6 +133,28 @@ export default {
     change() {
       this.$emit("change");
     },
+    onContextmenu(event, currentValue) {
+      this.$contextmenu({
+        items: [
+          {
+            icon: 'ant-design:folder-open-filled',
+            label: "复制",
+            onClick: () => {
+              if (XEClipboard.copy(currentValue)) {
+                VXETable.modal.message({
+                  content: "已复制到剪贴板！",
+                  status: "success",
+                });
+              }
+            }
+          }
+        ],
+        event,
+        zIndex: 100,
+        minWidth: 150
+      });
+      return false;
+    }
   },
 };
 </script>

package/packages/BaseDatetime/src/index.vue

@@ -35,12 +35,23 @@
           {{ v.errors[0] }}
         </div>
       </ValidationProvider>
-      <span v-else>{{ currentValue }}</span>
+      <Tooltip placement="topLeft" v-else>
+        <template slot="title">
+          {{ currentValue }}
+        </template>
+        <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
+          {{ currentValue }}
+        </span>
+      </Tooltip>
     </div>
   </div>
 </template>
   
-  <script>
+<script>
+//VXETable插件
+import VXETable from "vxe-table";
+//轻量级剪贴板复制函数
+import XEClipboard from "xe-clipboard";
 import { DatePicker } from "ant-design-vue";
 import { ValidationProvider } from "vee-validate";
 import moment from "moment";
@@ -154,6 +165,28 @@ export default {
     change() {
       this.$emit("change");
     },
+    onContextmenu(event, currentValue) {
+      this.$contextmenu({
+        items: [
+          {
+            icon: 'ant-design:folder-open-filled',
+            label: "复制",
+            onClick: () => { 
+              if (XEClipboard.copy(currentValue)) {
+                VXETable.modal.message({
+                  content: "已复制到剪贴板！",
+                  status: "success",
+                });
+              }
+            }
+          }
+        ],
+        event,
+        zIndex: 100,
+        minWidth: 150
+      });
+      return false;
+    }
   },
 };
 </script>

package/packages/BaseTime/src/index.vue

@@ -30,12 +30,23 @@
           {{ v.errors[0] }}
         </div>
       </ValidationProvider>
-      <span v-else>{{ currentValue }}</span>
+      <Tooltip placement="topLeft" v-else>
+        <template slot="title">
+          {{ currentValue }}
+        </template>
+        <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
+          {{ currentValue }}
+        </span>
+      </Tooltip>
     </div>
   </div>
 </template>
   
-  <script>
+<script>
+//VXETable插件
+import VXETable from "vxe-table";
+//轻量级剪贴板复制函数
+import XEClipboard from "xe-clipboard";
 import moment from "moment";
 import { TimePicker } from "ant-design-vue";
 import { ValidationProvider } from "vee-validate";
@@ -124,6 +135,28 @@ export default {
     change() {
       this.$emit('change')
     },
+    onContextmenu(event, currentValue) {
+      this.$contextmenu({
+        items: [
+          {
+            icon: 'ant-design:folder-open-filled',
+            label: "复制",
+            onClick: () => { 
+              if (XEClipboard.copy(currentValue)) {
+                VXETable.modal.message({
+                  content: "已复制到剪贴板！",
+                  status: "success",
+                });
+              }
+            }
+          }
+        ],
+        event,
+        zIndex: 100,
+        minWidth: 150
+      });
+      return false;
+    }
   },
 };
 </script>

package/packages/utils/request.js

@@ -57,7 +57,7 @@ service.interceptors.response.use(
       return response.data
     }
     if (res.code == 60001) {
-      return new Promise((resolve, reject) => {
+      return new Promise(() => {
         let inputVal = '';
         Modal.info({
           zIndex: 3100,
@@ -97,8 +97,8 @@ service.interceptors.response.use(
                   ]);
                 },
                 onOk() {
-                  // 返回登录页
-                  store.dispatch('logOut')
+                  // 返回控制台并清空全部标签页
+                  store.dispatch('goWorkbench')
                 }
               });
             }
@@ -117,6 +117,10 @@ service.interceptors.response.use(
               return Promise.reject(error)
             }
           },
+          onCancel() {
+            // 返回控制台并清空全部标签页
+            store.dispatch('goWorkbench')
+          }
         });
       })
     }

package/packages/utils/store.js

@@ -65,11 +65,24 @@ export default new Vuex.Store({
                   visible: !loopField.hidden,
                   filters: loopField.isFilter,
                   sortable: loopField.isSortable,
-                  controlType: loopField.controlType
+                  controlType: loopField.controlType,
+                  edit:loopField.edit
+                }
+                //页面状态控制
+                if(loopField.editStates){
+                  tempField['editStates'] = loopField.editStates.split(',')
+                }
+                //单据状态控制
+                if(loopField.editStatuss){
+                  tempField['editStatuss'] = loopField.editStatuss.split(',')
                 }
                 let extraInfo = loopField.extraInfo
                   ? JSON.parse(loopField.extraInfo)
                   : ''
+                //存在额外参数，就赋值
+                if(extraInfo){
+                  tempField = XEUtils.assign(extraInfo,tempField)
+                }
                 if (tempField.controlType === controlType.select) {
                   tempField['dataSource'] = XEUtils.filter(
                     data.info.dictItems,
@@ -169,6 +182,12 @@ export default new Vuex.Store({
                 reject(error)
               })
           })
+        },
+        // 固定返回工作台，并根据条件决定是否关闭其余标签
+        goWorkbench({ commit }, tabsAllClose) {
+          if(window.$wujie){
+            window.$wujie.bus.$emit('subAppGoWorkbench', tabsAllClose==false?false:true)
+          }
         }
       },
       modules:{},