cloud-web-corejs 1.0.54-dev.52 → 1.0.54-dev.521

package/src/components/tempStorage/index.vue

@@ -1,16 +1,36 @@
 <template>
   <span class="button-sty">
-      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain>暂存</el-button>
-      <el-tooltip class="item" effect="dark" content="查看暂存数据" placement="top">
-        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" ></el-button>
-      </el-tooltip>
+    <el-button
+      type="success"
+      class="btn-connect"
+      icon="iconfont icon-zancun"
+      @click="openSubmitDialog"
+      plain
+      :disabled="disabled"
+    >
+      {{ $t1("暂存") }}
+    </el-button>
+    <el-tooltip class="item" effect="dark" :content="$t1('查看暂存数据')" placement="top">
+      <el-button
+        class="btn-connect"
+        @click="openTempStorageDialog"
+        icon="iconfont icon-chakanshuju"
+        type="success"
+        :disabled="disabled"
+      ></el-button>
+    </el-tooltip>
 
-      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog" 
-                         @confirm="confirmTempStorageDialog" :storageType="storageType" multi="false"/>
+    <tempStorageDialog
+      v-if="showTempStorageDialog"
+      :visiable.sync="showTempStorageDialog"
+      @confirm="confirmTempStorageDialog"
+      :storageType="storageType"
+      multi="false"
+    />
     <el-dialog
       v-if="showSubmitDialog"
       :visible.sync="showSubmitDialog"
-      title="暂存"
+      :title="$t1('暂存')"
       :modal-append-to-body="false"
       :close-on-click-modal="false"
       :modal="false"
@@ -18,35 +38,40 @@
       v-el-drag-dialog
       v-el-dialog-center
     >
-        <el-form>
-          <div id="containt">
-            <table class="table-detail">
-              <tbody>
+      <el-form>
+        <div id="containt">
+          <table class="table-detail">
+            <tbody>
               <tr>
                 <th>
-                    <span class="t">
-                      描述
-                    </span>
+                  <span class="t">
+                    {{ $t1("描述") }}
+                  </span>
                 </th>
                 <td>
-                    <el-input type="textarea" :rows="8" v-model="remark"></el-input>
+                  <el-input type="textarea" :rows="8" v-model="remark"></el-input>
                 </td>
               </tr>
-              </tbody>
-            </table>
-          </div>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-          <el-button type="primary" plain class="button-sty" @click="showSubmitDialog = false">
-            <i class="el-icon-close el-icon"></i>
-            {{ $t2('取 消', 'system.button.cancel2') }}
-          </el-button>
-          <el-button type="primary" @click="saveData" class="button-sty">
-            <i class="el-icon-check el-icon"></i>
-            {{ $t2('确 定', 'system.button.confirm2') }}
-          </el-button>
-        </span>
-      </el-dialog>
+            </tbody>
+          </table>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          plain
+          class="button-sty"
+          @click="showSubmitDialog = false"
+        >
+          <i class="el-icon-close el-icon"></i>
+          {{ $t1("取 消") }}
+        </el-button>
+        <el-button type="primary" @click="saveData" class="button-sty">
+          <i class="el-icon-check el-icon"></i>
+          {{ $t1("确 定") }}
+        </el-button>
+      </span>
+    </el-dialog>
   </span>
 </template>
 <script>
@@ -54,55 +79,54 @@ import tempStorageDialog from "./tempStorageDialog.vue";
 
 export default {
   props: {
-    option: Object
+    option: Object,
+    disabled: Boolean,
   },
   components: {
-    tempStorageDialog
+    tempStorageDialog,
   },
   data() {
     return {
       storageType: null,
       showTempStorageDialog: false,
       showSubmitDialog: false,
-      remark: null
+      remark: null,
     };
   },
-  created() {
-
-  },
-  mounted() {
-
-  },
+  created() {},
+  mounted() {},
   methods: {
     openSubmitDialog() {
       this.remark = null;
       this.showSubmitDialog = true;
     },
     saveData() {
-      let url = USER_PREFIX + '/temp_storage/save';
+      let url = USER_PREFIX + "/temp_storage/save";
       let billData = this.option.data() || {};
-      let data = JSON.stringify(billData)
-      this.$http({
+      let data = JSON.stringify(billData);
+
+      let that = this.option.vue || this.$attrs["parent-target"] || this.$parent;
+      this.showSubmitDialog = false;
+      that.$http({
         url: url,
         method: `post`,
         data: {
           storageType: this.option.storageType,
           data: data,
           remark: this.remark,
-          retains: (this.option.retains || null)
+          retains: this.option.retains || null,
         },
         isLoading: true,
-        success: res => {
+        success: (res) => {
           this.$message({
             message: res.content,
-            type: 'success',
+            type: "success",
             duration: 500,
-            onClose: t => {
+            onClose: (t) => {
               this.option.saveConfirm && this.option.saveConfirm(res);
-              this.showSubmitDialog = false;
-            }
+            },
           });
-        }
+        },
       });
     },
     openTempStorageDialog() {
@@ -115,10 +139,7 @@ export default {
         this.option.chooseConfirm && this.option.chooseConfirm(billData, rows);
       }
     },
-  }
-}
-
+  },
+};
 </script>
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/tempStorage/tempStorageDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="暂存数据列表"
+    :title="$t1('暂存数据列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"
@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height: 450px">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"
@@ -25,24 +25,46 @@
       >
         <template #form>
           <div class="clearfix screen-btns">
