hy-dispatch-ui-v3 0.2.42 → 0.2.44

package/dist/tailwind.css

@@ -556,8 +556,8 @@
   height: 54px;
 }
 
-.h-\[97vh\] {
-  height: 97vh;
+.h-\[96vh\] {
+  height: 96vh;
 }
 
 .h-full {

package/es/components/hyDialog/dialog.vue.mjs

@@ -19,9 +19,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "default"
       // default-默认类型 right-右侧弹窗
     },
-    dialogClass: {
+    // body-Content-Class
+    bodyContentClass: {
       type: String,
-      default: "default"
+      default: ""
     },
     top: String,
     // 是否可缩小化
@@ -77,6 +78,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const dialogTypeRight = computed(() => {
       return props.dialogType === "right";
     });
+    const bodyContentClass = computed(() => {
+      return `${props.bodyContentClass || null} ${dialogTypeRight.value ? "flex-grow h-0" : ""}`;
+    });
     const ifDraggable = computed(() => {
       if (props.ifShrink) {
         return true;
@@ -197,7 +201,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "onUpdate:modelValue": ($event) => visible.value = $event,
             width: props.width,
             top: dialogTypeRight.value ? "16px" : props.top || null,
-            class: dialogTypeRight.value ? "h-[97vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
+            class: dialogTypeRight.value ? "h-[96vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
             "body-class": dialogTypeRight.value ? "flex-grow h-0" : null
           }, _ctx.$attrs), {
             header: withCtx(() => [
@@ -241,9 +245,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   createElementVNode(
                     "div",
                     {
-                      class: normalizeClass([{
-                        "flex-grow h-0": dialogTypeRight.value
-                      }, "scroll-body overflow-auto px-6 py-4"])
+                      class: normalizeClass([bodyContentClass.value, "scroll-body overflow-auto px-6 py-4"])
                     },
                     [
                       renderSlot(_ctx.$slots, "default")

package/es/components/hyOrgCascader/orgCascader.vue.mjs

@@ -113,11 +113,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         });
       };
       handler(data);
+      cascaderOptions.value = data;
+      cascaderValueMap.value = cascaderMap;
       if (modelValue.value) {
         setDefaultValue(modelValue.value);
       }
-      cascaderOptions.value = data;
-      cascaderValueMap.value = cascaderMap;
     }
     function setDefaultValue(val) {
       const item = cascaderValueMap.value.get(val);

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

@@ -33,9 +33,8 @@ const genPlaceholderHandler = (config) => {
   return { placeholder, startPlaceholder, endPlaceholder };
 };
 const genColumnWidth = (config) => {
-  let { width, type, attrs } = config || {};
-  let inputWidth;
-  if (!width) {
+  let { width, inputWidth, type, attrs } = config || {};
+  if (!width && !inputWidth) {
     if (type === "date-picker") {
       switch (attrs?.type) {
         case "datetimerange":
@@ -154,10 +153,10 @@ const useAppSearch = (config = [], model) => {
     const target = appSearchItemHandler(item);
     columns.push(target);
   }
-  const formModel = resetAppSearchValue(columns, model);
+  const filterModel = resetAppSearchValue(columns, model);
   return {
-    formModel: toRef(formModel),
-    formColumns: toRef(columns)
+    filterModel: toRef(filterModel),
+    filterColumns: toRef(columns)
   };
 };
 

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

@@ -174,7 +174,8 @@ const useAppTableWrapper = (hy) => {
         searchLabelSet.add(item.label);
       });
     }
-    return Array.from(searchLabelSet.values());
+    const content = Array.from(searchLabelSet.values());
+    return content ? content.join("\u3001") : "";
   });
   function getRowKey(row = {}) {
     if (isString(props.rowKey)) return row[props.rowKey];

package/es/components/hyTable/js/search.mjs

@@ -60,9 +60,14 @@ function useAppTableSearch(hy) {
       emits("reqSuccess", tableDataSource.value);
     }
   }
-  async function resetFn() {
+  async function resetFields() {
     await nextTick();
-    appSearchRef.value.resetFields();
+    if (appSearchRef.value) {
+      appSearchRef.value.resetFields();
+    }
+  }
+  async function resetFn() {
+    await resetFields();
     props.filterModel.query = null;
     getData(1);
   }
@@ -104,6 +109,7 @@ function useAppTableSearch(hy) {
     showFilter,
     getData,
     setData,
+    resetFields,
     resetFn,
     switchShowFilter,
     getTotalElements,

package/es/components/hyTable/js/useAppTable.mjs

@@ -142,8 +142,8 @@ const useAppTable = (config = {}) => {
   });
   return {
     tableColumns: toRef(tableColumns),
-    filterModel: appSearchForm.formModel,
-    filterColumns: appSearchForm.formColumns
+    filterModel: appSearchForm.filterModel,
+    filterColumns: appSearchForm.filterColumns
   };
 };
 

package/es/components/hyTable/table.vue.mjs

@@ -231,6 +231,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       showFilter,
       getData,
       setData,
+      resetFields,
       resetFn,
       switchShowFilter,
       getTotalElements,
@@ -256,6 +257,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     __expose({
       getData,
       setData,
+      resetFields,
       resetFn,
       getSelectedList,
       getTotalElements,

package/es/components/hyTableActionButton/tableActionButton.vue.mjs

@@ -75,7 +75,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return props.label;
     });
     function buttonChange(item) {
-      emits("change", item.value);
+      if (item) {
+        emits("change", item.value);
+      }
     }
     function getDataList(dataList2 = []) {
       const arr = [];

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

@@ -224,6 +224,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         });
         initValidateHandler(dataSource.value);
         setData(dataSource.value);
+        emits("validate", {
+          ...statistics.value
+        });
       },
       deleteData(data) {
         if (!isArray(data)) {

package/es/static/hy-svg-icons/hy-icon-ops-list-dell.js

@@ -0,0 +1,14 @@
+export default {
+  id: 'hy-icon-ops-list-dell',
+  defs: `<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="hy-icon-ops-list-dell-linearGradient-1">
+            <stop stop-color="#87A4AF" offset="0%"></stop>
+            <stop stop-color="#51696F" offset="100%"></stop>
+        </linearGradient>`,
+  symbol: `<symbol id="hy-icon-ops-list-dell" viewBox="0 0 16 16">
+    <g id="hy-icon-ops-list-dell-角色管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="hy-icon-ops-list-dell-角色管理-编辑角色" transform="translate(-1787, -888)" fill="url(#hy-icon-ops-list-dell-linearGradient-1)" fill-rule="nonzero">
+            <path d="M1800.65685,890.343148 C1797.53265,887.218951 1792.46734,887.218951 1789.34314,890.343148 C1786.21895,893.467328 1786.21895,898.532654 1789.34314,901.656852 C1792.46732,904.781049 1797.53265,904.781049 1800.65683,901.656852 C1803.78105,898.532654 1803.78105,893.467346 1800.65685,890.343148 Z M1797.35502,900.096411 L1794.99751,897.738909 L1792.64001,900.096411 L1790.90356,898.359984 L1793.26107,896.002483 L1790.90356,893.644981 L1792.64003,891.908537 L1794.99753,894.266038 L1797.35502,891.908537 L1799.09146,893.644981 L1796.73396,896.002465 L1799.09146,898.359966 L1797.35502,900.096411 Z" id="hy-icon-ops-list-dell-dell"></path>
+        </g>
+    </g>
+</symbol>`,
+};

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.41";
+const version = "0.2.43";
 
 export { version };

package/lib/components/hyDialog/dialog.vue.js

@@ -23,9 +23,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "default"
       // default-默认类型 right-右侧弹窗
     },
-    dialogClass: {
+    // body-Content-Class
+    bodyContentClass: {
       type: String,
-      default: "default"
+      default: ""
     },
     top: String,
     // 是否可缩小化
@@ -81,6 +82,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const dialogTypeRight = vue.computed(() => {
       return props.dialogType === "right";
     });
+    const bodyContentClass = vue.computed(() => {
+      return `${props.bodyContentClass || null} ${dialogTypeRight.value ? "flex-grow h-0" : ""}`;
+    });
     const ifDraggable = vue.computed(() => {
       if (props.ifShrink) {
         return true;
@@ -201,7 +205,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "onUpdate:modelValue": ($event) => visible.value = $event,
             width: props.width,
             top: dialogTypeRight.value ? "16px" : props.top || null,
-            class: dialogTypeRight.value ? "h-[97vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
+            class: dialogTypeRight.value ? "h-[96vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
             "body-class": dialogTypeRight.value ? "flex-grow h-0" : null
           }, _ctx.$attrs), {
             header: vue.withCtx(() => [
@@ -245,9 +249,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   vue.createElementVNode(
                     "div",
                     {
-                      class: vue.normalizeClass([{
-                        "flex-grow h-0": dialogTypeRight.value
-                      }, "scroll-body overflow-auto px-6 py-4"])
+                      class: vue.normalizeClass([bodyContentClass.value, "scroll-body overflow-auto px-6 py-4"])
                     },
                     [
                       vue.renderSlot(_ctx.$slots, "default")

package/lib/components/hyOrgCascader/orgCascader.vue.js

@@ -117,11 +117,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         });
       };
       handler(data);
+      cascaderOptions.value = data;
+      cascaderValueMap.value = cascaderMap;
       if (modelValue.value) {
         setDefaultValue(modelValue.value);
       }
-      cascaderOptions.value = data;
-      cascaderValueMap.value = cascaderMap;
     }
     function setDefaultValue(val) {
       const item = cascaderValueMap.value.get(val);

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

@@ -35,9 +35,8 @@ const genPlaceholderHandler = (config) => {
   return { placeholder, startPlaceholder, endPlaceholder };
 };
 const genColumnWidth = (config) => {
-  let { width, type, attrs } = config || {};
-  let inputWidth;
-  if (!width) {
+  let { width, inputWidth, type, attrs } = config || {};
+  if (!width && !inputWidth) {
     if (type === "date-picker") {
       switch (attrs?.type) {
         case "datetimerange":
@@ -156,10 +155,10 @@ const useAppSearch = (config = [], model) => {
     const target = appSearchItemHandler(item);
     columns.push(target);
   }
-  const formModel = resetAppSearchValue(columns, model);
+  const filterModel = resetAppSearchValue(columns, model);
   return {
-    formModel: vue.toRef(formModel),
-    formColumns: vue.toRef(columns)
+    filterModel: vue.toRef(filterModel),
+    filterColumns: vue.toRef(columns)
   };
 };
 

package/lib/components/hyTable/js/index.js

@@ -176,7 +176,8 @@ const useAppTableWrapper = (hy) => {
         searchLabelSet.add(item.label);
       });
     }
-    return Array.from(searchLabelSet.values());
+    const content = Array.from(searchLabelSet.values());
+    return content ? content.join("\u3001") : "";
   });
   function getRowKey(row = {}) {
     if (is.isString(props.rowKey)) return row[props.rowKey];

package/lib/components/hyTable/js/search.js

@@ -62,9 +62,14 @@ function useAppTableSearch(hy) {
       emits("reqSuccess", tableDataSource.value);
     }
   }
-  async function resetFn() {
+  async function resetFields() {
     await vue.nextTick();
-    appSearchRef.value.resetFields();
+    if (appSearchRef.value) {
+      appSearchRef.value.resetFields();
+    }
+  }
+  async function resetFn() {
+    await resetFields();
     props.filterModel.query = null;
     getData(1);
   }
@@ -106,6 +111,7 @@ function useAppTableSearch(hy) {
     showFilter,
     getData,
     setData,
+    resetFields,
     resetFn,
     switchShowFilter,
     getTotalElements,

package/lib/components/hyTable/js/useAppTable.js

@@ -144,8 +144,8 @@ const useAppTable = (config = {}) => {
   });
   return {
     tableColumns: vue.toRef(tableColumns),
-    filterModel: appSearchForm.formModel,
-    filterColumns: appSearchForm.formColumns
+    filterModel: appSearchForm.filterModel,
+    filterColumns: appSearchForm.filterColumns
   };
 };
 

package/lib/components/hyTable/table.vue.js

@@ -235,6 +235,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       showFilter,
       getData,
       setData,
+      resetFields,
       resetFn,
       switchShowFilter,
       getTotalElements,
@@ -260,6 +261,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     __expose({
       getData,
       setData,
+      resetFields,
       resetFn,
       getSelectedList,
       getTotalElements,

package/lib/components/hyTableActionButton/tableActionButton.vue.js

@@ -79,7 +79,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return props.label;
     });
     function buttonChange(item) {
-      emits("change", item.value);
+      if (item) {
+        emits("change", item.value);
+      }
     }
     function getDataList(dataList2 = []) {
       const arr = [];

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

@@ -228,6 +228,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         });
         initValidateHandler(dataSource.value);
         setData(dataSource.value);
+        emits("validate", {
+          ...statistics.value
+        });
       },
       deleteData(data) {
         if (!is.isArray(data)) {

package/lib/static/hy-svg-icons/hy-icon-ops-list-dell.js

@@ -0,0 +1,14 @@
+export default {
+  id: 'hy-icon-ops-list-dell',
+  defs: `<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="hy-icon-ops-list-dell-linearGradient-1">
+            <stop stop-color="#87A4AF" offset="0%"></stop>
+            <stop stop-color="#51696F" offset="100%"></stop>
+        </linearGradient>`,
+  symbol: `<symbol id="hy-icon-ops-list-dell" viewBox="0 0 16 16">
+    <g id="hy-icon-ops-list-dell-角色管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="hy-icon-ops-list-dell-角色管理-编辑角色" transform="translate(-1787, -888)" fill="url(#hy-icon-ops-list-dell-linearGradient-1)" fill-rule="nonzero">
+            <path d="M1800.65685,890.343148 C1797.53265,887.218951 1792.46734,887.218951 1789.34314,890.343148 C1786.21895,893.467328 1786.21895,898.532654 1789.34314,901.656852 C1792.46732,904.781049 1797.53265,904.781049 1800.65683,901.656852 C1803.78105,898.532654 1803.78105,893.467346 1800.65685,890.343148 Z M1797.35502,900.096411 L1794.99751,897.738909 L1792.64001,900.096411 L1790.90356,898.359984 L1793.26107,896.002483 L1790.90356,893.644981 L1792.64003,891.908537 L1794.99753,894.266038 L1797.35502,891.908537 L1799.09146,893.644981 L1796.73396,896.002465 L1799.09146,898.359966 L1797.35502,900.096411 Z" id="hy-icon-ops-list-dell-dell"></path>
+        </g>
+    </g>
+</symbol>`,
+};

package/lib/version.js

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

package/package.json

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