bm-admin-ui 1.2.26-alpha → 1.2.28-alpha

package/es/components/form-create/index.js

@@ -18871,29 +18871,6 @@ const _sfc_main$7 = defineComponent({
         }
       }
     }));
-    const countText = computed(() => {
-      const cache = {};
-      props.rule.config.childRules?.forEach((rule) => {
-        if (rule.name === "numInput" && rule.config.count) {
-          cache[rule.field] = { title: rule.title.title, count: 0 };
-        }
-      });
-      data.forEach((row) => {
-        Object.keys(cache).forEach((key) => {
-          if (!isNaN(row[key]))
-            cache[key].count += row[key];
-        });
-      });
-      if (Object.keys(cache).length)
-        return `\uFF08\u5B57\u6BB5\u540D\u603B\u8BA1\uFF1A${Object.values(cache).reduce((pre, cur, index) => {
-          if (index !== 0)
-            pre += "\u3001";
-          pre += `${cur.title}\uFF1A${cur.count}`;
-          return pre;
-        }, "")}\uFF09`;
-      else
-        return "";
-    });
     const xGrid = computed(() => bmFloatTableRef.value.xGrid || {});
     const inputRef = ref();
     const childRulesMap = computed(
@@ -18922,6 +18899,44 @@ const _sfc_main$7 = defineComponent({
         "activityApply"
       ].includes(tableConfig.value.template)
     );
+    const countText = computed(() => {
+      let cache = {};
+      props.rule.config.childRules?.forEach((rule) => {
+        if (rule.name === "numInput" && rule.config.count) {
+          cache[rule.field] = { title: rule.title.title, count: 0 };
+        }
+      });
+      data.forEach((row) => {
+        Object.keys(cache).forEach((key) => {
+          if (!isNaN(row[key]))
+            cache[key].count += row[key];
+        });
+      });
+      if (props.rule.config.showTotal) {
+        cache = {
+          _total: { title: "\u884C\u6570", count: data?.length || 0 },
+          ...cache
+        };
+      }
+      if (Object.keys(cache).length) {
+        if (isProductCenter.value) {
+          return `\uFF08${Object.values(cache).reduce((pre, cur, index) => {
+            if (index !== 0)
+              pre += "\u3001";
+            pre += `${cur.title}\u603B\u8BA1\uFF1A${cur.count}`;
+            return pre;
+          }, "")}\uFF09`;
+        }
+        return `\uFF08\u5B57\u6BB5\u540D\u603B\u8BA1\uFF1A${Object.values(cache).reduce((pre, cur, index) => {
+          if (index !== 0)
+            pre += "\u3001";
+          pre += `${cur.title}\uFF1A${cur.count}`;
+          return pre;
+        }, "")}\uFF09`;
+      } else {
+        return "";
+      }
+    });
     function isShow(key) {
       return props.rule.config.tableAdvancedFeatures.includes(key);
     }
@@ -19125,6 +19140,9 @@ const _sfc_main$7 = defineComponent({
     }
     async function handleBatchDelete() {
       const selected = xGrid.value.getCheckboxRecords();
+      if (!selected?.length) {
+        return;
+      }
       if (isProductCenter.value) {
         if (await utils.confirmModal(`\u786E\u5B9A\u8981\u5220\u9664\u6240\u9009\u7684${selected?.length}\u6761\u6570\u636E\u4E48\uFF1F`)) {
           selected.forEach((item) => {
@@ -20832,11 +20850,20 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       }
       return false;
     });
+    function isProductCenterSuit(rule) {
+      return [
+        "F2CTemplate",
+        "B2CTemplate",
+        "DistributeTemp",
+        "FreshTemplate",
+        "activityApply"
+      ].includes(rule.name);
+    }
     function isAssociatedFn(rule) {
-      if (rule?.config?.dataFiltering === field.value) {
+      if (rule?.config?.dataFiltering === field.value && !isProductCenterSuit(rule)) {
         return true;
       }
-      if (rule?.config?.childRules?.length) {
+      if (rule?.config?.childRules?.length && !isProductCenterSuit(rule)) {
         for (const cRule of rule.config.childRules) {
           if (isAssociatedFn(cRule))
             return true;

package/lib/components/form-create/index.js

@@ -18885,29 +18885,6 @@ const _sfc_main$7 = vue.defineComponent({
         }
       }
     }));
-    const countText = vue.computed(() => {
-      const cache = {};
-      props.rule.config.childRules?.forEach((rule) => {
-        if (rule.name === "numInput" && rule.config.count) {
-          cache[rule.field] = { title: rule.title.title, count: 0 };
-        }
-      });
-      data.forEach((row) => {
-        Object.keys(cache).forEach((key) => {
-          if (!isNaN(row[key]))
-            cache[key].count += row[key];
-        });
-      });
-      if (Object.keys(cache).length)
-        return `\uFF08\u5B57\u6BB5\u540D\u603B\u8BA1\uFF1A${Object.values(cache).reduce((pre, cur, index) => {
-          if (index !== 0)
-            pre += "\u3001";
-          pre += `${cur.title}\uFF1A${cur.count}`;
-          return pre;
-        }, "")}\uFF09`;
-      else
-        return "";
-    });
     const xGrid = vue.computed(() => bmFloatTableRef.value.xGrid || {});
     const inputRef = vue.ref();
     const childRulesMap = vue.computed(
@@ -18936,6 +18913,44 @@ const _sfc_main$7 = vue.defineComponent({
         "activityApply"
       ].includes(tableConfig.value.template)
     );
+    const countText = vue.computed(() => {
+      let cache = {};
+      props.rule.config.childRules?.forEach((rule) => {
+        if (rule.name === "numInput" && rule.config.count) {
+          cache[rule.field] = { title: rule.title.title, count: 0 };
+        }
+      });
+      data.forEach((row) => {
+        Object.keys(cache).forEach((key) => {
+          if (!isNaN(row[key]))
+            cache[key].count += row[key];
+        });
+      });
+      if (props.rule.config.showTotal) {
+        cache = {
+          _total: { title: "\u884C\u6570", count: data?.length || 0 },
+          ...cache
+        };
+      }
+      if (Object.keys(cache).length) {
+        if (isProductCenter.value) {
+          return `\uFF08${Object.values(cache).reduce((pre, cur, index) => {
+            if (index !== 0)
+              pre += "\u3001";
+            pre += `${cur.title}\u603B\u8BA1\uFF1A${cur.count}`;
+            return pre;
+          }, "")}\uFF09`;
+        }
+        return `\uFF08\u5B57\u6BB5\u540D\u603B\u8BA1\uFF1A${Object.values(cache).reduce((pre, cur, index) => {
+          if (index !== 0)
+            pre += "\u3001";
+          pre += `${cur.title}\uFF1A${cur.count}`;
+          return pre;
+        }, "")}\uFF09`;
+      } else {
+        return "";
+      }
+    });
     function isShow(key) {
       return props.rule.config.tableAdvancedFeatures.includes(key);
     }
@@ -19139,6 +19154,9 @@ const _sfc_main$7 = vue.defineComponent({
     }
     async function handleBatchDelete() {
       const selected = xGrid.value.getCheckboxRecords();
+      if (!selected?.length) {
+        return;
+      }
       if (isProductCenter.value) {
         if (await utils__default["default"].confirmModal(`\u786E\u5B9A\u8981\u5220\u9664\u6240\u9009\u7684${selected?.length}\u6761\u6570\u636E\u4E48\uFF1F`)) {
           selected.forEach((item) => {
@@ -20846,11 +20864,20 @@ const _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({
       }
       return false;
     });
+    function isProductCenterSuit(rule) {
+      return [
+        "F2CTemplate",
+        "B2CTemplate",
+        "DistributeTemp",
+        "FreshTemplate",
+        "activityApply"
+      ].includes(rule.name);
+    }
     function isAssociatedFn(rule) {
-      if (rule?.config?.dataFiltering === field.value) {
+      if (rule?.config?.dataFiltering === field.value && !isProductCenterSuit(rule)) {
         return true;
       }
-      if (rule?.config?.childRules?.length) {
+      if (rule?.config?.childRules?.length && !isProductCenterSuit(rule)) {
         for (const cRule of rule.config.childRules) {
           if (isAssociatedFn(cRule))
             return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bm-admin-ui",
-  "version": "1.2.26-alpha",
+  "version": "1.2.28-alpha",
   "private": false,
   "description": "An Admin Component Library for Bm",
   "license": "UNLICENSED",