+            <div class="fl">
+              <el-button class="button-sty" icon="el-icon-delete" @click="mulitidDelete"
+                >{{ $t1("删除") }}
+              </el-button>
+            </div>
             <div class="fr">
-              <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>重置
+              <vxe-button
+                icon="el-icon-brush"
+                class="button-sty"
+                @click="resetEvent"
+                type="text"
+                status="primary"
+                plain
+                >{{ $t1("重置") }}
               </vxe-button>
-              <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+              <vxe-button
+                status="warning"
+                icon="el-icon-search"
+                class="button-sty"
+                @click="searchEvent"
+                >{{ $t1("搜索") }}
               </vxe-button>
             </div>
           </div>
-          <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
-                    @reset="resetEvent">
-            <vxe-form-item title="暂存编码:" field="storageCode">
+          <vxe-form
+            class="screen-box"
+            title-width="92px"
+            title-align="right"
+            :data="formData"
+            @submit="searchEvent"
+            @reset="resetEvent"
+          >
+            <vxe-form-item :title="$t1('暂存编码') + ':'" field="storageCode">
               <template v-slot>
-                <el-input v-model="formData.storageCode" size="small" clearable/>
+                <el-input v-model="formData.storageCode" size="small" clearable />
               </template>
             </vxe-form-item>
-            <vxe-form-item title="描述:" field="remark">
+            <vxe-form-item :title="$t1('描述') + ':'" field="remark">
               <template v-slot>
-                <el-input v-model="formData.remark" size="small" clearable/>
+                <el-input v-model="formData.remark" size="small" clearable />
               </template>
             </vxe-form-item>
             <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
@@ -57,105 +79,208 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
-        class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
+      <el-tooltip
+        :enterable="false"
+        effect="dark"
+        :content="$t1('全部删除')"
+        placement="top"
+        ><a class="allDel icon-quanbushanchu" @click="clearChecked()"></a
+      ></el-tooltip>
       <div class="list">
-        <div class="item" v-for="(checkRow, index) in checkRows">
+        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
           <p>{{ checkRow.storageCode }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
-			<el-button type="primary" plain class="button-sty" @click="dialogClose">
-				<i class="el-icon-close el-icon"></i>
-				取 消
-			</el-button>
-			<el-button type="primary" @click="dialogPrimary" class="button-sty">
-				<i class="el-icon-check el-icon"></i>
-				确 定
-			</el-button>
-		</span>
+      <span class="fl tips">{{ $t1("注：双击确认选择（单选）") }}</span>
+      <el-button type="primary" plain class="button-sty" @click="dialogClose">
+        <i class="el-icon-close el-icon"></i>
+        {{ $t1("取消") }}
+      </el-button>
+      <el-button type="primary" @click="dialogPrimary()" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t1("确定") }}
+      </el-button>
+    </span>
   </el-dialog>
 </template>
 
 <script>
