@fmdeui/fmui 1.0.79 → 1.0.80

package/es/hooks/authFunction.d.ts

@@ -38,4 +38,4 @@ export declare function hAuths<T extends VNode>(el: T, value: Array<string>): T;
  * @returns VNode
  */
 export declare function hAuthAll<T extends VNode>(el: T, value: Array<string>): T;
-export declare function fdRules(value: string): string;
+export declare function fdRules(value: string, field: string): string;

package/es/hooks/limitsFunction.d.ts

@@ -4,4 +4,4 @@ export declare function getlimit(value: string): any;
  * @param value 表单字段路径
  * @returns 表单字段属性
  */
-export declare function getFrmItemProp(value: string): boolean;
+export declare function getFrmItemProp(path: string, field: string): boolean;

package/es/packages/directive/authDirective.mjs

@@ -30,22 +30,34 @@ function authDirective(app) {
   app.directive("hdtable", {
     mounted(el, binding) {
       const stores = useUserInfo();
-      const item = stores.userInfos.formDesc.find((item2) => item2.path === binding.value);
-      if (item && item.isTable == 0) el.parentNode.removeChild(el);
+      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
+      const item = stores.userInfos.formDesc.find((item2) => item2.path === config.path);
+      if (item && item.formDes.length > 0) {
+        const xitem = item.formDes.find((v) => v.field === config.field);
+        if (xitem && xitem.isTable == 0) el.parentNode.removeChild(el);
+      }
     }
   });
   app.directive("hpquery", {
     mounted(el, binding) {
       const stores = useUserInfo();
-      const item = stores.userInfos.formDesc.find((item2) => item2.path === binding.value);
-      if (item && item.isQuery == 0) el.parentNode.removeChild(el);
+      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
+      const item = stores.userInfos.formDesc.find((item2) => item2.path === config.path);
+      if (item && item.formDes.length > 0) {
+        const xitem = item.formDes.find((v) => v.field === config.field);
+        if (xitem && xitem.isQuery == 0) el.parentNode.removeChild(el);
+      }
     }
   });
   app.directive("hpaddupdate", {
     mounted(el, binding) {
       const stores = useUserInfo();
-      const item = stores.userInfos.formDesc.find((item2) => item2.path === binding.value);
-      if (item && item.isAddUpdate == 0) el.parentNode.removeChild(el);
+      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
+      const item = stores.userInfos.formDesc.find((item2) => item2.path === config.path);
+      if (item && item.formDes.length > 0) {
+        const xitem = item.formDes.find((v) => v.field === config.field);
+        if (xitem && xitem.isAddUpdate == 0) el.parentNode.removeChild(el);
+      }
     }
   });
 }

package/es/packages/hooks/authFunction.mjs

