t20-common-lib 0.12.21 → 0.12.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.12.21",
+  "version": "0.12.22",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/select-tree-unit/src/main.vue

@@ -27,7 +27,6 @@
         <el-input
           v-model="searchKey"
           :validate-event="false"
-          :placeholder="$t('common_a_0004')"
           clearable
           @input="debounce(searchTree, 1000)"
           class="input-w nstc-unit-search"
@@ -38,7 +37,7 @@
           <button
               type="button"
               @click="changeType('tree')"
-              v-title="$t('common_a_0009')"
+              v-title="$lc('树结构')"
               :class="
               isList ? 'el-button--default is-plain' : 'el-button--primary'
             "
@@ -51,7 +50,6 @@
           <button
               type="button"
               @click="changeType('list')"
-              v-title="$t('common_a_0010')"
               :class="
               isList ? 'el-button--primary' : 'el-button--default is-plain'
             "
@@ -62,28 +60,6 @@
             <i class="iconfont icon-liebiao"></i>
           </button>
         </div>
-        <!-- <div class="nstc-select-icon-box nstc-select-icon-box-fix">
-          <div class="nstc-select-icon-box">
-            <span
-              @click="changeType('tree')"
-              v-title="$t('common_a_0009')"
-              :class="isList ? 'nstc-select-icon-un' : ''"
-              class="nstc-select-icon"
-            >
-              <i class="iconfont icon-goujianshu"></i>
-            </span>
-          </div>
-          <div class="nstc-select-icon-box">
-            <span
-              @click="changeType('list')"
-              v-title="$t('common_a_0010')"
-              :class="isList ? '' : 'nstc-select-icon-un'"
-              class="nstc-select-icon"
-            >
-              <i class="iconfont icon-liebiao"></i>
-            </span>
-          </div>
-        </div> -->
       </div>
       <div class="nstc-unit-content">
         <el-checkbox
@@ -91,7 +67,6 @@
             v-if="showAllCheck && !single"
             v-model="checkD"
             class="m-l-lg nstc-unit-content-heightfix"
-            :label="$t('common_a_0003')"
             @change="handleCheckBox"
         />
         <Tree
@@ -115,10 +90,10 @@
       </div>
       <div class="nstc-unit-footer" v-if="!this.single">
         <el-button type="primary" size="mini" @click="confirm">{{
-            $t("common_a_0001")
+            $lc("确定")
           }}</el-button>
         <el-button class="nstc-unit-cancel" size="mini" @click="cancel">{{
-            $t("common_a_0002")
+            $lc("取消")
           }}</el-button>
       </div>
     </div>
@@ -705,7 +680,7 @@ export default {
           });
           this.checkD = true;
           this.selectData = JSON.parse(JSON.stringify(flatTemp));