-import {selectDialogMixins} from '../../mixins/selectDialog/index.js';
+import { selectDialogMixins } from "../../mixins/selectDialog/index.js";
 
 export default {
-  name: 'positionDialog',
-  props: ['visiable', 'multi', 'rows', 'param', 'storageType'],
+  name: "positionDialog",
+  props: ["visiable", "multi", "rows", "param", "storageType"],
   mixins: [selectDialogMixins],
   created() {
     this.initSetting();
+    this.selectMulti = true;
   },
   mounted() {
     this.initTableM1();
   },
   data() {
-    var that = this;
     return {
       showDialog: true,
       falseValue: false,
       selectMulti: true,
       formData: {},
-      vxeOption: {}
+      vxeOption: {},
     };
   },
   methods: {
     initTableM1() {
       let that = this;
-      let url = USER_PREFIX + '/temp_storage/listPage';
+      let url = USER_PREFIX + "/temp_storage/listPage";
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'user_temp_storage_dialog-m1',
+        tableRef: "table-m1",
+        tableName: "user_temp_storage_dialog-m1",
         path: url,
         param: () => {
           return {
             ...this.formData,
-            storageType: this.storageType
-          }
+            storageType: this.storageType,
+          };
         },
         columns: [
-          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
+          { type: "checkbox", fixed: "left", width: 48, resizable: false },
           {
-            field: 'remark',
-            title: '描述',
+            field: "remark",
+            title: this.$t1("描述"),
             width: 250,
-            fixed: 'left'
+            fixed: "left",
           },
           {
-            field: 'createDate',
-            title: '创建时间',
-            width: 150
+            field: "createDate",
+            title: this.$t1("创建时间"),
+            width: 150,
           },
           {
-            title: '暂存编码',
-            field: 'storageCode',
-            width: 300
+            title: this.$t1("暂存编码"),
+            field: "storageCode",
+            width: 300,
           },
-          {title: '暂存数据', field: 'data', width: 350, visible: false},
+          { title: this.$t1("暂存数据"), field: "data", width: 350, visible: false },
           {
+            title: this.$t1("操作"),
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
+            fixed: "right",
+            title: "",
+            sortable: false,
+            slots: {
+              default: ({ row, rowIndex, $table }) => {
+                return [
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={(event) => {
+                      event.stopPropagation();
+                      this.deleteRow(row);
+                    }}
+                  >
+                    <el-tooltip
+                      enterable={false}
+                      effect="dark"
+                      content={this.$t1("删除")}
+                      placement="top"
+                      popper-class="tooltip-skin"
+                    >
+                      <i class="el-icon-delete" />
+                    </el-tooltip>
+                  </a>,
+                ];
+              },
+            },
+          },
         ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
+            trigger: "row",
+          },
+        },
+        callback: (rows) => {
+          if (!rows.length) return;
+          let checkRows = this.checkRows;
+          if (checkRows.length) {
+            let checkIds = checkRows.map((item) => item.id);
+            let items = rows.filter((item) => checkIds.includes(item.id));
+            if (items.length) {
+              this.$refs["table-m1"].setCheckboxRow(items, true);
+            }
           }
-        }
+        },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
-    }
-  }
+    },
+    deleteRow(row) {
+      this.$baseConfirm(this.$t1("您确定要删除当前暂存数据吗？")).then(() => {
+        this.deleteHandle([row]);
+      });
+    },
+    mulitidDelete() {
+      let checkRows = this.checkRows;
+      if (checkRows.length == 0) {
+        this.$message({
+          message: this.$t1("请选择要删除的暂存数据"),
+          type: "error",
+        });
+        return;
+      }
+      this.$baseConfirm(this.$t1("您确定要删除选中的暂存数据吗？")).then(() => {
+        this.deleteHandle(checkRows);
+      });
+    },
+    deleteHandle(rows) {
+      if (!rows || !rows.length) {
+        return;
+      }
+      let data = rows.map((row) => row.id);
+      this.$http({
+        url: USER_PREFIX + "/temp_storage/delete",
+        method: `post`,
+        data: data,
+        isLoading: true,
+        success: (res) => {
+          this.$message({
+            message: res.content,
+            type: "success",
+          });
+          this.checkRows = this.checkRows.filter((row) => !data.includes(row.id));
+          this.searchEvent();
+        },
+      });
+    },
+    checkWithSubmit(obj) {
+      let $grid1 = this.$refs["table-m1"];
+      this.checkRows = [obj.row];
+      $grid1.clearCheckboxRow();
+      $grid1.setCheckboxRow(obj.row, true);
+      setTimeout(() => {
+        this.dialogPrimary();
+      }, 100);
+    },
+    dialogPrimary() {
+      let rows = this.checkRows;
+      if (rows.length > 1) {
+        this.$message({
+          message: this.$t1("请选择一条暂存数据进行操作"),
+          type: "error",
+        });
+        return;
+      }
+      if (this.beforeConfirm && this.beforeConfirm(rows, this.dialogClose) === false) {
+        return false;
+      }
+      this.$emit("confirm", rows);
+      this.dialogClose();
+    },
+  },
 };
 </script>

package/src/components/vb-tabs/x-tabs.vue

@@ -1,8 +1,14 @@
 <template>
-  <el-tabs v-model="activeName" class="tab-box tab-morenav" @tab-remove="removeTab" @tab-click="tabClick" ref="tabs">
+  <el-tabs
+    v-model="activeName"
+    class="tab-box tab-morenav"
+    @tab-remove="removeTab"
+    @tab-click="tabClick"
+    ref="tabs"
+  >
     <slot name="default"></slot>
