bl-common-vue3 3.8.54 → 3.8.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.54",
+  "version": "3.8.56",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",
@@ -45,6 +45,7 @@
     "@vue/cli-service": "~4.5.13",
     "@vue/compiler-sfc": "^3.0.0",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-lodash": "^3.3.4",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^7.0.0"
   },

package/src/common/utils/util.js

@@ -1,9 +1,9 @@
 import { Modal, notification } from "ant-design-vue";
 import { createVNode } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import _ from "lodash";
 import i18n, {t, loadLanguageAsync} from "../../locale";
 import shareds from "./shared";
+import { cloneDeep, isEmpty } from "lodash";
 
 const utils = {
   numberReg: /^\d+(\.\d+)?$/, // 数字验证正则
@@ -196,13 +196,13 @@ const utils = {
     if (!utils.ORG_OPTIONS || !utils.ORG_OPTIONS?.length) {
       utils.ORG_OPTIONS = utils.getCommonLocal("ORG_OPTIONS");
     }
-    return _.cloneDeep(utils.ORG_OPTIONS)
+    return cloneDeep(utils.ORG_OPTIONS)
   },
   getAreaUnit: () => {
     return utils.areaUnit ? utils.areaUnit : utils.getCommonLocal('basicConfig')?.system_area_unit || '㎡';
   },
   getBasicConfigI18n: () => {
-    return _.isEmpty(utils.basicConfigI18n) ? utils.getCommonLocal('basicConfigI18n') : utils.basicConfigI18n;
+    return isEmpty(utils.basicConfigI18n) ? utils.getCommonLocal('basicConfigI18n') : utils.basicConfigI18n;
   },
   getAllOrgBranch: () => {
     return utils.getCommonLocal('allOrgBranch');
@@ -480,7 +480,7 @@ const utils = {
       getDataByRequest().then((info) => {
         utils.dictMenuData[alias] = info;
         if (returnType == 'object') {
-          let data = _.cloneDeep(utils.dictMenuData[alias]);
+          let data = cloneDeep(utils.dictMenuData[alias]);
           Object.keys(data).forEach((keys) => {
             let optionsList = data[keys];
             let sortList = optionsList.sort((a, b) => a.sort - b.sort);

package/src/components/ApprovalDetail/index.vue

@@ -586,6 +586,7 @@
 </template>
 
 <script>
+import { isEmpty } from "lodash";
 import {
   defineComponent,
   reactive,
@@ -625,7 +626,6 @@ const colorList = {
 };
 import CommentList from "./modules/ApprovalCommentList.vue";
 import HandleApproval from "./modules/ApprovalHandleApproval.vue";
-import _ from "lodash";
 import TransferReview from "./modules/ApprovalTransferReview.vue";
 import SendBack from "./modules/ApprovalSendBack.vue";
 import { t } from "../../locale";
@@ -866,7 +866,7 @@ export default defineComponent({
           extra: {},
         },
         success: (res) => {
-          if (!_.isEmpty(res.info)) {
+          if (!isEmpty(res.info)) {
             state.sign_url = res.info.sign_url || {};
           }
         },

package/src/components/ApprovalDetail/modules/ApprovalAddComment.vue

@@ -126,6 +126,7 @@
 </template>
 
 <script>
+import { uniqWith, uniqBy, sortBy } from "lodash";
 import { onMounted, reactive, toRefs, ref } from "vue";
 import {
   CloseCircleFilled,
@@ -134,7 +135,6 @@ import {
   DeleteOutlined,
 } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
-import _ from "lodash";
 import MentionUser from "./ApprovalMentionUser.vue";
 import utils from "../../../common/utils/util";
 
@@ -197,7 +197,7 @@ export default {
       state.comment_word = state.comment_word + item.label + " ";
       state.mention_user.push(item);
       //数组去重
-      const uniqueArray = _.uniqWith(
+      const uniqueArray = uniqWith(
         state.mention_user,
         (a, b) => a.value === b.value
       );
@@ -412,8 +412,8 @@ export default {
 
       let lists = [];
       console.log(indexs, "indexs");
-      let indexsssss = _.uniqBy(indexs, "start");
-      indexsssss = _.sortBy(indexsssss, "start");
+      let indexsssss = uniqBy(indexs, "start");
+      indexsssss = sortBy(indexsssss, "start");
       let stepIndex = 0;
       console.log(indexsssss, "indexs");
       console.log(stepIndex, "stepIndex");

package/src/components/ApprovalDetail/modules/ApprovalOpinionInfo.vue

@@ -85,6 +85,7 @@
 </template>
 
 <script>
+import { uniqWith, uniqBy, sortBy } from "lodash";
 import { computed, onMounted, reactive, toRefs, ref, watch } from "vue";
 import {
   CloseCircleFilled,
@@ -93,7 +94,6 @@ import {
   DeleteOutlined,
 } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
-import _ from "lodash";
 import utils from "../../../common/utils/util";
 
 export default {
@@ -153,7 +153,7 @@ export default {
       state.comment_word = state.comment_word + item.label + " ";
       state.mention_user.push(item);
       //数组去重
-      const uniqueArray = _.uniqWith(
+      const uniqueArray = uniqWith(
         state.mention_user,
         (a, b) => a.value === b.value
       );
@@ -383,8 +383,8 @@ export default {
 
       let lists = [];
       console.log(indexs, "indexs");
-      let indexsssss = _.uniqBy(indexs, "start");
-      indexsssss = _.sortBy(indexsssss, "start");
+      let indexsssss = uniqBy(indexs, "start");
+      indexsssss = sortBy(indexsssss, "start");
       let stepIndex = 0;
       console.log(indexsssss, "indexs");
       console.log(stepIndex, "stepIndex");

package/src/components/AttachmentInfo/index.vue

@@ -643,20 +643,6 @@ export default defineComponent({
         title: props.mobileAnnexUploadConfig?.title || "",
         h5Domain: props.mobileAnnexUploadConfig?.h5Domain || location.origin || props.staticPathes,
         uploadConfig: props.mobileAnnexUploadConfig?.uploadConfig || {},
-        addRequest: {
-          extra: {
-            objectId: attachParams.object_id,
-            annex_type: 2,
-            parent_id: currentCrumb.value.parentId,
-            ...attachParams,
-            business_id: props.id,
-            alias: props.fileAlias,
-            typeFrom: props.typeFrom,
-          },
-          server: props.serviceFrom,
-          url: props.annexAdd,
-          method: 'post'
-        }
       }
     })
 

package/src/components/AttachmentInfo/modules/AddAction.vue

@@ -59,7 +59,7 @@
   </a-dropdown>
 
   <add-attachments
-    :params="attachParams"
+    :params="addParams"
     :visible="addVisible"
     :id="id"
     :fileAlias="fileAlias"
@@ -74,7 +74,7 @@
     :visible="multiAddVisible"
     :file-list="fileList"
     @handleCancel="handleCancel"
-    :params="attachParams"
+    :params="addParams"
     :id="id"
     :fileAlias="fileAlias"
     :serviceFrom="serviceFrom"
@@ -211,6 +211,14 @@ export default defineComponent({
     const addParams = ref({});
 
     const addAttachment = (type) => {
+      addParams.value = {
+        objectId: props.attachParams?.object_id,
+        parent_id: props.parentId,
+        annex_type: type,
+        ...props.attachParams,
+        serviceFrom:`/${props.serviceFrom}`,
+        annexAdd:`${props.annexAdd}`,
+      };
       if (type != 3) {
         addVisible.value = true;
       }
@@ -241,14 +249,19 @@ export default defineComponent({
     const addRequest = computed(() => {
       let params = {
         extra:{
+          annex_type: 2,
           objectId: props.attachParams?.object_id,
           parent_id: props.parentId,
           ...props.attachParams,
+          business_id: props.id,
+          alias: props.fileAlias,
+          typeFrom: props.typeFrom,
         },
         server:`/${props.serviceFrom}`,
         url:`${props.annexAdd}`,
         method: 'post'
       }
+      console.log(params)
       return props.getFile ? {} : params;
     });
 

package/src/components/BlPhoneInput/index.vue

@@ -38,11 +38,11 @@
 	</div>
 </template>
 <script>
+import { isEmpty } from "lodash";
 import {defineComponent, reactive, toRefs, ref, nextTick, watch, computed} from "vue";
 import { Input, Select, SelectOption } from "ant-design-vue";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
-import _ from "lodash";
 export default defineComponent({
 	name: "BlPhoneInput",
 	components: {
@@ -110,7 +110,7 @@ export default defineComponent({
 		});
 
 		const phoneNumberPropsComputed = computed(() => {
-			return _.isEmpty(props.phoneNumberProps) ? {
+			return isEmpty(props.phoneNumberProps) ? {
 				placeholder: t('BlPhoneInput.index.598206-0'),
 				disabled: false,
 				size: "default",

package/src/components/ChooseHousingModal/index.vue

@@ -55,12 +55,12 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {
   defineComponent, reactive, watch, toRefs, computed,
 } from "vue";
 import {Modal, message} from "ant-design-vue";
 import ChooseHousingResources from "../ChooseHousingResources/index.vue";
-import _ from "lodash";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
 
@@ -312,7 +312,7 @@ export default defineComponent({
 
     const getResult = (data) => {
       state.loading = false;
-      state.result = _.cloneDeep(data);
+      state.result = cloneDeep(data);
     };
 
     const handleRequest = (emitObj) => {
@@ -334,10 +334,10 @@ export default defineComponent({
         if (!canNext) {
           message.warning(t('ChooseHousingModal.index.582040-2', [props.maxNum,maxNameProps.value]))
         } else {
-          emit("submitResult", _.cloneDeep(state.result));
+          emit("submitResult", cloneDeep(state.result));
         }
       } else {
-        emit("submitResult", _.cloneDeep(state.result));
+        emit("submitResult", cloneDeep(state.result));
       }
     };
 

package/src/components/ChooseHousingResources/index.vue

@@ -147,6 +147,7 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {
   computed,
   defineComponent,
@@ -164,7 +165,6 @@ import {
 import { LockOutlined, GoldenFilled } from "@ant-design/icons-vue";
 import { message, Tree, Alert, Tooltip, Spin } from "ant-design-vue";
 import BlIcon from "../BLIcon/index.js";
-import _ from "lodash";
 import utils from "../../common/utils/util";
 import {ROOM_TYPE_ICONS} from "../../common/utils/constant";
 import {t, loadLanguageAsync} from "../../locale";
@@ -494,7 +494,7 @@ export default defineComponent({
      * @returns {Array}
      */
     const cloneTreeData = (list = []) => {
-      return _.cloneDeep(toRaw(list || []));
+      return cloneDeep(toRaw(list || []));
     };
 
     /**
@@ -938,7 +938,7 @@ export default defineComponent({
     );
 
     const emitResult = (result) => {
-      let _result = _.cloneDeep(result);
+      let _result = cloneDeep(result);
       if (_result.villageList.length) {
         _result.villageList.map((v) => {
           let _build = [];
@@ -2315,7 +2315,7 @@ export default defineComponent({
     };
     // 获取项目树列表
     const getVillageTreeList = (villageList, level = 1, parentKey) => {
-      let _villageList = _.cloneDeep(villageList);
+      let _villageList = cloneDeep(villageList);
       if (props.defaultShowVillageIds.length) {
         _villageList = _villageList.filter((v) =>
           props.defaultShowVillageIds.includes(v.id)

package/src/components/ChooseOrgMember/index.vue

@@ -161,6 +161,7 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import { defineComponent, computed, watch, reactive, toRefs, toRaw } from "vue";
 import {
   PartitionOutlined,
@@ -182,7 +183,6 @@ import {
 } from "ant-design-vue";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
-import _ from "lodash";
 
 export default defineComponent({
   name: "ChooseOrgMember",
@@ -383,14 +383,14 @@ export default defineComponent({
           },
         });
       } else {
-        state.showList = _.cloneDeep(state.allList);
+        state.showList = cloneDeep(state.allList);
       }
     };
     watch(
       () => state.searchValue,
       (val) => {
         if (!val && state.currentCrumbId == 0) {
-          state.showList = _.cloneDeep(state.allList);
+          state.showList = cloneDeep(state.allList);
         }
       }
     );
@@ -477,7 +477,7 @@ export default defineComponent({
         if (state.searchValue) {
           state.searchValue = "";
         } else {
-          state.showList = _.cloneDeep(state.allList);
+          state.showList = cloneDeep(state.allList);
         }
       } else {
         const index = state.crumbList.findIndex(
@@ -615,7 +615,7 @@ export default defineComponent({
               personal: res.data || [],
               subcat: [],
             }
-            state.allList = _.cloneDeep(state.showList);
+            state.allList = cloneDeep(state.showList);
             state.loading = false;
             replaceCheckedById(res.list);
             return
@@ -628,14 +628,14 @@ export default defineComponent({
               id: 0,
               sub_total: res.list.length,
             }
-            state.allList = _.cloneDeep(state.showList);
+            state.allList = cloneDeep(state.showList);
             state.loading = false;
             replaceCheckedById(res.list);
             return
           }
           state.showList = res.list[0];
           const goNext = () => {
-            state.allList = _.cloneDeep(state.showList);
+            state.allList = cloneDeep(state.showList);
             state.loading = false;
             replaceCheckedById(res.list);
           }
@@ -649,8 +649,8 @@ export default defineComponent({
 
     const handleCheckedUserList = () => {
       let { user = [], department = [] } = props.checkedList;
-      state.userChecked = _.cloneDeep(user);
-      state.departmentChecked = _.cloneDeep(department);
+      state.userChecked = cloneDeep(user);
+      state.departmentChecked = cloneDeep(department);
     }
 
     const handleCheckAll = () => {

package/src/components/ChoosePropertyResources/index.vue

@@ -83,6 +83,7 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {
   defineComponent,
   nextTick,
@@ -95,7 +96,6 @@ import {
   computed,
 } from "vue";
 import { message, Tree, Alert, Tooltip, Spin } from "ant-design-vue";
-import _ from "lodash";
 import utils from "../../common/utils/util";
 import BlIcon from "../BLIcon/index.js";
 import {t, loadLanguageAsync} from "../../locale";
@@ -452,7 +452,7 @@ export default defineComponent({
     );
 
     const emitResult = (result) => {
-      let _result = _.cloneDeep(result);
+      let _result = cloneDeep(result);
       CL("emitResult====", _result);
       spinning.value = false;
       emit("changeTreeLoading", false);
@@ -977,8 +977,8 @@ export default defineComponent({
       }
       // 默认选中值
       setDefaultChecked();
-      let _treeList = _.cloneDeep(state.treeList);
-      let _originData = _.cloneDeep(JSON.parse(state.originData));
+      let _treeList = cloneDeep(state.treeList);
+      let _originData = cloneDeep(JSON.parse(state.originData));
       // 最终treeList
       emit("getTree", {
         list: _treeList,
@@ -989,7 +989,7 @@ export default defineComponent({
 
     // 获取公司树列表
     const getCompanyTreeList = (companyList, level = 1, parentKey) => {
-      let _companyList = _.cloneDeep(companyList);
+      let _companyList = cloneDeep(companyList);
       if (props.defaultShowCompanyIds.length) {
         _companyList = _companyList.filter((v) =>
           props.defaultShowCompanyIds.includes(v.id)

package/src/components/ColumnSetting/index.vue

@@ -87,9 +87,9 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {defineComponent, reactive, toRefs, watch, createVNode, computed} from "vue";
 import { message, Drawer, Space, Button, InputNumber, Checkbox, RadioGroup, Modal} from "ant-design-vue";
-import _ from 'lodash';
 import draggable from "vuedraggable";
 import {
   HolderOutlined,
@@ -165,7 +165,7 @@ export default defineComponent({
         message.warn(t('ColumnSetting.index.391089-7'));
         return;
       }
-      let columnsConfig = _.cloneDeep(state.defaultColumns).map((item) => {
+      let columnsConfig = cloneDeep(state.defaultColumns).map((item) => {
         if (item.key == 'action') {
           delete item.width
         }
@@ -207,7 +207,7 @@ export default defineComponent({
 
 
     const init = () => {
-      state.defaultColumns = _.cloneDeep(props.localColumns);
+      state.defaultColumns = cloneDeep(props.localColumns);
     };
 
     const reset = () => {
@@ -223,7 +223,7 @@ export default defineComponent({
         okText: t('common.button.confirm'),
         cancelText: t('common.button.cancel'),
         onOk: () => {
-          state.defaultColumns = _.cloneDeep(props.initColumns).map((v) => {
+          state.defaultColumns = cloneDeep(props.initColumns).map((v) => {
             v.sorter = v.hasSort ? v?.sorter ?? true : false;
             return v;
           });

package/src/components/CustomTable/components/UrlSelect/index.vue

@@ -29,10 +29,10 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {computed, defineComponent, useAttrs, ref, onMounted, reactive, watch, toRefs} from 'vue';
 // 单独引入（否则OOM！）
 import { Select } from 'ant-design-vue';
-import _ from "lodash";
 import utils from '../../../../common/utils/util';
 
 export default defineComponent({
@@ -132,7 +132,7 @@ export default defineComponent({
     const init = () => {
       if (Array.isArray(props.defaultLabelInValue)) {
         // 多选
-        state.labelValue = _.cloneDeep(props.defaultLabelInValue || []).map((v) => {
+        state.labelValue = cloneDeep(props.defaultLabelInValue || []).map((v) => {
           return {
             option: v,
             key: v.value,
@@ -144,7 +144,7 @@ export default defineComponent({
       } else {
         if (props.defaultLabelInValue) {
           state.labelValue = {
-            option: _.cloneDeep(props.defaultLabelInValue),
+            option: cloneDeep(props.defaultLabelInValue),
             originLabel: props.defaultLabelInValue.name,
             label: props.defaultLabelInValue.name,
             key: props.defaultLabelInValue.value,

package/src/components/CustomTable/components/UrlTreeSelect/index.vue

@@ -27,10 +27,10 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {computed, defineComponent, useAttrs, ref, onMounted, reactive, watch, toRefs} from 'vue';
 // 单独引入（否则OOM！）
 import {TreeSelect} from 'ant-design-vue';
-import _ from "lodash";
 import utils from '../../../../common/utils/util';
 
 export default defineComponent({
@@ -177,7 +177,7 @@ export default defineComponent({
     const init = () => {
       let defaultValue = [];
       if (Array.isArray(attrs.value) && attrs.value.length > 0) {
-        defaultValue = _.cloneDeep(attrs.value);
+        defaultValue = cloneDeep(attrs.value);
       } else {
         if (attrs.value || attrs.value === 0) {
           defaultValue = [attrs.value];

package/src/components/CustomTable/index.vue

@@ -1237,6 +1237,7 @@
 </template>
 
 <script>
+import { cloneDeep, isEmpty } from "lodash";
 import {
   ref,
   reactive,
@@ -1249,7 +1250,6 @@ import {
   watch,
   onBeforeUnmount,
 } from "vue";
-import _ from "lodash";
 import {
   Row,
   Col,
@@ -1774,7 +1774,7 @@ export default defineComponent({
     }
 
     const handleCostTypeChange = (item, value, label, extra) => {
-      let arr = _.cloneDeep(value);
+      let arr = cloneDeep(value);
       handleSearch(item.field , arr)
     }
 
@@ -1843,7 +1843,7 @@ export default defineComponent({
 
     /* 展示在页面上的表格列 */
     const realColumns = computed(() => {
-      return _.cloneDeep(localColumnsCom.value)
+      return cloneDeep(localColumnsCom.value)
         .filter((v) => !v.hidden)
         .map((v, index) => {
           if (v.sorter) {
@@ -1879,7 +1879,7 @@ export default defineComponent({
     };
 
     const exportColumnsTitle = computed(() => {
-      let _realColumns = _.cloneDeep(localColumnsCom.value);
+      let _realColumns = cloneDeep(localColumnsCom.value);
       let finallyColumns = _realColumns.concat(props.exportExtraColumns);
       return finallyColumns.reduce((obj, v) => {
         if (v.key !== "action" && !v.exportHidden) {
@@ -1960,7 +1960,7 @@ export default defineComponent({
     const handleExportData = (list) => {
       let columnIndexObj = {};
       let haveSlot = false;
-      _.cloneDeep(realColumns.value).forEach((columnItem, index) => {
+      cloneDeep(realColumns.value).forEach((columnItem, index) => {
         // 从后往前处理
         let virtualDataIndex = replaceObjDataIndex(columnItem.dataIndex);
         if (columnItem.columnType) {
@@ -2062,7 +2062,7 @@ export default defineComponent({
     const loadData = (isInit = false) => {
       // 使用了 props 数据 props 更新是异步的
       nextTick(() => {
-        if (_.isEmpty(props.requestInfo)) return;
+        if (isEmpty(props.requestInfo)) return;
         state.localLoading = true;
         // 刷新的时候清除列表（滚动条会滚动到顶部）
         if(props.ClearList){
@@ -2084,7 +2084,7 @@ export default defineComponent({
           }
           if (
             props.requestInfo?.params &&
-            !_.isEmpty(props.requestInfo.params)
+            !isEmpty(props.requestInfo.params)
           ) {
             params = {
               ...params,
@@ -2190,7 +2190,7 @@ export default defineComponent({
           }
           params.filters = [...filters, ...filList];
 
-          let extraInfo = _.cloneDeep(state.extraColumns);
+          let extraInfo = cloneDeep(state.extraColumns);
           params.filters.forEach((item) => {
             if (extraInfo.length){
               let tempIt = extraInfo.find((it) => it?.key == item.field);
@@ -2223,7 +2223,7 @@ export default defineComponent({
             }
           });
           params.counts = countsParams.value;
-          state.listParams = _.cloneDeep(params);
+          state.listParams = cloneDeep(params);
           emit("handleGetData", state.listParams);
           emit("request", {
             params: {
@@ -2262,7 +2262,7 @@ export default defineComponent({
               }
               if(!res?.extra_fields_alias && !state.initSuccess){
                 state.initSuccess = true;
-                state.initColumns = _.cloneDeep(state.defaultColumns);
+                state.initColumns = cloneDeep(state.defaultColumns);
                 state.extraColumns = [];
                 refreshColumns()
               }
@@ -2294,7 +2294,7 @@ export default defineComponent({
       showTotal: (total) => t("CustomTable.index.074786-32", [total]),
     });
 
-    // table 数据变化 state.tableSort不能使用_.cloneDeep(sorter)赋值 原因：在headerCell插槽和排序同时存在时点击排序报错Cannot read properties of null (reading 'isCE')
+    // table 数据变化 state.tableSort不能使用cloneDeep(sorter)赋值 原因：在headerCell插槽和排序同时存在时点击排序报错Cannot read properties of null (reading 'isCE')
     const handleTableChange = (
       pagination,
       filters,
@@ -2370,7 +2370,7 @@ export default defineComponent({
       let columns = [];
       let haveConfigColumn = [];
       let haveNotConfigColumn = [];
-      let initialColumns = _.cloneDeep(state.initColumns);
+      let initialColumns = cloneDeep(state.initColumns);
       initialColumns.forEach((item) => {
         let haveConfig = configList.find((v) => v.key == item.key);
         if (haveConfig) {
@@ -2459,7 +2459,7 @@ export default defineComponent({
               if (res?.list?.length) {
                 getLocalColumnFromConfig(res.list);
               } else {
-                state.localColumns = _.cloneDeep(state.initColumns).map((v) => {
+                state.localColumns = cloneDeep(state.initColumns).map((v) => {
                   v.sorter = v.hasSort ? v?.sorter ?? true : false;
                   return v;
                 });
@@ -2473,7 +2473,7 @@ export default defineComponent({
             },
           });
         } else {
-          state.localColumns = _.cloneDeep(state.initColumns).map((v) => {
+          state.localColumns = cloneDeep(state.initColumns).map((v) => {
             v.sorter = v.hasSort ? v?.sorter ?? true : false;
             return v;
           });
@@ -2666,7 +2666,7 @@ export default defineComponent({
               info[keys] = optionInfo;
             });
             state.dictionaryInfo = info;
-            emit("getDictData", _.cloneDeep(info));
+            emit("getDictData", cloneDeep(info));
             state.hasDictionary = true;
           },
         });
@@ -2843,7 +2843,7 @@ export default defineComponent({
           }
         }
       }
-      state.filterParams = _.cloneDeep(state.filterList);
+      state.filterParams = cloneDeep(state.filterList);
       if (utils.isEnv()) {
         console.log('====================' , state.filterParams);
       }
@@ -2865,7 +2865,7 @@ export default defineComponent({
         }
       });
       state.refreshKey++;
-      state.filterParams = _.cloneDeep(state.filterList);
+      state.filterParams = cloneDeep(state.filterList);
     };
 
     const addAdmin = (field) => {
@@ -2909,7 +2909,7 @@ export default defineComponent({
       if (!dict) return [];
       let dictInfo = state.dictionaryInfo[dict];
       let arr = [];
-      if (!_.isEmpty(dictInfo)) {
+      if (!isEmpty(dictInfo)) {
         Object.keys(dictInfo).forEach((key) => {
           arr.push({
             label: utils.i18nMapShow(dictInfo[key] || {}, ["label"], ["label"]),
@@ -2971,8 +2971,8 @@ export default defineComponent({
 
     const getFilterList = async () => {
       let columns = props.isCustomSearchColumn
-        ? _.cloneDeep(state.localColumns || [])
-        : _.cloneDeep(state.initColumns || []);
+        ? cloneDeep(state.localColumns || [])
+        : cloneDeep(state.initColumns || []);
       if (props.isCustomSearchColumn) {
         columns = columns
           .map((v) => {
@@ -2985,7 +2985,7 @@ export default defineComponent({
       }
 
       /* 表格带的搜索 */
-      let columnsFilter = _.cloneDeep(
+      let columnsFilter = cloneDeep(
         columns?.filter((v) => v.search?.search_type)
       ).map((v) => {
         v.search.field = v?.search?.field || v.dataIndex;
@@ -3117,7 +3117,7 @@ export default defineComponent({
           state.localLoading = false;
           if (newList.length==0){
             state.extraColumns = [];
-            state.initColumns = _.cloneDeep(state.defaultColumns);
+            state.initColumns = cloneDeep(state.defaultColumns);
             refreshColumns()
             return;
           }
@@ -3497,7 +3497,7 @@ export default defineComponent({
       if (props.showExtraField && !state.initSuccess) {
         return [];
       }
-      let temDataSource = _.cloneDeep(state.dataSource);
+      let temDataSource = cloneDeep(state.dataSource);
       if (state.extraColumns.length>0){
         temDataSource = temDataSource.map(item => {
           let  newItem = {...item}

package/src/components/DepartmentPositionModal/index.vue

@@ -180,6 +180,7 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {defineComponent, nextTick, reactive, toRefs, watch} from "vue";
 import {
   message,
@@ -200,7 +201,6 @@ import { TeamOutlined, DownOutlined } from "@ant-design/icons-vue";
 import { QuestionCircleOutlined } from "@ant-design/icons-vue";
 import utils from "../../common/utils/util";
 import UserDetail from "../UserDetail/index.vue";
-import _ from "lodash";
 import {t, loadLanguageAsync} from "../../locale";
 
 export default defineComponent({
@@ -546,7 +546,7 @@ export default defineComponent({
           );
           getDepartmentUser(false, currentDepartment).then(() => {
             setTimeout(() => {
-              state.treeData = _.cloneDeep(state.treeData);
+              state.treeData = cloneDeep(state.treeData);
               resolve();
             }, 1000);
           })

package/src/components/ExtraFieldsItem/index.vue

@@ -257,6 +257,7 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {
   defineComponent,
   reactive,
@@ -265,7 +266,6 @@ import {
 } from "vue";
 import {  message } from "ant-design-vue";
 import {PlusOutlined,DownloadOutlined,UploadOutlined,DeleteOutlined} from "@ant-design/icons-vue";
-import _ from "lodash";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
 
@@ -382,7 +382,7 @@ export default defineComponent({
     }
 
     const init = () => {
-      state.data = _.cloneDeep(props.Objectdata);
+      state.data = cloneDeep(props.Objectdata);
 
       if(props.type == 1){
         if(state.data.fields_type == 'single_text'){

package/src/components/ExtraManage/components/ExtraManageEdit.vue

@@ -191,6 +191,7 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {computed, defineComponent, watch, reactive, toRefs, ref} from "vue";
 import {Button, Col, Modal, Form, FormItem, Input, InputNumber, message, Row, Select, Switch} from "ant-design-vue";
 import {t, loadLanguageAsync} from "../../../locale";
@@ -198,7 +199,6 @@ import utils from "../../../common/utils/util";
 const useForm = Form.useForm;
 import draggable from "vuedraggable";
 import { DragOutlined , DeleteOutlined , QuestionCircleOutlined } from "@ant-design/icons-vue";
-import _ from "lodash";
 import TextTip from "../../TextTip/index.vue";
 
 export default defineComponent({
@@ -335,7 +335,7 @@ export default defineComponent({
           let requestInfo = props.requestAllInfo.edit;
           let params = requestInfo?.params || props.requestAllParams?.edit || {};
           params.id = props.id;
-          let formData = _.cloneDeep(state.formState);
+          let formData = cloneDeep(state.formState);
           if (!props.hasVillageSelect) {
             delete formData.village_id;
           }
@@ -366,7 +366,7 @@ export default defineComponent({
           // 添加
           let requestInfo = props.requestAllInfo.add;
           let params = requestInfo?.params || props.requestAllParams?.add || {};
-          let formData = _.cloneDeep(state.formState);
+          let formData = cloneDeep(state.formState);
           if (!props.hasVillageSelect) {
             delete formData.village_id;
           }

package/src/components/ExtraManage/index.vue

@@ -54,12 +54,12 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {defineComponent, reactive, toRefs, defineAsyncComponent, computed} from "vue";
 import ExtraManageEdit from "./components/ExtraManageEdit.vue";
 import {Drawer, message,} from "ant-design-vue";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
-import _ from "lodash";
 const CustomTable = defineAsyncComponent(() =>
   import("../CustomTable/index.vue")
 );
@@ -229,7 +229,7 @@ export default defineComponent({
           fixed: "right",
         },
       ];
-      let _deepColumns = _.cloneDeep(defaultColumns);
+      let _deepColumns = cloneDeep(defaultColumns);
       if (props.hasVillageSelect) {
         _deepColumns.splice(2, 0, {
           title: t('ExtraManage.index.845270-7'),

package/src/components/PublicExtensionField/components/ExtraManageEdit.vue

@@ -186,6 +186,7 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {computed, defineComponent, watch, reactive, toRefs, ref} from "vue";
 import {Button, Col, Modal, Form, FormItem, Input, InputNumber, message, Row, Select, Switch} from "ant-design-vue";
 import {t, loadLanguageAsync} from "../../../locale";
@@ -193,7 +194,6 @@ import utils from "../../../common/utils/util";
 const useForm = Form.useForm;
 import draggable from "vuedraggable";
 import { DragOutlined , DeleteOutlined , QuestionCircleOutlined } from "@ant-design/icons-vue";
-import _ from "lodash";
 import TextTip from "../../TextTip/index.vue";
 
 export default defineComponent({
@@ -302,7 +302,7 @@ export default defineComponent({
           // 编辑
           let params = {alias : props.alias};
           params.id = props.id;
-          let formData = _.cloneDeep(state.formState);
+          let formData = cloneDeep(state.formState);
           if (!props.hasVillageSelect) {
             delete formData.village_id;
           }
@@ -332,7 +332,7 @@ export default defineComponent({
         } else {
           // 添加
           let params = { alias : props.alias };
-          let formData = _.cloneDeep(state.formState);
+          let formData = cloneDeep(state.formState);
           if (!props.hasVillageSelect) {
             delete formData.village_id;
           }

package/src/components/PublicExtensionField/index.vue

@@ -54,12 +54,12 @@
 </template>
 
 <script>
+import { cloneDeep } from "lodash";
 import {defineComponent, reactive, toRefs, defineAsyncComponent, computed} from "vue";
 import ExtraManageEdit from "./components/ExtraManageEdit.vue";
 import {Drawer, message,} from "ant-design-vue";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
-import _ from "lodash";
 const CustomTable = defineAsyncComponent(() =>
   import("../CustomTable/index.vue")
 );
@@ -202,7 +202,7 @@ export default defineComponent({
           fixed: "right",
         },
       ];
-      let _deepColumns = _.cloneDeep(defaultColumns);
+      let _deepColumns = cloneDeep(defaultColumns);
       if (props.hasVillageSelect) {
         _deepColumns.splice(2, 0, {
           title: t('ExtraManage.index.845270-7'),

package/src/components/ViewEnergyList/index.vue

@@ -44,11 +44,11 @@
 </template>
 
 <script>
+import { cloneDeep, isEmpty } from "lodash";
 import {
   defineComponent, reactive, toRefs, watch, createVNode, computed
 } from "vue";
 import {Modal, Alert, Table, message} from "ant-design-vue";
-import _ from "lodash";
 import { SyncOutlined, ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
@@ -123,7 +123,7 @@ export default defineComponent({
               name: v?.name || "", // 表名称
               type: v?.type,
               type_name: v?.type_txt || "",
-              enter_num: _.isEmpty(v.energyRecord)
+              enter_num: isEmpty(v.energyRecord)
                 ? v?.original_reading
                 : v?.energyRecord?.last_number,
               cost_name: v?.energyTypeData?.cost_type_txt || "",
@@ -141,7 +141,7 @@ export default defineComponent({
             };
           });
           state.tableLoading = false;
-          emit('saveEnergy', _.cloneDeep(state.dataList));
+          emit('saveEnergy', cloneDeep(state.dataList));
         },
       });
     };
@@ -289,9 +289,9 @@ export default defineComponent({
         },
       ];
       if (props.isView) {
-        return _.cloneDeep(ENERGY_COLUMNS).filter((v) => !['current_remaining', 'action'].includes(v.key));
+        return cloneDeep(ENERGY_COLUMNS).filter((v) => !['current_remaining', 'action'].includes(v.key));
       } else {
-        return _.cloneDeep(ENERGY_COLUMNS);
+        return cloneDeep(ENERGY_COLUMNS);
       }
     })
 
@@ -301,7 +301,7 @@ export default defineComponent({
         if (val) {
           if (props.isView) {
             // 查看
-            state.dataList = _.cloneDeep(props.energyList);
+            state.dataList = cloneDeep(props.energyList);
           } else {
             // 操作
             getDataList();