hy-dispatch-ui-v3 0.2.68 → 0.2.70

package/es/bussiness/hyElectronicFence/cpns/batchSetElectronicFenceUserDialog/batchSetElectronicFenceUserDialog.vue.mjs

@@ -6,7 +6,7 @@ import { useCurrentBus } from '../../../../hooks/useCurrentBus.mjs';
 import { useAppTableForm } from '../../../../components/hyTableForm/js/useAppTableForm.mjs';
 import { $t } from '../../../../hooks/useLocale.mjs';
 import { useMixins } from '../../../../hooks/useMixins.mjs';
-import { useDialog, useDialogIsEdit } from '../../../../hooks/useDialog.mjs';
+import { useDialog, useDialogIsEdit, useBatchDialog } from '../../../../hooks/useDialog.mjs';
 import { HyBatchUploadDialog } from '../../../../components/hyBatchUploadDialog/index.mjs';
 
 const _sfc_main = {
@@ -90,6 +90,7 @@ const _sfc_main = {
       });
       const rules2 = ref({});
       async function show2() {
+        await hy.watchPause();
         hy.setDragLevelIndex("HyBatchUploadDialogRef");
         HyBatchUploadDialogRef2.value.show();
       }
@@ -99,6 +100,7 @@ const _sfc_main = {
         });
       }
       function onSubmit2(params) {
+        hy.uploadProgress(params);
         const { total, success, failed, result } = params;
         if (success) {
           hy.currentBus.value.emit("batchSetElectronicFenceUserDialog", {
@@ -120,8 +122,10 @@ const _sfc_main = {
       };
     }
     const {
+      setIsEdit,
       setDragLevelIndex,
       minimizedShow,
+      onClose,
       onMinimized,
       HyBatchUploadDialogRef,
       tableColumns,
@@ -130,9 +134,10 @@ const _sfc_main = {
       show,
       submitHandler,
       onSubmit
-    } = useMixins({ currentBus }, [useDialog, useDialogIsEdit, useBatchSetElectronicFenceUserDialog]);
+    } = useMixins({ currentBus }, [useDialog, useDialogIsEdit, useBatchDialog, useBatchSetElectronicFenceUserDialog]);
     __expose({
       show,
+      setIsEdit,
       minimizedShow,
       setDragLevelIndex
     });
@@ -151,7 +156,11 @@ const _sfc_main = {
         "show-operate": true,
         "if-draggable": __props.ifDraggable,
         "if-shrink": __props.ifShrink,
+        "on-cancel": unref(onClose),
+        "on-close": unref(onClose),
         onSubmit: unref(onSubmit),
+        onSubmitProgress: _ctx.onSubmitProgress,
+        onTableDataChange: _ctx.onTableDataChange,
         onOnMinimized: unref(onMinimized),
         onOnDialogMousedown: ($event) => unref(setDragLevelIndex)("HyBatchUploadDialogRef")
       }, {
@@ -161,7 +170,7 @@ const _sfc_main = {
         ]),
         _: 1
         /* STABLE */
-      }, 8, ["title", "table-columns", "form-columns", "rules", "submit-handler", "if-draggable", "if-shrink", "onSubmit", "onOnMinimized", "onOnDialogMousedown"]);
+      }, 8, ["title", "table-columns", "form-columns", "rules", "submit-handler", "if-draggable", "if-shrink", "on-cancel", "on-close", "onSubmit", "onSubmitProgress", "onTableDataChange", "onOnMinimized", "onOnDialogMousedown"]);
     };
   }
 };

package/es/bussiness/hyElectronicFence/cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersDialog.vue.mjs

@@ -5,8 +5,7 @@ import { saveFnApi, findAllApi } from '../../../../api/index.mjs';
 import { orgTreeApi } from '../../../../api/organization.mjs';
 import '../../../../hooks/index.mjs';
 import '../../../../components/index.mjs';
-import ElectronicFenceAssociatedUsersItem from './electronicFenceAssociatedUsersItem.vue.mjs';
-import _export_sfc from '../../../../_virtual/_plugin-vue_export-helper.mjs';
+import _sfc_main$1 from './electronicFenceAssociatedUsersItem.vue.mjs';
 import { $t } from '../../../../hooks/useLocale.mjs';
 import { useMixins } from '../../../../hooks/useMixins.mjs';
 import { useDialog } from '../../../../hooks/useDialog.mjs';
@@ -16,6 +15,8 @@ import { HyButton } from '../../../../components/hyButton/index.mjs';
 import { HyInputSearch } from '../../../../components/hyInput/index.mjs';
 import { HyIcon } from '../../../../components/hyIcon/index.mjs';
 
+import "../../style/electronicFenceAssociatedUsersDialog.scss";
+
 const __default__ = defineComponent({
   name: "HyElectronicFenceAssociatedUsersDialog"
 });