@@ -30,14 +30,19 @@ function hAuths(el, value) {
 function hAuthAll(el, value) {
   return withDirectives(el, [[resolveDirective("auth-all"), value]]);
 }
-function fdRules(value) {
+function fdRules(value, field) {
   const stores = useUserInfo();
   const item = stores.userInfos.formDesc.find((item2) => item2.path === value);
   let rels = [];
-  if (item && item.isRequired == 1)
-    rels.push({ required: true, message: "\u8BF7\u9009\u62E9", trigger: "blur" });
-  if (item && item.isFromValid == 1)
-    rels.push({ pattern: /^[1-9]\d*$/, message: "\u8BF7\u9009\u62E9\u6240\u5C5E\u64CD\u4F5C\u90E8", trigger: "blur" });
+  if (item && item.formDes.length > 0) {
+    const xitem = item.formDes.find((v) => v.field === field);
+    if (xitem) {
+      if (xitem.isRequired == 1)
+        rels.push({ required: true, message: "\u8BF7\u9009\u62E9", trigger: "blur" });
+      if (xitem.isFromValid == 1)
+        rels.push({ pattern: /^[1-9]\d*$/, message: "\u8BF7\u9009\u62E9\u6240\u5C5E\u64CD\u4F5C\u90E8", trigger: "blur" });
+    }
+  }
   return rels;
 }
 

package/es/packages/hooks/limitsFunction.mjs

@@ -7,10 +7,13 @@ function getlimit(value) {
   if (matched) return matched.limit;
   return null;
 }
-function getFrmItemProp(value) {
+function getFrmItemProp(path, field) {
   const stores = useUserInfo();
-  const item = stores.userInfos.formDesc.find((item2) => item2.path === value);
-  if (item) return item.isRequired == 1 || item.isFromValid > 0;
+  const item = stores.userInfos.formDesc.find((item2) => item2.path === 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;
+  }
   return false;
 }
 

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.79 */
+/*! fmdeui-fmui v1.0.80 */
 (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) :
@@ -3926,22 +3926,34 @@
 	  app.directive("hdtable", {
 	    mounted(el, binding) {
 	      const stores = useUserInfo();
-	      const item = stores.userInfos.formDesc.find((item2) => item2.path === binding.value);
-	      if (item && item.isTable == 0) el.parentNode.removeChild(el);
+	      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
+	      const item = stores.userInfos.formDesc.find((item2) => item2.path === config.path);
+	      if (item && item.formDes.length > 0) {
+	        const xitem = item.formDes.find((v) => v.field === config.field);
+	        if (xitem && xitem.isTable == 0) el.parentNode.removeChild(el);
+	      }
 	    }
 	  });
 	  app.directive("hpquery", {
 	    mounted(el, binding) {
 	      const stores = useUserInfo();
-	      const item = stores.userInfos.formDesc.find((item2) => item2.path === binding.value);
-	      if (item && item.isQuery == 0) el.parentNode.removeChild(el);
+	      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
+	      const item = stores.userInfos.formDesc.find((item2) => item2.path === config.path);
+	      if (item && item.formDes.length > 0) {
+	        const xitem = item.formDes.find((v) => v.field === config.field);
+	        if (xitem && xitem.isQuery == 0) el.parentNode.removeChild(el);
+	      }
 	    }
 	  });
 	  app.directive("hpaddupdate", {
 	    mounted(el, binding) {
 	      const stores = useUserInfo();
-	      const item = stores.userInfos.formDesc.find((item2) => item2.path === binding.value);
-	      if (item && item.isAddUpdate == 0) el.parentNode.removeChild(el);
+	      const config = typeof binding.value === "string" ? { path: binding.value, field: "" } : binding.value;
+	      const item = stores.userInfos.formDesc.find((item2) => item2.path === config.path);
+	      if (item && item.formDes.length > 0) {
+	        const xitem = item.formDes.find((v) => v.field === config.field);
+	        if (xitem && xitem.isAddUpdate == 0) el.parentNode.removeChild(el);
+	      }
 	    }
 	  });
 	}
@@ -19925,14 +19937,19 @@
 	function hAuthAll(el, value) {
 	  return vue.withDirectives(el, [[vue.resolveDirective("auth-all"), value]]);
 	}
-	function fdRules(value) {
+	function fdRules(value, field) {
 	  const stores = useUserInfo();
 	  const item = stores.userInfos.formDesc.find((item2) => item2.path === value);
 	  let rels = [];
-	  if (item && item.isRequired == 1)
-	    rels.push({ required: true, message: "\u8BF7\u9009\u62E9", trigger: "blur" });
-	  if (item && item.isFromValid == 1)
-	    rels.push({ pattern: /^[1-9]\d*$/, message: "\u8BF7\u9009\u62E9\u6240\u5C5E\u64CD\u4F5C\u90E8", trigger: "blur" });
+	  if (item && item.formDes.length > 0) {
+	    const xitem = item.formDes.find((v) => v.field === field);
+	    if (xitem) {
+	      if (xitem.isRequired == 1)
+	        rels.push({ required: true, message: "\u8BF7\u9009\u62E9", trigger: "blur" });
+	      if (xitem.isFromValid == 1)
+	        rels.push({ pattern: /^[1-9]\d*$/, message: "\u8BF7\u9009\u62E9\u6240\u5C5E\u64CD\u4F5C\u90E8", trigger: "blur" });
+	    }
+	  }
 	  return rels;
 	}
 
@@ -20474,10 +20491,13 @@
 	  if (matched) return matched.limit;
 	  return null;
 	}
-	function getFrmItemProp(value) {
+	function getFrmItemProp(path, field) {
 	  const stores = useUserInfo();
-	  const item = stores.userInfos.formDesc.find((item2) => item2.path === value);
-	  if (item) return item.isRequired == 1 || item.isFromValid > 0;
+	  const item = stores.userInfos.formDesc.find((item2) => item2.path === 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;
+	  }
 	  return false;
 	}