@fmdeui/fmui 1.0.85 → 1.0.86

package/es/hooks/limitsFunction.d.ts

@@ -1,30 +1,27 @@
 export declare function getlimit(value: string): any;
 /**
  * 获取表单字段验证规则
- * @param value 表单字段路径
  * @param field 表单字段
  * @param msg 验证提示
  * @returns 验证规则
  */
-export declare function getRules(value: string, field: string, msg: string): string;
+export declare function getRules(field: string, msg: string): string;
 /**
  * 获取表单字段属性
- * @param value 表单字段路径
+ * @param field 表单字段
  * @returns 表单字段属性
  */
-export declare function getFormItemProp(path: string, field: string): string;
+export declare function getFormItemProp(field: string): string;
 /**
  * 获取表单字段标签
- * @param path 表单字段路径
  * @param field 表单字段
  * @param defaultValue 默认值
  * @returns 表单字段标签
  */
-export declare function getFormItemLabel(path: string, field: string, defaultValue: string): string;
+export declare function getFormItemLabel(field: string, defaultValue: string): string;
 /**
  * 获取表格字段是否显示
- * @param path 表格字段路径
  * @param field 表格字段
  * @returns 表格字段是否显示
  */
-export declare function showTabelColumn(path: string, field: string): boolean;
+export declare function showTabelColumn(field: string): boolean;

package/es/packages/directive/authDirective.mjs

@@ -1,3 +1,4 @@
+import { useRoute } from 'vue-router';
 import { useUserInfo } from '../stores/userInfo.mjs';
 import { judgementSameArr } from '../utils/arrayOperation.mjs';
 