@@ -202,7 +203,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         onOnDialogMousedown: ($event) => unref(setDragLevelIndex)("HyDialogRef")
       }, {
         default: withCtx(() => [
-          createElementVNode("div", { class: "flex w-full h-full" }, [
+          createElementVNode("div", { class: "hy-electronic-fence-associated-users-dialog flex w-full h-full" }, [
             createElementVNode("div", { class: "w-1/2 h-full flex flex-col mr-5 text-xs" }, [
               createElementVNode("div", { class: "tree-box h-0 flex-1 flex flex-col box-border pb-2" }, [
                 createVNode(unref(ElAutoResizer), null, {
@@ -279,7 +280,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   class: "w-full h-0 flex-1 border-t border-border overflow-auto box-border",
                   "data-key": "id",
                   "data-sources": unref(filterSelectedList),
-                  "data-component": ElectronicFenceAssociatedUsersItem,
+                  "data-component": _sfc_main$1,
                   keeps: 30,
                   "estimate-size": 34,
                   "extra-props": {
@@ -311,8 +312,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     };
   }
 });
-import "/data/jenkins-work/workspace/WEB-V3-PROJECT-Web-hy-dispatch-ui@2/tmp/packages/bussiness/hyElectronicFence/cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersDialog.vue?vue&type=style&index=0&scoped=bc2c260d&lang.scss";
-
-var electronicFenceAssociatedUsersDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bc2c260d"]]);
 
-export { electronicFenceAssociatedUsersDialog as default };
+export { _sfc_main as default };

package/es/bussiness/hyElectronicFence/cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersItem.vue.mjs

@@ -1,7 +1,6 @@
 import { openBlock, createBlock, unref, withCtx, createElementVNode, createVNode, createTextVNode, toDisplayString, createElementBlock, createCommentVNode } from 'vue';
 import '../../../../hooks/index.mjs';
 import '../../../../components/index.mjs';
-import _export_sfc from '../../../../_virtual/_plugin-vue_export-helper.mjs';
 import { HyTooltip } from '../../../../components/hyTooltip/index.mjs';
 import { HyIcon } from '../../../../components/hyIcon/index.mjs';
 import { $t } from '../../../../hooks/useLocale.mjs';
@@ -116,8 +115,5 @@ const _sfc_main = {
     };
   }
 };
-import "/data/jenkins-work/workspace/WEB-V3-PROJECT-Web-hy-dispatch-ui@2/tmp/packages/bussiness/hyElectronicFence/cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersItem.vue?vue&type=style&index=0&scoped=788f720f&lang.scss";
 
-var ElectronicFenceAssociatedUsersItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-788f720f"]]);
-
-export { ElectronicFenceAssociatedUsersItem as default };
+export { _sfc_main as default };

package/es/bussiness/hyElectronicFence/index.mjs

@@ -1,13 +1,13 @@
 import '../../utils/index.mjs';
 import _sfc_main from './electronicFence.vue.mjs';
 import _sfc_main$1 from './cpns/addElectronicFenceDialog/addElectronicFenceDialog.vue.mjs';
-import electronicFenceAssociatedUsersDialog from './cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersDialog.vue.mjs';
-import _sfc_main$2 from './cpns/batchSetElectronicFenceUserDialog/batchSetElectronicFenceUserDialog.vue.mjs';
+import _sfc_main$2 from './cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersDialog.vue.mjs';
+import _sfc_main$3 from './cpns/batchSetElectronicFenceUserDialog/batchSetElectronicFenceUserDialog.vue.mjs';
 import { withInstall } from '../../utils/handler.mjs';
 
 const HyElectronicFence = withInstall(_sfc_main);
 const HyAddElectronicFenceDialog = withInstall(_sfc_main$1);
-const HyElectronicFenceAssociatedUsersDialog = withInstall(electronicFenceAssociatedUsersDialog);
-const HyBatchSetElectronicFenceUserDialog = withInstall(_sfc_main$2);
+const HyElectronicFenceAssociatedUsersDialog = withInstall(_sfc_main$2);
+const HyBatchSetElectronicFenceUserDialog = withInstall(_sfc_main$3);
 
 export { HyAddElectronicFenceDialog, HyBatchSetElectronicFenceUserDialog, HyElectronicFence, HyElectronicFenceAssociatedUsersDialog, HyElectronicFence as default };

package/es/bussiness/hyElectronicFence/style/electronicFenceAssociatedUsersDialog.scss

@@ -0,0 +1,25 @@
+.hy-electronic-fence-associated-users-dialog {  
+  .tree-box {
+    border: 1px solid rgba(var(--hy-border));
+    border-radius: 4px;
+    box-shadow:
+      0px 2px 4px 0px rgba(0, 0, 0, 0.5),
+      inset 0px 0px 10px 0px #1f4b77;
+    backdrop-filter: blur(5px);
+  }
+  li {
+    &:hover {
+      box-shadow:
+        inset 0px 0px 50px 0px rgba(var(--hy-theme), 0.2),
+        inset 0px 0px 0px 1px rgba(var(--hy-theme), 0.5);
+      .delete {
+        opacity: 1;
+      }
+    }
+    .delete {
+      transition: 1s;
+      opacity: 0;
+      color: rgba(var(--hy-danger-2));
+    }
+  }
+}

package/es/components/hyBatchUploadDialog/batchUploadDialog.vue.mjs

@@ -92,6 +92,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     showAddBtn: {
       type: Boolean,
       default: true
+    },
+    // 提交数据之前处理
+    beforeSubmitHandler: {
+      type: Function
     }
   }, {
     "modelValue": { type: Boolean, default: false },
@@ -186,8 +190,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       batchTableFormRef.value.nextStep();
     }
     async function onSubmitHandler() {
-      const res = await batchTableFormRef.value.validate();
+      let res = batchTableFormRef.value.validate();
       if (props.uploadType === "custom") {
+        if (res.total === res.success && props.beforeSubmitHandler) {
+          await props.beforeSubmitHandler(res.dataSource);
+          res = batchTableFormRef.value.validate();
+        }
         const dataSource = batchTableFormRef.value.getTableDataSource();
         onTableSubmitHandler({
           ...res,
@@ -361,6 +369,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     onExpandRowChange: __props.onExpandRowChange,
                     "submit-handler": __props.submitHandler,
                     showAddBtn: __props.showAddBtn,
+                    beforeSubmitHandler: __props.beforeSubmitHandler,
                     onTableDataChange: tableDataChange,
                     onUploading: onTableUploadingHandler,
                     onUploaded: onTableUploadedHandler,
@@ -382,7 +391,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         ])
                       };
                     })
-                  ]), 1032, ["step", "onUpdate:step", "tableColumns", "formColumns", "rules", "emptyText", "fontSize", "rowClickExpand", "columnNum", "size", "beforeDataHandle", "beforeDataListHandle", "onExpandRowChange", "submit-handler", "showAddBtn", "onOptionsStatus"])) : createCommentVNode("v-if", true)
+                  ]), 1032, ["step", "onUpdate:step", "tableColumns", "formColumns", "rules", "emptyText", "fontSize", "rowClickExpand", "columnNum", "size", "beforeDataHandle", "beforeDataListHandle", "onExpandRowChange", "submit-handler", "showAddBtn", "beforeSubmitHandler", "onOptionsStatus"])) : createCommentVNode("v-if", true)
                 ])
               ])
             ]),

