n20-common-lib 2.9.13 → 2.9.14

package/src/components/DynamicField/tableView.vue

@@ -0,0 +1,143 @@
+<template>
+  <cl-dialog v-drag width="85%" max-dialog :visible.sync="tableVisible" title="数据展示" :destroy-on-open="true">
+    <cl-page class="contentPop">
+      <div class="flex-box flex-lr flex-v m-b-s">
+        <div></div>
+        <div>
+          <el-button type="primary" size="mini" @click="option('导出json')">导出json</el-button>
+        </div>
+      </div>
+      <cl-table-pro ref="xTable" :loading="loading" :data="value" :columns="TableHeader" :height="'300px'">
+        <vxe-column slot="input" slot-scope="{ column }" v-bind="column" :field="column.prop" :title="column.label">
+          <el-input v-model="row[column.prop]" slot-scope="{ row }" placeholder="请输入" size="normal" clearable />
+        </vxe-column>
+        <vxe-column slot="delete" slot-scope="{ column }" v-bind="column" :field="column.prop" :title="column.label">
+          <el-link
+            slot-scope="{ row, $rowIndex }"
+            class="m-r-s"
+            :underline="false"
+            icon="n20-icon-a-shanchuxuanzhong"
+            @click="option('删除', row, $rowIndex)"
+          />
+        </vxe-column>
+      </cl-table-pro>
+
+      <div slot="footer" class="page-button-shadow flex-box flex-c flex-v">
+        <!--  <el-button type="primary" @click="option('保存')">保存</el-button> -->
+        <!-- <el-button plain @click="option('重置')">重置</el-button> -->
+      </div>
+    </cl-page>
+  </cl-dialog>
+</template>
+
+<script>
+import clDialog from '../Dialog/index.vue'
+import ClPage from '../PageLayout/page.vue'
+import ClTablePro from '../TablePro/index.vue'
+
+export default {
+  name: 'ContentPop',
+  components: { clDialog, ClPage, ClTablePro },
+  props: {
+    value: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      tableVisible: false,
+      TableHeader: [
+        {
+          slotName: 'input',
+          label: '枚举名',
+          prop: 'label',
+          align: 'left',
+          minWidth: '120',
+          'show-overflow-tooltip': true
+        },
+        {
+          slotName: 'input',
+          label: '枚举值',
+          prop: 'value',
+          width: '260'
+        },
+        {
+          slotName: 'delete',
+          width: '50'
+        }
+      ],
+      loading: false
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    setView(data) {
+      console.log(data)
+      let TableHeader = [
+        {
+          type: 'checkbox',
+          static: 'pre' // 静态不被"显示列"显示的,且最终会被拼接到"显示列"排序后的表格的"前面"
+        },
+        {
+          type: 'seq',
+          label: '序号',
+          width: '56',
+          align: 'center'
+        }
+      ]
+      data
+        .filter((item) => {
+          return item.isTableShow
+        })
+        .forEach((i) => {
+          TableHeader.push({
+            label: i.fieldName,
+            prop: i.fieldCode,
+            align: i.fieldType === 'input-number' ? 'right' : 'center',
+            sortable: i.fieldType === 'input-number',
+            formatter: i.fieldType === 'input-number' ? 'formatAmount' : '', // 金额格式化
+            minWidth: '120',
+            'show-overflow-tooltip': true
+          })
+        })
+      this.TableHeader = TableHeader
+      console.log(this.TableHeader)
+      this.tableVisible = true
+    },
+    option(key, row, index) {
+      // 将本地数据转换为 JSON 字符串
+      const jsonData = JSON.stringify(this.TableHeader, null, 2)
+      // 创建一个 Blob 对象
+      const blob = new Blob([jsonData], { type: 'application/json' })
+      // 创建一个下载链接
+      const url = window.URL.createObjectURL(blob)
+      const a = document.createElement('a')
+      switch (key) {
+        case '导出json':
+          a.href = url
+          a.download = 'TableHeader.json'
+          document.body.appendChild(a)
+          a.click()
+          // 释放 URL 对象
+          window.URL.revokeObjectURL(url)
+          document.body.removeChild(a)
+          break
+
+        default:
+          break
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.contentPop {
+  font-size: 14px;
+}
+</style>

package/src/components/ECharts/index.vue

@@ -3,11 +3,11 @@
 </template>
 
 <script>
-import resize from './mixins/resize'
-import merge from 'lodash/merge'
+import XEUtils from 'xe-utils'
 import importG from '../../utils/importGlobal.js'
+import resize from './mixins/resize'
 
-import { color, axisConfig, pieConfig } from './define'
+import { axisConfig, color, pieConfig } from './define'
 
 export default {
   name: 'Echarts',
@@ -72,7 +72,9 @@ export default {
         containLabel: true
       }
 
-      grid = Array.isArray(grid) ? grid.map((item) => merge({}, selfGrid, item)) : merge({}, selfGrid, grid)
+      grid = Array.isArray(grid)
+        ? grid.map((item) => XEUtils.merge({}, selfGrid, item))
+        : XEUtils.merge({}, selfGrid, grid)
 
       return {
         grid
@@ -80,13 +82,17 @@ export default {
     },
 
     xAxis({ xAxis }) {
-      xAxis = Array.isArray(xAxis) ? xAxis.map((item) => merge({}, axisConfig, item)) : merge({}, axisConfig, xAxis)
+      xAxis = Array.isArray(xAxis)
+        ? xAxis.map((item) => XEUtils.merge({}, axisConfig, item))
+        : XEUtils.merge({}, axisConfig, xAxis)
 
       return { xAxis }
     },
 
     yAxis({ yAxis }) {
-      yAxis = Array.isArray(yAxis) ? yAxis.map((item) => merge({}, axisConfig, item)) : merge({}, axisConfig, yAxis)
+      yAxis = Array.isArray(yAxis)
+        ? yAxis.map((item) => XEUtils.merge({}, axisConfig, item))
+        : XEUtils.merge({}, axisConfig, yAxis)
 
       return { yAxis }
     },
@@ -111,7 +117,7 @@ export default {
           config = pieConfig
         }
 
-        return merge(config, sery)
+        return XEUtils.merge(config, sery)
       })
 
       return { series }
@@ -135,7 +141,7 @@ export default {
 
         return {
           options,
-          baseOption: merge({}, _baseOption, baseOption),
+          baseOption: XEUtils.merge({}, _baseOption, baseOption),
           ...other
         }
       }
@@ -144,7 +150,7 @@ export default {
         return { ...prev, ...this[key](params) }
       }, defaultConfigs)
 
-      return merge({}, option, params)
+      return XEUtils.merge({}, option, params)
     },
 
     clear() {

package/src/components/Expandable/main.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="n20-form-expandable-pane">
-    <div class="n20-title flex-box flex-lr flex-v" :class="titleClass">
+    <div v-if="position === 'top'"  class="n20-title flex-box flex-lr flex-v" :class="{'n20-title__top':expand,titleClass}">
       <span class="n20-tips flex-item" @click="getExpand">
         <i v-if="icon" class="el-icon-caret-right color-0 m-r-b" :class="{ expand: expand }"></i>
         <slot name="title">
-          <span>{{ title }}</span>
+          <span :class="{'n20-title__algin_l':!icon}">{{ title }}</span>
         </slot>
       </span>
       <div>
@@ -16,6 +16,17 @@
         <slot></slot>
       </div>
     </el-collapse-transition>
+    <div v-if="position === 'bottom'" class="n20-title flex-box flex-lr flex-v" :class="{'n20-title__bottom':expand,titleClass}">
+      <span class="n20-tips flex-item"  @click="getExpand">
+        <i v-if="icon" class="el-icon-caret-right color-0 m-r-b" :class="{ topExpand: expand }"></i>
+        <slot name="title">
+          <span>{{ title }}</span>
+        </slot>
+      </span>
+      <div>
+        <slot name="tips"></slot>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -42,6 +53,10 @@ export default {
     titleClass: {
       type: String,
       default: ''
+    },
+    position: {
+      type: String,
+      default: 'top'
     }
   },
   data() {

package/src/components/FileImport/index.vue

@@ -12,11 +12,11 @@
         v-if="!uploadHttpRequest"
         v-bind="uploadProps"
         :width="width"
-        :showErrorExport="showErrorExport"
+        :show-error-export="showErrorExport"
         :validate-result="validateResult"
         :validate-confirm="validateConfirm"
-        @importError="importError"
         :pagination="pagination"
+        @importError="importError"
       >
         <span ref="upload-trigger" slot="trigger">upload</span>
       </Upload>
@@ -26,14 +26,13 @@
         :title="'导入文件' | $lc"
         :visible.sync="errorV"
         :width="width"
-        :showErrorExport="showErrorExport"
+        :show-error-export="showErrorExport"
         :validate-result="validateResult"
         :hide-percent="true"
         :footer-btn="footer"
         :validate-confirm="validateConfirm"
         @importError="importError"
-      >
-      </uploadMsg>
+      />
     </div>
   </el-dropdown>
 </template>