n20-common-lib 3.0.28 → 3.0.29

package/src/assets/iconFont3/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "47056829",
+      "name": "group-expand",
+      "font_class": "group-expand",
+      "unicode": "e97f",
+      "unicode_decimal": 59775
+    },
+    {
+      "icon_id": "47056828",
+      "name": "group-collapse",
+      "font_class": "group-collapse",
+      "unicode": "e980",
+      "unicode_decimal": 59776
+    },
+    {
+      "icon_id": "47051390",
+      "name": "Zoom to 100%",
+      "font_class": "a-Zoomto100",
+      "unicode": "e97e",
+      "unicode_decimal": 59774
+    },
     {
       "icon_id": "46738669",
       "name": "存款业务",

package/src/components/AdvancedFilter/index.vue

@@ -33,7 +33,7 @@
       <slot name="suffix"></slot>
       <el-form-item :class="prefixCls + '-add'">
         <el-button v-popover:advanced_popover onlyicon plain>
-          <i class="iconfont icon-plus"></i>
+          <i class="v3-icon-plus"></i>
           {{ $lc('添加条件') }}
         </el-button>
         <el-popover ref="advanced_popover" placement="bottom-start" trigger="click">
@@ -56,7 +56,7 @@
           </div>
         </el-popover>
         <span v-if="filterId" class="m-l-s color-primary" :underline="false" @click="$emit('search')">
-          <i class="iconfont icon-search"></i>
+          <i class="v3-icon-search"></i>
           {{ '查询' | $lc }}</span
         >
         <span
@@ -72,11 +72,11 @@
           "
           @click="addView"
         >
-          <i class="iconfont icon-folder-add"></i>
+          <i class="v3-icon-folder-add"></i>
           {{ '另存为视图' | $lc }}
         </span>
         <span v-if="filterId" class="m-l-s color-primary" :underline="false" @click="cleared">
-          <i class="iconfont icon-delete"></i>
+          <i class="v3-icon-delete"></i>
           {{ '清空条件' | $lc }}</span
         >
       </el-form-item>

package/src/components/DragList/index.vue

@@ -4,7 +4,7 @@
     :animation="200"
     :group="group"
     :disabled="disabled"
-    :handle="'.icon-drag'"
+    :handle="'.v3-icon-drag'"
     @change="change"
   >
     <div
@@ -14,7 +14,7 @@
       @mouseenter="hoverIndex = index"
       @mouseleave="hoverIndex = -1"
     >
-      <i class="iconfont icon-drag f-s-b pointer m-r-s"></i>
+      <i class="v3-icon-drag f-s-b pointer m-r-s"></i>
       <slot :item="item" :index="index">
         <span v-hover-tooltip:158="item[labelKey] || item" class="drag-item-text" @click="$emit('click', item)">{{
           item[labelKey] || item
@@ -24,14 +24,14 @@
       <i
         v-if="inSC && !disabled && !hideDelete"
         v-show="hoverIndex === index"
-        class="iconfont icon-unlock icon-class"
+        class="v3-icon-unlock icon-class"
         :disabled="item.checked"
         @click="lock(index)"
       />
       <i
         v-show="hoverIndex === index"
         v-if="!disabled && !hideDelete"
-        class="iconfont icon-delete icon-class"
+        class="v3-icon-delete icon-class"
         :disabled="inSC && item.checked"
         @click="remove(index)"
       />

package/src/components/ProFilterView/advancedQuery.vue

@@ -12,7 +12,7 @@
         v-if="groupIndex > 0"
         type="text"
         class="delete-group-btn-top"
-        icon="iconfont icon-fail-fill"
+        icon="v3-icon-delete-fill"
         @click.stop="removeConditionGroup(groupIndex)"
       />
       <!-- 条件列表 -->
@@ -157,19 +157,14 @@
                 ></slot>
               </div>
               <!-- 添加按钮 -->
-              <el-button
-                type="text"
-                class="add-btn"
-                icon="iconfont icon-add-fill"
-                @click.stop="addCondition(groupIndex)"
-              />
+              <el-button type="text" class="add-btn" icon="v3-icon-add-fill" @click.stop="addCondition(groupIndex)" />
               <!--  <i class="iconfont icon-add-fill" @click.stop="addCondition(groupIndex)"></i> -->
               <!-- 删除按钮 -->
               <el-button
                 type="text"
                 class="delete-btn"
                 :disabled="group.conditions.length <= 1"
-                icon="iconfont icon-reduce-fill"
+                icon="v3-icon-reduce-fill"
                 @click.stop="removeCondition(groupIndex, condIndex)"
               />
             </div>
@@ -180,10 +175,10 @@
     <!-- 添加条件按钮 -->
     <div class="group-actions">
       <el-button v-if="value.length > 0" type="text" class="add-condition-btn" @click.stop="addCondition(0)">
-        <i class="iconfont icon-add-fill"></i> 添加条件
+        <i class="v3-icon-add-fill"></i> 添加条件
       </el-button>
       <el-button type="text" class="add-group-btn" @click.stop="addConditionGroup(groupIndex)">
-        <i class="iconfont icon-add-fill"></i> 添加条件组
+        <i class="v3-icon-add-fill"></i> 添加条件组
       </el-button>
     </div>
   </div>

package/src/components/ProFilterView/index.vue

@@ -5,7 +5,7 @@
         <el-popover v-model="stVisible" placement="bottom" trigger="click" class="m-r">
           <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== '所有的' }">
             <div class="flex-box flex-v m-r">
-              <i class="iconfont icon-inbox"></i>
+              <i class="v3-icon-inbox"></i>
               <div style="margin: 0 8px">{{ selectedItem }}</div>
               <i class="n20-icon-xiala-moren"></i>
             </div>
@@ -48,7 +48,7 @@
         <el-button v-if="selectItem" class="activiti m-r" @click="edit(selectItem, true)">
           <div class="flex-box flex-v">
             <!-- <img src="./find.svg" alt="" /> -->
-            <i class="iconfont icon-find"></i>
+            <i class="v3-icon-find"></i>
             <div style="margin-left: 8px">
               {{
                 `视图数据范围（${
@@ -109,7 +109,7 @@
         <div class="flex-box flex-lr flex-v">
           <div>{{ $lc('数据范围') }}</div>
           <div style="color: var(--color-primary); cursor: pointer" @click="typeChange">
-            <i class="iconfont icon-switch"></i>
+            <i class="v3-icon-switch"></i>
             <span v-if="form.viewType === '0'"> {{ $lc('高级查询') }}</span>
             <span v-else> {{ $lc('基础查询') }}</span>
           </div>

package/src/components/ShowColumn/index.vue

@@ -69,12 +69,12 @@
               {{ '当前选定项' | $lc }}
               <span class="right-count"> ({{ rightTotalCount }}) </span>
             </div>
-            <i class="iconfont icon-delete pointer icon-class" @click="clearAll"></i>
+            <i class="v3-icon-delete pointer icon-class" @click="clearAll"></i>
           </div>
           <div class="overflow-y w-100p darg-list-wrap">
             <!-- 纯静态列（static=true），不可拖拽，无删除 -->
             <div v-for="(item, index) in pureStaticColumns" :key="'ps-' + index" class="n20-drag-list-item">
-              <i class="iconfont icon-lock f-s-b m-r-s"></i>
+              <i class="v3-icon-lock f-s-b m-r-s"></i>
               <span v-hover-tooltip:158="item[labelKey] || item" class="drag-item-text">{{
                 item[labelKey] || item
               }}</span>
@@ -85,7 +85,7 @@
                 :list="fixedColumns"
                 :animation="200"
                 group="fixedBox"
-                handle=".icon-drag"
+                handle=".v3-icon-drag"
                 @change="onFixedDragChange"
               >
                 <div
@@ -95,21 +95,17 @@
                   @mouseenter="fixedHoverIndex = index"
                   @mouseleave="fixedHoverIndex = -1"
                 >
-                  <i class="iconfont icon-drag f-s-b pointer m-r-s"></i>
+                  <i class="v3-icon-drag f-s-b pointer m-r-s"></i>
                   <span v-hover-tooltip:158="item[labelKey] || item" class="drag-item-text flex-item">{{
                     item[labelKey] || item
                   }}</span>
                   <!-- hover 时显示解锁图标，点击将该项移回 dragList -->
                   <i
                     v-show="fixedHoverIndex === index"
-                    class="iconfont icon-unlock icon-class m-r-s"
+                    class="v3-icon-unlock icon-class m-r-s"
                     @click="unlockFixed(item, index)"
                   />
-                  <i
-                    v-show="fixedHoverIndex === index"
-                    class="iconfont icon-delete icon-class"
-                    @click="removeFixed(item)"
-                  />
+                  <i v-show="fixedHoverIndex === index" class="v3-icon-delete icon-class" @click="removeFixed(item)" />
                 </div>
               </vue-draggable>
             </template>
@@ -149,7 +145,7 @@
           >
             <span slot-scope="{ node, data }" class="menu-item flex-item flex-box flex-lr flex-v">
               <span>
-                <i class="iconfont icon-drag pointer"></i>
+                <i class="v3-icon-drag pointer"></i>
                 <span
                   :class="data.isNew ? 'color-success' : 'color-primary'"
                   class="text-ellipsis pointer"
@@ -593,7 +589,7 @@ export default {
       this.dragList = baseCols.filter((col) => !col.fixed && !col.static)
     },
     setChange() {
-      if (this.dragList.length < 1) {
+      if (this.pureStaticColumns.length < 1 && this.fixedColumns.length < 1 && this.dragList.length < 1) {
         this.$message.error(
           `${$lc(`至少设置`)}${
             this.isExport ? $lc('一列导出数据') : this.isFilter ? $lc('一个筛选条件') : $lc('一列显示列')

package/src/components/TablePro/index.vue

@@ -85,14 +85,14 @@
               <!-- 已固定列（fixed='left'）：hover 时显示 lock 图标，点击取消固定 -->
               <i
                 v-if="item.fixed === 'left'"
-                class="iconfont icon-lock vxe-table--column__icon m-l-ss pointer color-primary"
+                class="v3-icon-lock vxe-table--column__icon m-l-ss pointer color-primary"
                 @click.stop="unlockColumn(item)"
               ></i>
               <!-- 未固定列（且非静态列）：hover 时显示 unlock 图标，点击设为固定 -->
               <i
                 v-if="!item.fixed && !item.static"
                 v-show="hoverHeaderProp === item.prop"
-                class="iconfont icon-unlock vxe-table--column__icon m-l-ss pointer"
+                class="v3-icon-unlock vxe-table--column__icon m-l-ss pointer"
                 @click.stop="lockColumn(item)"
               ></i>
             </div>
@@ -179,14 +179,14 @@
               <!-- 已固定列（fixed='left'）：hover 时显示 lock 图标，点击取消固定 -->
               <i
                 v-if="item.fixed === 'left'"
-                class="iconfont icon-lock vxe-table--column__icon m-l-ss pointer color-primary"
+                class="v3-icon-lock vxe-table--column__icon m-l-ss pointer color-primary"
                 @click.stop="unlockColumn(item)"
               ></i>
               <!-- 未固定列（且非静态列）：hover 时显示 unlock 图标，点击设为固定 -->
               <i
                 v-if="!item.fixed && !item.static"
                 v-show="hoverHeaderProp === item.prop"
-                class="iconfont icon-unlock vxe-table--column__icon m-l-ss pointer"
+                class="v3-icon-unlock vxe-table--column__icon m-l-ss pointer"
                 @click.stop="lockColumn(item)"
               ></i>
             </div>
@@ -205,7 +205,7 @@
           <i
             v-if="showColumn"
             v-title="$lc('设置显示列')"
-            class="iconfont icon-system-solution pointer"
+            class="v3-icon-system-solution pointer"
             @click="$emit('visible-column')"
           ></i>
           <tableSetSize v-if="showSetsize" :size="sizeC" v-bind="$attrs" @update:size="sizeUp" @resize="sizeSet" />

package/src/components/TableSetSize/index.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dropdown @command="setSize">
-    <i v-title="$lc('行高')" class="iconfont icon-line-height pointer"></i>
+    <i v-title="$lc('行高')" class="v3-icon-line-height pointer"></i>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item command="small">{{ _lang === 'zh' ? '默认' : 'small' }}</el-dropdown-item>
       <el-dropdown-item command="mini">{{ _lang === 'zh' ? '紧凑' : 'mini' }}</el-dropdown-item>