package/es/components/hyForm/cpns/formItem.vue.mjs

@@ -1,4 +1,4 @@
-import { inject, useTemplateRef, computed, reactive, toRefs, onMounted, watch, onBeforeUnmount, unref, openBlock, createElementBlock, normalizeClass, normalizeStyle, createBlock, createSlots, withCtx, createElementVNode, renderSlot, createTextVNode, toDisplayString, createCommentVNode, createVNode, Fragment, mergeProps } from 'vue';
+import { inject, useTemplateRef, computed, unref, reactive, toRefs, onMounted, watch, onBeforeUnmount, openBlock, createElementBlock, normalizeClass, normalizeStyle, createBlock, createSlots, withCtx, createElementVNode, renderSlot, createTextVNode, toDisplayString, createCommentVNode, createVNode, Fragment, mergeProps } from 'vue';
 import { ElFormItem, ElSelect, ElIcon, ElSelectV2, ElRadioGroup, ElCheckboxGroup, ElSwitch, ElInputNumber, ElCascader } from 'element-plus';
 import { Loading } from '@element-plus/icons-vue';
 import '../../../utils/index.mjs';
@@ -111,8 +111,16 @@ const _sfc_main = {
       };
     });
     const columnAttrs = computed(() => {
+      const attrs = props.column.attrs || {};
+      const config = {};
+      if (props.column.type === "input") {
+        if (attrs.type === "text" && unref(formContext.business) !== "tableForm") {
+          config.maxlength = 255;
+        }
+      }
       return {
-        ...props.column.attrs,
+        ...config,
+        ...attrs,
         label: columnLabelHandler(props.column, props.model),
         placeholder: columnPlaceholderHandler(props.column, props.model)
       };
@@ -181,7 +189,7 @@ const _sfc_main = {
       if (!isRequired(props, column) && formItemRef.value) {
         formItemRef.value.clearValidate();
       }
-      return columnRuleHandler(column, model);
+      return columnRuleHandler(column, model, { business: unref(formContext.business) });
     }
     function onChangeHandler() {
       const { onChange } = props.column;

package/es/components/hyForm/form.vue.mjs

@@ -55,9 +55,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: true
     },
-    isTableForm: {
-      type: Boolean,
-      default: false
+    business: {
+      type: String,
+      default: "default"
+      // default-默认 tableForm-表格表单
     }
   },
   emits: ["on-allMapSelect", "complete", "optionsStatus"],
@@ -82,6 +83,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         gridTemplateColumns: `repeat(${columnNum}, minmax(0, 1fr))`
       };
     });
