doway-coms 3.0.0 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",
@@ -26,6 +26,7 @@
     "vuedraggable": "^2.24.3",
     "vuex": "3.6.2",
     "vxe-table": "3.12.9",
+    "vxe-pc-ui": "3.3.83",
     "xe-clipboard": "1.10.2",
     "xe-utils": "3.5.4"
   },

package/packages/BaseForm/src/index.vue

@@ -3,7 +3,7 @@
     <a-button v-if="showFold===true"
       class="collapse-btn"
       type="link"
-      @click="hiddenDetail = !hiddenDetail"
+      @click="collapseChange()"
     >
       <a-icon :type="hiddenDetail ? 'down' : 'up'" class="collapse-icon" />
       <!-- {{ hiddenDetail ? '展开' : '收起' }} -->
@@ -611,6 +611,10 @@ export default {
   },
   activated() {},
   methods: {
+    collapseChange(){
+      this.hiddenDetail = !this.hiddenDetail
+      this.$emit('collapseChange',this.hiddenDetail)
+    },
     getFieldStyle(colInfo){
       // console.debug('0 0 calc('+colInfo.colSpan*250+'px -'+(colInfo.colSpan-1)*this.flexGap +'px)')
       let fieldStyle ={

package/packages/BaseGrid/src/index.vue

@@ -250,6 +250,7 @@
           <a-select
            :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             :allowClear="scope.column.params.allowClear"
+             v-if="getCellEditExp(scope)"
             show-search
              option-filter-prop="children"
             v-model="scope.row[scope.column.property]"
@@ -264,6 +265,9 @@
               >{{ loopSource.caption }}</a-select-option
             >
           </a-select>
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>
       <template #multiSelect_edit="scope">
@@ -271,6 +275,7 @@
           <a-select
            :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             v-model="scope.row[scope.column.property]"
+             v-if="getCellEditExp(scope)"
             @change="cellValueChange(scope)"
             mode="multiple"
             size="small"
@@ -284,6 +289,9 @@
               >{{ loopSource.caption }}</a-select-option
             >
           </a-select>
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>
       <template #time_edit="scope" class="interceptor-class">
@@ -1346,10 +1354,19 @@ export default {
       if(scope.column.params.editExp){
           for(let i=0;i<scope.column.params.editExp.length;i++){
               let exp = scope.column.params.editExp[i]
-              if(scope.row[exp.field]!==exp.value){
-                editExpResult = false
-                  break
+              if(exp.operator==='NE'){
+                  //不等于
+                if(scope.row[exp.field]===exp.value){
+                    editExpResult = false
+                    break
+                }
+              }else{
+                if(scope.row[exp.field]!==exp.value){
+                  editExpResult = false
+                    break
+                }
               }
+              
           }
       }
       return scope.column.params.controlEdit === true && editExpResult
@@ -2892,6 +2909,9 @@ export default {
     getVisibleData() {
       return this.$refs.baseGrid.getTableData().visibleData
     },
+    getVisibleDataLength(){
+      return this.$refs.baseGrid.getTableData().visibleData.length
+    },
     /**
      * 获取更新的行
      */
@@ -3095,6 +3115,12 @@ export default {
     },
     async cellClick({ row, column }) {
       this.$emit('cellClick', { row, column })
+
+      if(column.field==='operation'){
+          //点击操作栏按钮无需开启编辑，要不然数据多的情况下，连续点击删除按钮会照成卡顿
+          return
+      }
+
       //判断是否可以跳转
       // if (
       //   this.gridEdit != true ||

package/packages/BasePulldown/src/index.vue

@@ -478,6 +478,9 @@ export default {
       }
       if (this.columns[i].dataSource) {
         this.columns[i]['params'].dataSource = this.columns[i].dataSource
+        if(this.columns[i].controlType===controlType.select){
+          this.columns[i]['formatter'] = 'formatSelect'
+        }
       }
       if (!this.columns[i].width) {
         this.columns[i]['width'] = 100

package/packages/index.js

@@ -66,7 +66,10 @@ const components = [
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 
 import 'vxe-table/lib/style.css'
-import VxeUITable from 'vxe-table'
+import VXETable from 'vxe-table'
+
+import VxeUI from 'vxe-pc-ui'
+import 'vxe-pc-ui/lib/style.css'
 
 const popupInterceptor = (params) => {
   // 比如点击了某个组件的弹出层面板之后，此时被激活单元格不应该被自动关闭，通过返回 false 可以阻止默认的行为。
@@ -96,11 +99,11 @@ const popupInterceptor = (params) => {
   }
 }
 //网格弹出点击拦截器
-VxeUITable.interceptor.add('event.clearEdit', (params) => {
+VXETable.interceptor.add('event.clearEdit', (params) => {
   return popupInterceptor(params)
 })
 //网格筛选点击拦截器
-VxeUITable.interceptor.add('event.clearFilter', (params) => {
+VXETable.interceptor.add('event.clearFilter', (params) => {
   return popupInterceptor(params)
 })
 
@@ -113,7 +116,8 @@ Vue.use(Contextmenu)
 
 const install = function (Vue) {
   //注册grid组件
-  Vue.use(VxeUITable)
+  Vue.use(VXETable)
+  Vue.use(VxeUI)
   // 遍历注册全局组件
   components.forEach((component) => {
     Vue.component(component.name, component)