doway-coms 1.4.54 → 1.4.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.4.54",
+  "version": "1.4.56",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -239,18 +239,11 @@
       </template>
       <template #operation_edit="scope">
         <div>
+          <!-- 2个显示限制：页面状态visibleStatuss数组；根据其他字段限制visibleState对象 -->
           <a-button
             type="link"
             @click="operationButtonClick(item, scope)"
-            v-show="
-              item.visible === true &&
-              !(scope.row['sysOperationDisVisible_' + item.field] === true) &&
-              item.visibleState != undefined &&
-                item.visibleState.field != undefined &&
-                item.visibleState.visibleStatuss != undefined
-                ? item.visibleState.visibleStatuss.includes(scope.row.status)
-                : true
-            "
+            v-show="operationEdit(item, scope)"
             v-for="item in scope.column.params.columns"
             :key="item.field"
           >
@@ -1726,6 +1719,19 @@ export default {
       }
       this.$emit("operationBtnClick", btn, scope.row, this);
     },
+    operationEdit(item, scope) {
+      let isShow =
+        item.visible === true &&
+        !(scope.row["sysOperationDisVisible_" + item.field] === true) &&
+        (item.visibleState != undefined &&
+        item.visibleState.field != undefined &&
+        item.visibleState.visibleStatuss != undefined
+          ? item.visibleState.visibleStatuss.indexOf(
+              scope.row[item.visibleState.field]
+            ) != -1
+          : true);
+      return isShow;
+    },
     activeCellMethod({ row, column }) {
       let emitData ={
         row:row,

package/packages/index.js

@@ -85,7 +85,6 @@ Vue.use(Contextmenu);
 const install = function (Vue) {
 	//注册grid组件
 	Vue.use(VXETable)
-	Vue.use(Contextmenu)
 	// 遍历注册全局组件
 	components.forEach((component) => {
 		Vue.component(component.name, component);