+    const isTableForm = computed(() => props.business === "tableForm");
     const locationSelectRef = useTemplateRef("locationSelectRef");
     const allMapSelect = ref(false);
     function setMapSize() {
@@ -305,7 +307,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         { key: 2 },
                         [
                           createCommentVNode(" \u8868\u5355\u6570\u7EC4 "),
-                          !__props.isTableForm && unref(columnShowHandler)(props, column) ? (openBlock(), createBlock(_sfc_main$2, {
+                          !isTableForm.value && unref(columnShowHandler)(props, column) ? (openBlock(), createBlock(_sfc_main$2, {
                             key: 0,
                             class: normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,
@@ -329,7 +331,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["class", "model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : __props.isTableForm && unref(columnShowHandler)(props, column) ? (openBlock(), createBlock(_sfc_main$3, {
+                          ]), 1032, ["class", "model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : isTableForm.value && unref(columnShowHandler)(props, column) ? (openBlock(), createBlock(_sfc_main$3, {
                             key: 1,
                             class: normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,

package/es/components/hyForm/js/useAppForm.mjs

@@ -22,7 +22,8 @@ function appFormItemHandler(column = {}) {
     return {
       ...column,
       attrs: {
-        maxlength: attrs.type === "text" ? 255 : void 0,
+        type: "text",
+        // maxlength: attrs.type === 'text' ? 255 : undefined,
         ...attrs
       }
     };

package/es/components/hySearch/js/useAppSearch.mjs

@@ -80,6 +80,7 @@ function appSearchItemHandler(column = {}) {
     return {
       ...column,
       attrs: {
+        type: "text",
         maxlength: attrs.type === "textarea" ? 255 : attrs.type === "text" ? 100 : void 0,
         ...attrs
       }

package/es/components/hyTableForm/batchTableForm.vue.mjs

@@ -77,6 +77,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     // 外部整体数据处理
     beforeDataListHandle: {
       type: Function
+    },
+    // 提交数据之前处理
+    beforeSubmitHandler: {
+      type: Function
     }
   }, {
     "step": { type: Number, default: 1 },
@@ -252,9 +256,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       emits("submitting");
       for (let i = 0; i <= dataSource.length - 1; i++) {
         const target = dataSource[i];
-        const { onlyId, errorMsg, errorMap, children, ...data } = target;
+        let { onlyId, errorMsg, errorMap, children, ...data } = target;
         setSubmitProgress(Math.floor((i + 1) / total * 100));
-        if (errorMsg) {
+        if (!errorMsg && props.beforeSubmitHandler) {
+          await props.beforeSubmitHandler([data]);
+          errorMsg = data.errorMsg;
+        }
+        if (errorMsg && errorMsg.message) {
           continue;
         }
         try {

package/es/components/hyTableForm/js/index.mjs

@@ -1,11 +1,9 @@
 import XLSX from 'xlsx';
 import dayjs from 'dayjs';
-import 'vue';
 import AsyncValidator from 'async-validator';
 import { ElMessage } from 'element-plus';
 import { columnShowHandler } from '../../hyForm/js/index.mjs';
 import '../../../utils/index.mjs';
-import '../../../hooks/index.mjs';
 import { columnRuleHandler, setValueByProp, getValueByProp } from '../../../utils/form.mjs';
 import { isArray } from '../../../utils/is.mjs';
 
@@ -15,7 +13,7 @@ const doValidate = async (target = {}, columns = [], ruleList = {}) => {
   const columnMap = (columns || []).reduce((columnMap2, column) => {
     if (columnShowHandler({ model: data }, column)) {
       columnMap2[column.prop] = column;
-      rules[column.prop] = columnRuleHandler(column, target);
+      rules[column.prop] = columnRuleHandler(column, target, { business: "tableForm" });
       setValueByProp(data, column.prop, getValueByProp(target, column.prop));
     }
     return columnMap2;

package/es/components/hyTableForm/tableForm.vue.mjs

@@ -554,7 +554,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         class: "px-0",
                         columnNum: __props.columnNum,
                         size: __props.size,
-                        isTableForm: "",
+                        business: "tableForm",
                         onValidate: (prop, isValid, message) => onValidateHandler(row, { prop, isValid, message }),
                         onOptionsStatus: _ctx.$attrs.onOptionsStatus
                       }, createSlots({

package/es/locale/en_US.mjs

@@ -34,7 +34,8 @@ var en_US = {
     additionalInformationTip: "Editor's Supplementary Information (Optional)",
     additionalInformationHoverTip: "Click To Expand And View More Detailed Information. (This Is An Optional Field)",
     dynamicFormItem: "Dynamic Form Item",
-    addFormItem: "Add Form Item"
+    addFormItem: "Add Form Item",
+    characterLimit: "{0} should be limited to {1} characters or fewer"
   },
   table: {
     hideFilter: "Hide filter",

package/es/locale/zh_CN.mjs

@@ -35,7 +35,8 @@ var zh_CN = {
     additionalInformationTip: "\u7F16\u8F91\u8865\u5145\u4FE1\u606F (\u9009\u586B)",
     additionalInformationHoverTip: "\u70B9\u51FB\u53EF\u5C55\u5F00\u8865\u5145\u66F4\u591A\u4FE1\u606F\uFF0C\u975E\u5FC5\u586B\u9879",
     dynamicFormItem: "\u52A8\u6001\u8868\u5355\u9879",
-    addFormItem: "\u6DFB\u52A0\u8868\u5355\u9879"
+    addFormItem: "\u6DFB\u52A0\u8868\u5355\u9879",
+    characterLimit: "{0}\u9650\u5236\u5728{1}\u4F4D\u5B57\u7B26\u4EE5\u5185"
   },
   table: {
     hideFilter: "\u9690\u85CF\u7B5B\u9009\u5668",

package/es/utils/form.mjs

@@ -1,6 +1,6 @@
 import { unref } from 'vue';
 import '../hooks/index.mjs';
-import { isString, isArray, isBoolean, isFunction, isObject, isEmpty } from './is.mjs';
+import { isString, isArray, isBoolean, isFunction, isObject, isNumber, isEmpty } from './is.mjs';
 import { $t } from '../hooks/useLocale.mjs';
 
 function getValueByProp(model, prop) {
@@ -83,7 +83,7 @@ const ruleHandler = (column, model) => {
   }
   return [];
 };
-const columnRuleHandler = (column, model) => {
+const columnRuleHandler = (column, model, config) => {
   const rules = ruleHandler(column, model);
   if (column.required) {
     rules.unshift({
@@ -91,6 +91,16 @@ const columnRuleHandler = (column, model) => {
       message: genRuleRequiredMsgHandler(column, model)
     });
   }
+  if (config && config.business === "tableForm") {
+    if (column.type === "input" && column.attrs.type === "text") {
+      if (!rules.some((item) => isNumber(item.max))) {
+        rules.push({
+          max: 255,
+          message: $t("form.characterLimit", [columnLabelHandler(column, model), 255])
+        });
+      }
+    }
+  }
   return rules;
 };
 const genColumnDefaultLabel = (column) => {

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.67";
+const version = "0.2.69";
 
 export { version };

package/lib/bussiness/hyElectronicFence/cpns/batchSetElectronicFenceUserDialog/batchSetElectronicFenceUserDialog.vue.js

@@ -94,6 +94,7 @@ const _sfc_main = {
       });
       const rules2 = vue.ref({});
       async function show2() {
+        await hy.watchPause();
         hy.setDragLevelIndex("HyBatchUploadDialogRef");
         HyBatchUploadDialogRef2.value.show();
       }
@@ -103,6 +104,7 @@ const _sfc_main = {
         });
       }
       function onSubmit2(params) {
+        hy.uploadProgress(params);
         const { total, success, failed, result } = params;
         if (success) {
           hy.currentBus.value.emit("batchSetElectronicFenceUserDialog", {
@@ -124,8 +126,10 @@ const _sfc_main = {
       };
     }
     const {
+      setIsEdit,
       setDragLevelIndex,
       minimizedShow,
+      onClose,
       onMinimized,
       HyBatchUploadDialogRef,
       tableColumns,
@@ -134,9 +138,10 @@ const _sfc_main = {
       show,
       submitHandler,
       onSubmit
-    } = useMixins.useMixins({ currentBus }, [useDialog.useDialog, useDialog.useDialogIsEdit, useBatchSetElectronicFenceUserDialog]);
+    } = useMixins.useMixins({ currentBus }, [useDialog.useDialog, useDialog.useDialogIsEdit, useDialog.useBatchDialog, useBatchSetElectronicFenceUserDialog]);
     __expose({
       show,
+      setIsEdit,
       minimizedShow,
       setDragLevelIndex
     });
@@ -155,7 +160,11 @@ const _sfc_main = {
         "show-operate": true,
         "if-draggable": __props.ifDraggable,
         "if-shrink": __props.ifShrink,
+        "on-cancel": vue.unref(onClose),
+        "on-close": vue.unref(onClose),
         onSubmit: vue.unref(onSubmit),
+        onSubmitProgress: _ctx.onSubmitProgress,
+        onTableDataChange: _ctx.onTableDataChange,
         onOnMinimized: vue.unref(onMinimized),
         onOnDialogMousedown: ($event) => vue.unref(setDragLevelIndex)("HyBatchUploadDialogRef")
       }, {
@@ -165,7 +174,7 @@ const _sfc_main = {
         ]),
         _: 1
         /* STABLE */
-      }, 8, ["title", "table-columns", "form-columns", "rules", "submit-handler", "if-draggable", "if-shrink", "onSubmit", "onOnMinimized", "onOnDialogMousedown"]);
+      }, 8, ["title", "table-columns", "form-columns", "rules", "submit-handler", "if-draggable", "if-shrink", "on-cancel", "on-close", "onSubmit", "onSubmitProgress", "onTableDataChange", "onOnMinimized", "onOnDialogMousedown"]);
     };
   }
 };

package/lib/bussiness/hyElectronicFence/cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersDialog.vue.js

@@ -10,7 +10,6 @@ var organization = require('../../../../api/organization.js');
 require('../../../../hooks/index.js');
 require('../../../../components/index.js');
 var electronicFenceAssociatedUsersItem = require('./electronicFenceAssociatedUsersItem.vue.js');
-var _pluginVue_exportHelper = require('../../../../_virtual/_plugin-vue_export-helper.js');
 var useLocale = require('../../../../hooks/useLocale.js');
 var useMixins = require('../../../../hooks/useMixins.js');
 var useDialog = require('../../../../hooks/useDialog.js');
@@ -20,6 +19,8 @@ var index$3 = require('../../../../components/hyButton/index.js');
 var index$4 = require('../../../../components/hyInput/index.js');
 var index$5 = require('../../../../components/hyIcon/index.js');
 
+import "../../style/electronicFenceAssociatedUsersDialog.scss";
+
 const __default__ = vue.defineComponent({
   name: "HyElectronicFenceAssociatedUsersDialog"
 });
@@ -206,7 +207,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         onOnDialogMousedown: ($event) => vue.unref(setDragLevelIndex)("HyDialogRef")
       }, {
         default: vue.withCtx(() => [
-          vue.createElementVNode("div", { class: "flex w-full h-full" }, [
+          vue.createElementVNode("div", { class: "hy-electronic-fence-associated-users-dialog flex w-full h-full" }, [
             vue.createElementVNode("div", { class: "w-1/2 h-full flex flex-col mr-5 text-xs" }, [
               vue.createElementVNode("div", { class: "tree-box h-0 flex-1 flex flex-col box-border pb-2" }, [
                 vue.createVNode(vue.unref(elementPlus.ElAutoResizer), null, {
@@ -315,8 +316,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     };
   }
 });
-import "/data/jenkins-work/workspace/WEB-V3-PROJECT-Web-hy-dispatch-ui@2/tmp/packages/bussiness/hyElectronicFence/cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersDialog.vue?vue&type=style&index=0&scoped=bc2c260d&lang.scss";
-
-var electronicFenceAssociatedUsersDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bc2c260d"]]);
 
-exports.default = electronicFenceAssociatedUsersDialog;
+exports.default = _sfc_main;

package/lib/bussiness/hyElectronicFence/cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersItem.vue.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 require('../../../../hooks/index.js');
 require('../../../../components/index.js');
-var _pluginVue_exportHelper = require('../../../../_virtual/_plugin-vue_export-helper.js');
 var index = require('../../../../components/hyTooltip/index.js');
 var index$1 = require('../../../../components/hyIcon/index.js');
 var useLocale = require('../../../../hooks/useLocale.js');
@@ -120,8 +119,5 @@ const _sfc_main = {
     };
   }
 };
-import "/data/jenkins-work/workspace/WEB-V3-PROJECT-Web-hy-dispatch-ui@2/tmp/packages/bussiness/hyElectronicFence/cpns/electronicFenceAssociatedUsersDialog/electronicFenceAssociatedUsersItem.vue?vue&type=style&index=0&scoped=788f720f&lang.scss";
 
-var ElectronicFenceAssociatedUsersItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-788f720f"]]);
-
-exports.default = ElectronicFenceAssociatedUsersItem;
+exports.default = _sfc_main;

package/lib/bussiness/hyElectronicFence/style/electronicFenceAssociatedUsersDialog.scss

@@ -0,0 +1,25 @@
+.hy-electronic-fence-associated-users-dialog {  
+  .tree-box {
+    border: 1px solid rgba(var(--hy-border));
+    border-radius: 4px;
+    box-shadow:
+      0px 2px 4px 0px rgba(0, 0, 0, 0.5),
+      inset 0px 0px 10px 0px #1f4b77;
+    backdrop-filter: blur(5px);
+  }
+  li {
+    &:hover {
+      box-shadow:
+        inset 0px 0px 50px 0px rgba(var(--hy-theme), 0.2),
+        inset 0px 0px 0px 1px rgba(var(--hy-theme), 0.5);
+      .delete {
+        opacity: 1;
+      }
+    }
+    .delete {
+      transition: 1s;
+      opacity: 0;
+      color: rgba(var(--hy-danger-2));
+    }
+  }
+}

package/lib/components/hyBatchUploadDialog/batchUploadDialog.vue.js

@@ -96,6 +96,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     showAddBtn: {
       type: Boolean,
       default: true
+    },
+    // 提交数据之前处理
+    beforeSubmitHandler: {
+      type: Function
     }
   }, {
     "modelValue": { type: Boolean, default: false },
@@ -190,8 +194,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       batchTableFormRef.value.nextStep();
     }
     async function onSubmitHandler() {
-      const res = await batchTableFormRef.value.validate();
+      let res = batchTableFormRef.value.validate();
       if (props.uploadType === "custom") {
+        if (res.total === res.success && props.beforeSubmitHandler) {
+          await props.beforeSubmitHandler(res.dataSource);
+          res = batchTableFormRef.value.validate();
+        }
         const dataSource = batchTableFormRef.value.getTableDataSource();
         onTableSubmitHandler({
           ...res,
@@ -365,6 +373,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     onExpandRowChange: __props.onExpandRowChange,
                     "submit-handler": __props.submitHandler,
                     showAddBtn: __props.showAddBtn,
+                    beforeSubmitHandler: __props.beforeSubmitHandler,
                     onTableDataChange: tableDataChange,
                     onUploading: onTableUploadingHandler,
                     onUploaded: onTableUploadedHandler,
@@ -386,7 +395,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         ])
                       };
                     })
-                  ]), 1032, ["step", "onUpdate:step", "tableColumns", "formColumns", "rules", "emptyText", "fontSize", "rowClickExpand", "columnNum", "size", "beforeDataHandle", "beforeDataListHandle", "onExpandRowChange", "submit-handler", "showAddBtn", "onOptionsStatus"])) : vue.createCommentVNode("v-if", true)
+                  ]), 1032, ["step", "onUpdate:step", "tableColumns", "formColumns", "rules", "emptyText", "fontSize", "rowClickExpand", "columnNum", "size", "beforeDataHandle", "beforeDataListHandle", "onExpandRowChange", "submit-handler", "showAddBtn", "beforeSubmitHandler", "onOptionsStatus"])) : vue.createCommentVNode("v-if", true)
                 ])
               ])
             ]),

package/lib/components/hyForm/cpns/formItem.vue.js

@@ -115,8 +115,16 @@ const _sfc_main = {
       };
     });
     const columnAttrs = vue.computed(() => {
+      const attrs = props.column.attrs || {};
+      const config = {};
+      if (props.column.type === "input") {
+        if (attrs.type === "text" && vue.unref(formContext.business) !== "tableForm") {
+          config.maxlength = 255;
+        }
+      }
       return {
-        ...props.column.attrs,
+        ...config,
+        ...attrs,
         label: form.columnLabelHandler(props.column, props.model),
         placeholder: form.columnPlaceholderHandler(props.column, props.model)
       };
@@ -185,7 +193,7 @@ const _sfc_main = {
       if (!index.isRequired(props, column) && formItemRef.value) {
         formItemRef.value.clearValidate();
       }
-      return form.columnRuleHandler(column, model);
+      return form.columnRuleHandler(column, model, { business: vue.unref(formContext.business) });
     }
     function onChangeHandler() {
       const { onChange } = props.column;

package/lib/components/hyForm/form.vue.js

@@ -59,9 +59,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: true
     },
-    isTableForm: {
-      type: Boolean,
-      default: false
+    business: {
+      type: String,
+      default: "default"
+      // default-默认 tableForm-表格表单
     }
   },
   emits: ["on-allMapSelect", "complete", "optionsStatus"],
@@ -86,6 +87,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         gridTemplateColumns: `repeat(${columnNum}, minmax(0, 1fr))`
       };
     });
+    const isTableForm = vue.computed(() => props.business === "tableForm");
     const locationSelectRef = vue.useTemplateRef("locationSelectRef");
     const allMapSelect = vue.ref(false);
     function setMapSize() {
@@ -309,7 +311,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         { key: 2 },
                         [
                           vue.createCommentVNode(" \u8868\u5355\u6570\u7EC4 "),
-                          !__props.isTableForm && vue.unref(index.columnShowHandler)(props, column) ? (vue.openBlock(), vue.createBlock(arrayItem.default, {
+                          !isTableForm.value && vue.unref(index.columnShowHandler)(props, column) ? (vue.openBlock(), vue.createBlock(arrayItem.default, {
                             key: 0,
                             class: vue.normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,
@@ -333,7 +335,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["class", "model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : __props.isTableForm && vue.unref(index.columnShowHandler)(props, column) ? (vue.openBlock(), vue.createBlock(arrayItem2.default, {
+                          ]), 1032, ["class", "model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : isTableForm.value && vue.unref(index.columnShowHandler)(props, column) ? (vue.openBlock(), vue.createBlock(arrayItem2.default, {
                             key: 1,
                             class: vue.normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,

package/lib/components/hyForm/js/useAppForm.js

@@ -24,7 +24,8 @@ function appFormItemHandler(column = {}) {
     return {
       ...column,
       attrs: {
-        maxlength: attrs.type === "text" ? 255 : void 0,
+        type: "text",
+        // maxlength: attrs.type === 'text' ? 255 : undefined,
         ...attrs
       }
     };

package/lib/components/hySearch/js/useAppSearch.js

@@ -82,6 +82,7 @@ function appSearchItemHandler(column = {}) {
     return {
       ...column,
       attrs: {
+        type: "text",
         maxlength: attrs.type === "textarea" ? 255 : attrs.type === "text" ? 100 : void 0,
         ...attrs
       }

package/lib/components/hyTableForm/batchTableForm.vue.js

@@ -81,6 +81,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     // 外部整体数据处理
     beforeDataListHandle: {
       type: Function
+    },
+    // 提交数据之前处理
+    beforeSubmitHandler: {
+      type: Function
     }
   }, {
     "step": { type: Number, default: 1 },
@@ -256,9 +260,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       emits("submitting");
       for (let i = 0; i <= dataSource.length - 1; i++) {
         const target = dataSource[i];
-        const { onlyId, errorMsg, errorMap, children, ...data } = target;
+        let { onlyId, errorMsg, errorMap, children, ...data } = target;
         setSubmitProgress(Math.floor((i + 1) / total * 100));
-        if (errorMsg) {
+        if (!errorMsg && props.beforeSubmitHandler) {
+          await props.beforeSubmitHandler([data]);
+          errorMsg = data.errorMsg;
+        }
+        if (errorMsg && errorMsg.message) {
           continue;
         }
         try {

package/lib/components/hyTableForm/js/index.js

@@ -2,12 +2,10 @@
 
 var XLSX = require('xlsx');
 var dayjs = require('dayjs');
-require('vue');
 var AsyncValidator = require('async-validator');
 var elementPlus = require('element-plus');
 var index = require('../../hyForm/js/index.js');
 require('../../../utils/index.js');
-require('../../../hooks/index.js');
 var form = require('../../../utils/form.js');
 var is = require('../../../utils/is.js');
 
@@ -17,7 +15,7 @@ const doValidate = async (target = {}, columns = [], ruleList = {}) => {
   const columnMap = (columns || []).reduce((columnMap2, column) => {
     if (index.columnShowHandler({ model: data }, column)) {
       columnMap2[column.prop] = column;
-      rules[column.prop] = form.columnRuleHandler(column, target);
+      rules[column.prop] = form.columnRuleHandler(column, target, { business: "tableForm" });
       form.setValueByProp(data, column.prop, form.getValueByProp(target, column.prop));
     }
     return columnMap2;

package/lib/components/hyTableForm/tableForm.vue.js

@@ -558,7 +558,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         class: "px-0",
                         columnNum: __props.columnNum,
                         size: __props.size,
-                        isTableForm: "",
+                        business: "tableForm",
                         onValidate: (prop, isValid, message) => onValidateHandler(row, { prop, isValid, message }),
                         onOptionsStatus: _ctx.$attrs.onOptionsStatus
                       }, vue.createSlots({

package/lib/locale/en_US.js

@@ -38,7 +38,8 @@ var en_US = {
     additionalInformationTip: "Editor's Supplementary Information (Optional)",
     additionalInformationHoverTip: "Click To Expand And View More Detailed Information. (This Is An Optional Field)",
     dynamicFormItem: "Dynamic Form Item",
-    addFormItem: "Add Form Item"
+    addFormItem: "Add Form Item",
+    characterLimit: "{0} should be limited to {1} characters or fewer"
   },
   table: {
     hideFilter: "Hide filter",

package/lib/locale/zh_CN.js

@@ -39,7 +39,8 @@ var zh_CN = {
     additionalInformationTip: "\u7F16\u8F91\u8865\u5145\u4FE1\u606F (\u9009\u586B)",
     additionalInformationHoverTip: "\u70B9\u51FB\u53EF\u5C55\u5F00\u8865\u5145\u66F4\u591A\u4FE1\u606F\uFF0C\u975E\u5FC5\u586B\u9879",
     dynamicFormItem: "\u52A8\u6001\u8868\u5355\u9879",
-    addFormItem: "\u6DFB\u52A0\u8868\u5355\u9879"
+    addFormItem: "\u6DFB\u52A0\u8868\u5355\u9879",
+    characterLimit: "{0}\u9650\u5236\u5728{1}\u4F4D\u5B57\u7B26\u4EE5\u5185"
   },
   table: {
     hideFilter: "\u9690\u85CF\u7B5B\u9009\u5668",

package/lib/utils/form.js

@@ -85,7 +85,7 @@ const ruleHandler = (column, model) => {
   }
   return [];
 };
-const columnRuleHandler = (column, model) => {
+const columnRuleHandler = (column, model, config) => {
   const rules = ruleHandler(column, model);
   if (column.required) {
     rules.unshift({
@@ -93,6 +93,16 @@ const columnRuleHandler = (column, model) => {
       message: genRuleRequiredMsgHandler(column, model)
     });
   }
+  if (config && config.business === "tableForm") {
+    if (column.type === "input" && column.attrs.type === "text") {
+      if (!rules.some((item) => is.isNumber(item.max))) {
+        rules.push({
+          max: 255,
+          message: useLocale.$t("form.characterLimit", [columnLabelHandler(column, model), 255])
+        });
+      }
+    }
+  }
   return rules;
 };
 const genColumnDefaultLabel = (column) => {

package/lib/version.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "0.2.67";
+const version = "0.2.69";
 
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.68",
+  "version": "0.2.70",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "scripts": {