Merge remote-tracking branch 'origin/master'

zhaowei

3 天以前 9fbbbe80e6b48a3bd9544a24295971b8da9bc337

 src/views/system/NewPermissionList.vue

@@ -11,6 +11,7 @@
        type="primary"
        icon="delete">批量删除
      </a-button>
      <a-button @click="handleSecret" type="primary" icon="frown" v-if="selectionRows.length===1&&selectionRows[0].title==='kitty'">查询</a-button>
    </div>

    <!-- table区域-begin -->
@@ -75,6 +76,7 @@

    <permission-modal ref="modalForm" @ok="modalFormOk"></permission-modal>
    <permission-data-rule-list ref="PermissionDataRuleList" @ok="modalFormOk"></permission-data-rule-list>
    <secret-model ref="secret"></secret-model>

  </a-card>
</template>
@@ -85,6 +87,7 @@
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import PermissionDataRuleList from './PermissionDataRuleList'
  import JEllipsis from '@/components/jeecg/JEllipsis'
import SecretModel from './modules/SecretModel.vue'

  const columns = [
    {
@@ -147,7 +150,8 @@
    components: {
      PermissionDataRuleList,
      PermissionModal,
      JEllipsis
      JEllipsis,
        SecretModel
    },
    data() {
      return {
@@ -185,6 +189,10 @@
          })
        }
      },
      onSelectChange(selectedRowKeys, selectionRows) {
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;
      },
      // 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
      loadDataByExpandedRows(dataList) {
        if (this.expandedRowKeys.length > 0) {
@@ -220,6 +228,11 @@
      handleExpandedRowsChange(expandedRows) {
        this.expandedRowKeys = expandedRows
      },
      handleSecret(){
        this.$refs.secret.title='秘密'
        this.$refs.secret.add();
        
      }
    }
  }
</script>