-    <template v-for="(tab,index) in tabs">
-      <slot name="editTab" v-bind="{tab,index,tabs,reloadTabContent}"></slot>
+    <template v-for="(tab, index) in tabs">
+      <slot name="editTab" v-bind="{ tab, index, tabs, reloadTabContent }"></slot>
     </template>
   </el-tabs>
 </template>
@@ -13,14 +19,18 @@ export default {
     value: String,
     paneKeyName: {
       type: String,
-      default: () => "id"
-    }
+      default: () => "id",
+    },
+    tabNameEnable: {
+      type: Boolean,
+      default: () => false,
+    },
   },
   data() {
     return {
       activeName: "0",
-      tabs: []
-    }
+      tabs: [],
+    };
   },
   watch: {
     value(val) {
@@ -28,7 +38,7 @@ export default {
     },
     activeName(val) {
       this.$emit("input", val);
-    }
+    },
   },
   created() {
     if (this.value) {
@@ -36,15 +46,20 @@ export default {
     }
   },
   methods: {
-    openEditTab(row) {
+    openEditTab(row, param, option) {
       let paneKeyName = this.paneKeyName;
-      let tab = this.tabs.find(tab => tab.data[paneKeyName] === row[paneKeyName])
+      let tab = this.tabs.find((tab) => tab.data[paneKeyName] === row[paneKeyName]);
+      let tabParam = option?.tabParam || {};
+      let dataId = row ? row[paneKeyName] : null;
+      let newTab = {
+        data: row,
+        showContent: false,
+        dataId: dataId,
+        param,
+        ...tabParam,
+      };
       if (!tab) {
-        tab = {
-          data: row,
-          showContent: false,
-          dataId: row[paneKeyName]
-        }
+        tab = newTab;
         if (this.tabs.length >= 30) {
           this.tabs.splice(0, 1, tab);
         } else {
@@ -52,23 +67,35 @@ export default {
         }
         this.$nextTick(() => {
           let paneName = this.getCurrentPaneName();
-          tab.paneName = paneName
-        })
+          tab.paneName = paneName;
+        });
+      } else {
+        Object.assign(tab, newTab);
       }
-      this.activeName = row[paneKeyName] + '';
+      let tabNameEnable = this.tabNameEnable;
+      this.activeName = row ? (tabNameEnable ? tab.tabName : row[paneKeyName] + "") : "";
       tab.showContent = false;
       setTimeout(() => {
         tab.showContent = true;
       }, 200);
     },
     removeTab(targetName) {
+      let tabNameEnable = this.tabNameEnable;
       let paneKeyName = this.paneKeyName;
-      let tabIndex = this.tabs.findIndex(tab => tab.data[paneKeyName] + '' === targetName);
+      let tabIndex = this.tabs.findIndex((tab) => {
+        if (tabNameEnable) {
+          return tab.tabName === targetName;
+        } else {
+          return tab.data[paneKeyName] + "" === targetName;
+        }
+      });
       if (this.activeName === targetName) {
         if (tabIndex > 0) {
-          this.activeName = this.tabs[tabIndex - 1].data[paneKeyName] + '';
+          this.activeName = tabNameEnable
+            ? tab.tabName
+            : this.tabs[tabIndex - 1].data[paneKeyName] + "";
         } else {
-          this.activeName = 'second';
+          this.activeName = "second";
         }
       }
       if (tabIndex !== -1) {
@@ -81,18 +108,19 @@ export default {
     },
     getCurrntPaneTarget() {
       let panes = this.$refs.tabs.panes;
-      let target = panes.find(pane => pane.active)
+      let target = panes.find((pane) => pane.active);
       return target;
     },
     reloadTabContent(target, param, tab) {
-      let updateParam = param != null && param.updateParam != null ? param.updateParam : {};
+      let updateParam =
+        param != null && param.updateParam != null ? param.updateParam : {};
       for (let key in updateParam) {
         target.$emit("update:" + key, updateParam[key]);
       }
 
       if (!tab) {
         let activeName = this.activeName;
-        tab = this.tabs.find(item => item.paneName == activeName)
+        tab = this.tabs.find((item) => item.paneName == activeName);
       }
       if (tab) {
         tab.showContent = false;
@@ -103,10 +131,8 @@ export default {
     },
     tabClick(targetName) {
       this.$emit("tabClick", targetName);
-    }
-  }
-}
+    },
+  },
+};
 </script>
-<style scoped>
-
-</style>
+<style scoped></style>