-          this.valueShow = this.$t("common_a_0003");
+          this.valueShow = this.$lc("全部单位");
           this.$nextTick(() => {
             console.log(11111, this.selectData);
             this.$refs.tree.setCheckedNodes(this.selectData);
@@ -796,12 +771,10 @@ export default {
             this.getTreeData("1", { resolve });
           }).then(() => {
             this.$nextTick(() => {
-              // console.log(this.data);
               let temp = [];
               this.flatData(this.data, temp);
               setTimeout(() => {
                 //默认全选时，选中数据
-                // console.log(temp, this.$refs.tree);
                 //去除没有权限的单位
                 temp = temp.filter((s) => {
                   return !s.disabled;
@@ -820,16 +793,8 @@ export default {
                 this.$emit("dataChange", this.selectData);
               }
               if (this.showAllCheck) {
-                this.valueShow = this.$t("common_a_0003");
+                this.valueShow = this.$lc("全部单位");
               }
-              // let s = temp.map((t) => {
-              //   return t.unitNo;
-              // });
-              // this.valueShow = temp.map(t => {
-              //   return t.unitName
-              // })
-              // console.log(22222222222222222, data)
-              // this.$emit('input', s)
             });
           });
         } else {
@@ -840,24 +805,11 @@ export default {
             return !s.disabled;
           });
           this.$refs.tree.setCheckedNodes(temp);
-          // const data = this.$refs.tree.getCheckedKeys()
           this.selectData = temp;
-          // let s = temp.map((t) => {
-          //   return t.unitNo;
-          // });
-          // this.valueShow = temp.map(t => {
-          //   return t.unitName
-          // })
-          // this.$emit('input', s)
         }
-
-        // console.log(data)
       } else {
         this.$refs.tree.setCheckedNodes([]);
         this.selectData = [];
-        // this.valueShow = []
-        // this.$emit('input', [])
-        // this.$message.warning(this.$t("common_a_0005"));
       }
     },
     // 选择自身以及下级单位
@@ -904,7 +856,7 @@ export default {
         this.selectData = temp;
         this.checkD = this.allUnit.length === temp1.length;
         this.valueShow = this.checkD
-            ? this.$t("common_a_0003")
+            ? this.$lc("全部单位")
             : this.selectData.map((s) => s.unitName);
         //去除没有权限的单位
         this.selectData = this.selectData.filter((s) => {
@@ -1154,7 +1106,7 @@ export default {
           console.log("选择全部--列表");
           this.checkD = true;
           this.selectData = JSON.parse(JSON.stringify(this.data));
-          this.valueShow = this.$t("common_a_0003");
+          this.valueShow = this.$lc("全部单位");
         }
 
         let data = this.selectData.map((s) => s.unitNo);
@@ -1176,7 +1128,7 @@ export default {
     confirm() {
       // console.log("sss", this.selectData);
       if (this.selectData.length < 1) {
-        this.$message.warning(this.$t("common_a_0005"));
+        this.$message.warning(this.$lc("至少选择一个单位"));
         return;
       }
       this.checkD = this.allUnit.length === this.selectData.length;
@@ -1185,7 +1137,7 @@ export default {
         return !s.disabled;
       });
       if (this.checkD) {
-        this.valueShow = this.$t("common_a_0003");
+        this.valueShow = this.$lc("全部单位");
       } else {
         this.valueShow = this.selectData.map((s) => s.unitName);
       }

package/packages/select-tree-unit/src/selectTree/Tree/index.vue

@@ -31,20 +31,20 @@
           <el-dropdown-menu slot="dropdown" class="nstc-unit-tree-drop">
             <el-dropdown-item
               @click.native.stop="handleCheckedBro(node, data)"
-              >{{ $t("common_a_0006") }}</el-dropdown-item
+              >{{ $lc("勾选本单位及平级单位") }}</el-dropdown-item
             >
             <el-dropdown-item
               @click.native.stop="handleCheckedChild(node, data, 'direct')"
             >
-              {{ $t("common_a_0008") }}</el-dropdown-item
+              {{ $lc("勾选直接下级单位") }}</el-dropdown-item
             >
             <el-dropdown-item
               @click.native.stop="handleCheckedChild(node, data, 'all')"
-              >{{ $t("common_a_0007") }}</el-dropdown-item
+              >{{ $lc("勾选本单位及子单位") }}</el-dropdown-item
             >
             <el-dropdown-item
               @click.native.stop="handleCheckedChild(node, data, 'cancel')"
-              >{{ $t("common_a_0007_1") }}</el-dropdown-item
+              >{{ $lc("取消勾选所有下级单位") }}</el-dropdown-item
             >
           </el-dropdown-menu>
         </el-dropdown>

package/packages/select-tree-unit-form/src/main.vue

@@ -30,7 +30,6 @@
         <el-input
           v-model="searchKey"
           :validate-event="false"
-          :placeholder="$t('common_a_0004')"
           clearable
           @input="debounce(searchTree, 1000)"
           class="input-w nstc-unit-search"
@@ -40,7 +39,7 @@
           <button
             type="button"
             @click="changeType('tree')"
-            v-title="$t('common_a_0009')"
+            v-title="$lc('树结构')"
             :class="
               isList ? 'el-button--default is-plain' : 'el-button--primary'
             "
@@ -53,7 +52,7 @@
           <button
             type="button"
             @click="changeType('list')"
-            v-title="$t('common_a_0010')"
+            v-title="$lc('列表结构')"
             :class="
               isList ? 'el-button--primary' : 'el-button--default is-plain'
             "
@@ -71,7 +70,7 @@
           v-if="showAllCheck && multiple && !onlyUnit"
           v-model="checkD"
           class="m-l-lg nstc-unit-content-heightfix"
-          :label="$t('common_a_0003')"
+          :label="$lc('全部单位')"
           @change="handleCheckBox"
         />
         <Tree
@@ -95,10 +94,10 @@
       </div>
       <div class="nstc-unit-footer" v-if="multiple">
         <el-button type="primary" size="mini" @click="confirm">{{
-          $t("common_a_0001")
+          $lc("确定")
         }}</el-button>
         <el-button class="nstc-unit-cancel" size="mini" @click="cancel">{{
-          $t("common_a_0002")
+          $lc("取消")
         }}</el-button>
       </div>
     </div>
@@ -661,7 +660,7 @@ export default {
           });
           this.checkD = true;
           this.selectData = JSON.parse(JSON.stringify(flatTemp));
-          this.valueShow = this.$t("common_a_0003");
+          this.valueShow = this.$lc("全部单位");
           this.$nextTick(() => {
             console.log(11111, this.selectData);
             this.$refs.tree.setCheckedNodes(this.selectData);
@@ -783,7 +782,7 @@ export default {
         this.selectData = [];
         // this.valueShow = []
         // this.$emit('input', [])
-        // this.$message.warning(this.$t("common_a_0005"));
+        // this.$message.warning(this.$lc("至少选择一个单位"));
       }
     },
     checkedBro(data) {
@@ -898,7 +897,7 @@ export default {
     },
     confirm() {
       if (this.selectData.length < 1) {
-        this.$message.warning(this.$t("common_a_0005"));
+        this.$message.warning(this.$lc("至少选择一个单位"));
         return;
       }
       //去除没有权限的单位

package/packages/select-tree-unit-form/src/selectTreeForm/Tree/index.vue

@@ -39,20 +39,20 @@
           <el-dropdown-menu slot="dropdown" class="nstc-unit-tree-drop">
             <el-dropdown-item
               @click.native.stop="handleCheckedBro(node, data)"
-              >{{ $t("common_a_0006") }}</el-dropdown-item
+              >{{ $lc("勾选本单位及平级单位") }}</el-dropdown-item
             >
             <el-dropdown-item
               @click.native.stop="handleCheckedChild(node, data, 'direct')"
             >
-              {{ $t("common_a_0008") }}</el-dropdown-item
+              {{ $lc("勾选直接下级单位") }}</el-dropdown-item
             >
             <el-dropdown-item
               @click.native.stop="handleCheckedChild(node, data, 'all')"
-              >{{ $t("common_a_0007") }}</el-dropdown-item
+              >{{ $lc("勾选本单位及子单位") }}</el-dropdown-item
             >
             <el-dropdown-item
               @click.native.stop="handleCheckedChild(node, data, 'cancel')"
-              >{{ $t("common_a_0007_1") }}</el-dropdown-item
+              >{{ $lc("取消勾选所有下级单位") }}</el-dropdown-item
             >
           </el-dropdown-menu>
         </el-dropdown>
@@ -69,15 +69,15 @@
         <!--          &lt;!&ndash; <div v-if="!node.data.disabled" @click="handleChecked(node, data)">只勾选本单位</div> &ndash;&gt;-->
         <!--          &lt;!&ndash;  勾选本单位及平级单位&ndash;&gt;-->
         <!--          <div v-if="!node.data.disabled" @click="handleCheckedBro(node, data)">-->
-        <!--            {{ $t("common_a_0006") }}-->
+        <!--            {{ $lc("勾选本单位及平级单位") }}-->
         <!--          </div>-->
         <!--          &lt;!&ndash;勾选直接下级单位&ndash;&gt;-->
         <!--          <div @click="handleCheckedChild(node, data, 'direct')">-->
-        <!--            {{ $t("common_a_0008") }}-->
+        <!--            {{ $lc("勾选直接下级单位") }}-->
         <!--          </div>-->
         <!--          &lt;!&ndash;勾选所有下级单位&ndash;&gt;-->
         <!--          <div @click="handleCheckedChild(node, data, 'all')">-->
-        <!--            {{ $t("common_a_0007") }}-->
+        <!--            {{ $lc("勾选本单位及子单位") }}-->
         <!--          </div>-->
         <!--        </div>-->
         <!--      </div>-->

package/src/common/Filters/index.vue

@@ -9,7 +9,6 @@
           :multiple="item.multiple"
           v-model="searchForm[item.prop]"
           :validate-event="false"
-          :placeholder="$t('common_t_0054') + item.label"
           @change="(val) => handleSearch(val, item)"
         >
           <el-option

package/src/i18n.json

@@ -1,5 +1,35 @@
 {
   "此处只可设置个人自定义常用审批意见,全局需到工作流审批意见设置中设置": {
     "en": "You can only set personal custom common phrases here. The global setting needs to be set in the workflow approval opinion setting."
+  },
+  "树结构": {
+    "en": "Tree Structure"
+  },
+  "列表结构": {
+    "en": "List Structure"
+  },
+  "确定": {
+    "en": "Confirm"
+  },
+  "取消": {
+    "en": "Cancel"
+  },
+  "全部单位": {
+    "en": "All Units"
+  },
+  "至少选择一个单位": {
+    "en": "At least one unit is required"
+  },
+  "勾选本单位及平级单位": {
+    "en": "Select your own unit and your peers"
+  },
+  "勾选直接下级单位": {
+    "en": "Select direct sub-units"
+  },
+  "勾选本单位及子单位": {
+    "en": "Select your own unit and its sub-units"
+  },
+  "取消勾选所有下级单位": {
+    "en": "Unselect all sub-units"
   }
 }