@@ -30,10 +31,10 @@ function authDirective(app) {
   app.directive("hdtable", {
     mounted(el, binding) {
       const stores = useUserInfo();
-      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
-      const item = stores.userInfos.formDes.find((item2) => item2.path === config.path);
+      const route = useRoute();
+      const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
       if (item && item.formDes.length > 0) {
-        const xitem = item.formDes.find((v) => v.field === config.field);
+        const xitem = item.formDes.find((v) => v.field === binding.value);
         if (xitem && xitem.isTable == 0) el.parentNode.removeChild(el);
       }
     }
@@ -41,10 +42,10 @@ function authDirective(app) {
   app.directive("hpquery", {
     mounted(el, binding) {
       const stores = useUserInfo();
-      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
-      const item = stores.userInfos.formDes.find((item2) => item2.path === config.path);
+      const route = useRoute();
+      const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
       if (item && item.formDes.length > 0) {
-        const xitem = item.formDes.find((v) => v.field === config.field);
+        const xitem = item.formDes.find((v) => v.field === binding.value);
         if (xitem && xitem.isQuery == 0) el.parentNode.removeChild(el);
       }
     }
@@ -52,10 +53,10 @@ function authDirective(app) {
   app.directive("hpaddupdate", {
     mounted(el, binding) {
       const stores = useUserInfo();
-      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
-      const item = stores.userInfos.formDes.find((item2) => item2.path === config.path);
+      const route = useRoute();
+      const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
       if (item && item.formDes.length > 0) {
-        const xitem = item.formDes.find((v) => v.field === config.field);
+        const xitem = item.formDes.find((v) => v.field === binding.value);
         if (xitem && xitem.isAddUpdate == 0) el.parentNode.removeChild(el);
       }
     }

package/es/packages/hooks/limitsFunction.mjs

@@ -1,4 +1,5 @@
 import '../stores/index.mjs';
+import { useRoute } from 'vue-router';
 import { useUserInfo } from '../stores/userInfo.mjs';
 
 function getlimit(value) {
@@ -7,9 +8,10 @@ function getlimit(value) {
   if (matched) return matched.limit;
   return null;
 }
-function getRules(value, field, msg) {
+function getRules(field, msg) {
   const stores = useUserInfo();
-  const item = stores.userInfos.formDes.find((item2) => item2.path === value);
+  const route = useRoute();
+  const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
   let rels = [];
   if (item && item.formDes.length > 0) {
     const xitem = item.formDes.find((v) => v.field === field);
@@ -22,27 +24,30 @@ function getRules(value, field, msg) {
   }
   return rels;
 }
-function getFormItemProp(path, field) {
+function getFormItemProp(field) {
   const stores = useUserInfo();
-  const item = stores.userInfos.formDes.find((item2) => item2.path === path);
+  const route = useRoute();
+  const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
   if (item && item.formDes.length > 0) {
     const xitem = item.formDes.find((v) => v.field === field);
     if (xitem) return xitem.isRequired == 1 || xitem.isFromValid > 0 ? field : "";
   }
   return "";
 }
-function getFormItemLabel(path, field, defaultValue) {
+function getFormItemLabel(field, defaultValue) {
   const stores = useUserInfo();
-  const item = stores.userInfos.formDes.find((item2) => item2.path === path);
+  const route = useRoute();
+  const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
   if (item && item.formDes.length > 0) {
     const xitem = item.formDes.find((v) => v.field === field);
     if (xitem) return xitem.title && xitem.title != "" ? xitem.title : defaultValue;
   }
   return defaultValue;
 }
-function showTabelColumn(path, field) {
+function showTabelColumn(field) {
   const stores = useUserInfo();
-  const item = stores.userInfos.formDes.find((item2) => item2.path === path);
+  const route = useRoute();
+  const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
   if (item && item.formDes.length > 0) {
     const xitem = item.formDes.find((v) => v.field === field);
     if (xitem) {

package/index.js

@@ -1,9 +1,9 @@
-/*! fmdeui-fmui v1.0.85 */
+/*! fmdeui-fmui v1.0.86 */
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('vue-router'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
-	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'vue-router', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
-	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.fmdeuifmui = {}, global.VxeUITable, global.VxeUIPluginRenderElement, global.VxeUIPluginExportXLSX, global.VxeUIExport, global.ExcelJS, global.ElementPlusIconsVue, global.Vue, global.ElementPlus, global._, global.Cookies, global.Pinia, global.VueUse, global.CryptoJS, global.XLSX, global.vueI18n, global.vueRouter, global.Sortable, global.screenfull, global.Push, global.mitt, global.SignalR, global.axios));
-})(this, (function (exports, VxeUITable, VxeUIPluginRenderElement, VxeUIPluginExportXLSX, VxeUI, ExcelJS, svg, vue, elementPlus, lodashEs, Cookies, pinia$1, core, CryptoJS, XLSXS, vueI18n, vueRouter, Sortable, screenfull, Push, mitt, SignalR, axios) { 'use strict';
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue-router'), require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
+	typeof define === 'function' && define.amd ? define(['exports', 'vue-router', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.fmdeuifmui = {}, global.vueRouter, global.VxeUITable, global.VxeUIPluginRenderElement, global.VxeUIPluginExportXLSX, global.VxeUIExport, global.ExcelJS, global.ElementPlusIconsVue, global.Vue, global.ElementPlus, global._, global.Cookies, global.Pinia, global.VueUse, global.CryptoJS, global.XLSX, global.vueI18n, global.Sortable, global.screenfull, global.Push, global.mitt, global.SignalR, global.axios));
+})(this, (function (exports, vueRouter, VxeUITable, VxeUIPluginRenderElement, VxeUIPluginExportXLSX, VxeUI, ExcelJS, svg, vue, elementPlus, lodashEs, Cookies, pinia$1, core, CryptoJS, XLSXS, vueI18n, Sortable, screenfull, Push, mitt, SignalR, axios) { 'use strict';
 
 	function _interopNamespaceDefault(e) {
 		var n = Object.create(null);
@@ -3926,10 +3926,10 @@
 	  app.directive("hdtable", {
 	    mounted(el, binding) {
 	      const stores = useUserInfo();
-	      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
-	      const item = stores.userInfos.formDes.find((item2) => item2.path === config.path);
+	      const route = vueRouter.useRoute();
+	      const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
 	      if (item && item.formDes.length > 0) {
-	        const xitem = item.formDes.find((v) => v.field === config.field);
+	        const xitem = item.formDes.find((v) => v.field === binding.value);
 	        if (xitem && xitem.isTable == 0) el.parentNode.removeChild(el);
 	      }
 	    }
@@ -3937,10 +3937,10 @@
 	  app.directive("hpquery", {
 	    mounted(el, binding) {
 	      const stores = useUserInfo();
-	      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
-	      const item = stores.userInfos.formDes.find((item2) => item2.path === config.path);
+	      const route = vueRouter.useRoute();
+	      const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
 	      if (item && item.formDes.length > 0) {
-	        const xitem = item.formDes.find((v) => v.field === config.field);
+	        const xitem = item.formDes.find((v) => v.field === binding.value);
 	        if (xitem && xitem.isQuery == 0) el.parentNode.removeChild(el);
 	      }
 	    }
@@ -3948,10 +3948,10 @@
 	  app.directive("hpaddupdate", {
 	    mounted(el, binding) {
 	      const stores = useUserInfo();
-	      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
-	      const item = stores.userInfos.formDes.find((item2) => item2.path === config.path);
+	      const route = vueRouter.useRoute();
+	      const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
 	      if (item && item.formDes.length > 0) {
-	        const xitem = item.formDes.find((v) => v.field === config.field);
+	        const xitem = item.formDes.find((v) => v.field === binding.value);
 	        if (xitem && xitem.isAddUpdate == 0) el.parentNode.removeChild(el);
 	      }
 	    }
@@ -20476,9 +20476,10 @@
 	  if (matched) return matched.limit;
 	  return null;
 	}
-	function getRules(value, field, msg) {
+	function getRules(field, msg) {
 	  const stores = useUserInfo();
-	  const item = stores.userInfos.formDes.find((item2) => item2.path === value);
+	  const route = vueRouter.useRoute();
+	  const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
 	  let rels = [];
 	  if (item && item.formDes.length > 0) {
 	    const xitem = item.formDes.find((v) => v.field === field);
@@ -20491,27 +20492,30 @@
 	  }
 	  return rels;
 	}
-	function getFormItemProp(path, field) {
+	function getFormItemProp(field) {
 	  const stores = useUserInfo();
-	  const item = stores.userInfos.formDes.find((item2) => item2.path === path);
+	  const route = vueRouter.useRoute();
+	  const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
 	  if (item && item.formDes.length > 0) {
 	    const xitem = item.formDes.find((v) => v.field === field);
 	    if (xitem) return xitem.isRequired == 1 || xitem.isFromValid > 0 ? field : "";
 	  }
 	  return "";
 	}
-	function getFormItemLabel(path, field, defaultValue) {
+	function getFormItemLabel(field, defaultValue) {
 	  const stores = useUserInfo();
-	  const item = stores.userInfos.formDes.find((item2) => item2.path === path);
+	  const route = vueRouter.useRoute();
+	  const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
 	  if (item && item.formDes.length > 0) {
 	    const xitem = item.formDes.find((v) => v.field === field);
 	    if (xitem) return xitem.title && xitem.title != "" ? xitem.title : defaultValue;
 	  }
 	  return defaultValue;
 	}
-	function showTabelColumn(path, field) {
+	function showTabelColumn(field) {
 	  const stores = useUserInfo();
-	  const item = stores.userInfos.formDes.find((item2) => item2.path === path);
+	  const route = vueRouter.useRoute();
+	  const item = stores.userInfos.formDes.find((item2) => item2.path === route.path);
 	  if (item && item.formDes.length > 0) {
 	    const xitem = item.formDes.find((v) => v.field === field);
 	    if (xitem) {