@ditari/bsui 1.0.22 → 1.0.24

package/dist/cjs/components/select/Select.vue.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),_=require("../../store/modules/DataDictionary.cjs.js"),b=require("./dic.worker.cjs.js"),D={name:"DSelect"},y=e.defineComponent({...D,props:{value:{default:null},name:{default:""},disabled:{type:Boolean,default:!1},placeholder:{default:"请填写默认占位符啊！老铁"},include:{default:[]}},emits:["update:value","change"],setup(u,{emit:r}){const o=u,{getDicByKey:p,list:S}=_.useDataDicStore(),{modelValue:c,data:h,onSearch:v,onSelect:g,onChange:m}=C();function C(){let s=!0,n=[];const t=e.ref(n),l=e.ref(o.value),d=new b.default;d.onerror=()=>{s=!1,n=p(o.name)},d.onmessage=a=>{t.value=[...a.data]},i(l.value);const w=a=>{s?i(a):t.value=n.filter(f=>f.value.toLowerCase().indexOf(a.toLowerCase())!==-1||f.label.toLowerCase().includes(a.toLowerCase())).splice(0,10)};function i(a){d.postMessage({list:JSON.stringify(S[o.name]),keywords:a,include:JSON.stringify(o.include??[])})}return{data:t,modelValue:l,onSearch:w,onSelect:a=>{r("update:value",a)},onChange:()=>{r("update:value",l.value),r("change",l.value)}}}return(s,n)=>{const t=e.resolveComponent("a-select");return e.openBlock(),e.createBlock(t,{value:e.unref(c),"onUpdate:value":n[0]||(n[0]=l=>e.isRef(c)?c.value=l:null),"allow-clear":"","show-search":"","filter-option":!1,options:e.unref(h),placeholder:u.placeholder,disabled:u.disabled,onSelect:e.unref(g),onSearch:e.unref(v),onChange:e.unref(m)},null,8,["value","options","placeholder","disabled","onSelect","onSearch","onChange"])}}});exports.default=y;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),_=require("../../store/modules/DataDictionary.cjs.js"),b=require("./dic.worker.cjs.js"),D={name:"DSelect"},y=e.defineComponent({...D,props:{value:{default:null},name:{default:""},disabled:{type:Boolean,default:!1},placeholder:{default:"请填写默认占位符啊！老铁"},include:{default:[]}},emits:["update:value","change"],setup(u,{emit:c}){const n=u,{getDicByKey:v,list:h}=_.useDataDicStore(),{modelValue:r,data:p,onSearch:S,onSelect:g,onChange:m}=C();function C(){let s=!0,t=[];const o=e.ref(t),l=e.ref(n.value),d=new b.default;d.onerror=()=>{s=!1,t=v(n.name)},d.onmessage=a=>{o.value=[...a.data]},e.watch(()=>n.include,()=>{i(l.value)}),e.watch(()=>n.value,a=>{l.value=a}),i(l.value);const w=a=>{s?i(a):o.value=t.filter(f=>f.value.toLowerCase().indexOf(a.toLowerCase())!==-1||f.label.toLowerCase().includes(a.toLowerCase())).splice(0,10)};function i(a){d.postMessage({list:JSON.stringify(h[n.name]),keywords:a,include:JSON.stringify(n.include??[])})}return{data:o,modelValue:l,onSearch:w,onSelect:a=>{c("update:value",a)},onChange:()=>{c("update:value",l.value),c("change",l.value)}}}return(s,t)=>{const o=e.resolveComponent("a-select");return e.openBlock(),e.createBlock(o,{value:e.unref(r),"onUpdate:value":t[0]||(t[0]=l=>e.isRef(r)?r.value=l:null),"allow-clear":"","show-search":"","filter-option":!1,options:e.unref(p),placeholder:u.placeholder,disabled:u.disabled,onSelect:e.unref(g),onSearch:e.unref(S),onChange:e.unref(m)},null,8,["value","options","placeholder","disabled","onSelect","onSearch","onChange"])}}});exports.default=y;

package/dist/cjs/components/table/Table.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("vue"),S=require("ant-design-vue"),N=require("../../utils/html.cjs.js"),$=require("../theme/index.cjs.js"),A=()=>({data:{type:Object,required:!0},height:{type:Number,default:300},keys:Array,rowKey:{type:String,default:"id"},loading:{type:Boolean,default:!1},pagination:{type:Object,default:()=>({})},config:{type:Object,default:()=>({})}}),y={defaultPageSize:20,hideOnSinglePage:!1,pageSizeOptions:["10","20","30","40"],responsive:!0,showQuickJumper:!0,showLessItems:!0,showTotal:a=>`总共 ${a} 条`},T=`${$.prefixName}-pagination`,J=n.defineComponent({name:"DTable",props:A(),emits:["update:keys"],setup:function(a,{emit:b,slots:p}){const e=n.ref(a.keys),P=n.computed(()=>a.data),R=n.computed(()=>{var t;return((t=a.config)==null?void 0:t.columns)??[]}),f=n.computed(()=>{var t;return((t=a.config)==null?void 0:t.pagination)??{}}),{tableRef:z,tableRootRef:x,tableHeight:E,onPageChange:O,onRowClassName:H}=q();function q(){const{rowClassName:t,keepSelected:l,selection:h,onPageChange:c}=a.config,r=n.ref(),o=n.ref(null),u=n.ref(),i=n.ref(null),g=v=>{var d,C;try{const m=(d=o==null?void 0:o.value)==null?void 0:d.$el,V=N.useEleHeight(m.getElementsByClassName("ant-table-header")[0]);let k=0;if(a.config.pagination){const _=(C=r.value)==null?void 0:C.getElementsByClassName(T)[0];k=N.useEleHeight(_)??0}u.value=v-(V+k),m.getElementsByClassName("ant-table-body")[0].style.height=u.value-10+"px",i.value=m.getElementsByClassName("ant-table-body")[0]}catch(m){console.warn(m)}};return n.watchEffect(()=>{a.height!==0&&n.nextTick(()=>{g(a.height)})}),{tableRef:o,tableRootRef:r,tableHeight:u,onPageChange:(v,d)=>{c&&c({page:v,size:d}),i.value.scrollTop=0,(h==="S"||!l)&&(e.value=[],b("update:keys",e.value))},onRowClassName:(v,d)=>t?t(v,d):void 0}}const B=j();function j(){const{rowKey:t,config:{selection:l,getCheckboxProps:h}}=a;if(l==="N")return;const c=(o,u)=>{l==="S"?(e.value=[],e.value=u?[o[t]]:[]):e.value=u?e.value.concat(o[t]):e.value.filter(i=>i!==o[t]),b("update:keys",e.value)},r=(o,u,i)=>{const g=i.map(s=>s[t]);e.value=o?e.value.concat(g):e.value.filter(s=>!g.includes(s)),b("update:keys",e.value)};return n.watch(()=>a.keys,o=>{e.value=o}),{selectedRowKeys:e,onSelect:c,onSelectAll:r,fixed:!0,columnTitle:l==="S"?"选择":null,columnWidth:l==="S"?60:40,getCheckboxProps:h}}const D=K();function K(){return t=>{let l;const{rowKey:h,config:{click:c,dbClick:r,selection:o,getCheckboxProps:u}}=a,i=t[h],g=()=>{if(o==="N")return;e.value.some(w=>w===i)?e.value=e.value.filter(w=>w!==i):(o==="S"&&(e.value=[]),e.value.push(i)),b("update:keys",e.value)};return{onClick:()=>{const s=u?u(t):null;s&&s.value===i||(clearTimeout(l),l=setTimeout(()=>{g(),c&&c(t)},200))},onDblclick:()=>{clearTimeout(l),r&&r(t)}}}}return()=>{var t;return n.createVNode("div",{ref:x},[n.createVNode(S.Table,{ref:z,"row-key":a.rowKey,bordered:a.config.bordered,columns:R.value,dataSource:P.value,loading:a.loading,size:((t=a.config)==null?void 0:t.size)??"small",scroll:{scrollToFirstRowOnChange:!0,x:"100%",y:E.value+"px"},pagination:!1,customRow:D,rowSelection:B,rowClassName:H},{bodyCell:({column:l})=>{if(l.slot==="action")return n.createVNode(S.Space,null,{default:()=>[p.action&&p.action()]})}}),n.withDirectives(n.createVNode(S.Pagination,{class:[T],current:f.value.current,"onUpdate:current":l=>f.value.current=l,pageSize:f.value.pageSize,"onUpdate:pageSize":l=>f.value.pageSize=l,disabled:a.loading,"show-size-changer":!0,size:"default","hide-on-single-page":y.hideOnSinglePage,"show-quick-jumper":y.showQuickJumper,"default-page-size":y.defaultPageSize,"page-size-options":y.pageSizeOptions,"show-total":y.showTotal,total:f.value.total,onChange:O},null),[[n.vShow,a.config.pagination]])])}}});exports.default=J;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("vue"),S=require("ant-design-vue"),N=require("../../utils/html.cjs.js"),$=require("../theme/index.cjs.js"),A=()=>({data:{type:Object,required:!0},height:{type:Number,default:300},keys:Array,rowKey:{type:String,default:"id"},loading:{type:Boolean,default:!1},pagination:{type:Object,default:()=>({})},config:{type:Object,default:()=>({})}}),y={defaultPageSize:20,hideOnSinglePage:!1,pageSizeOptions:["10","20","30","40"],responsive:!0,showQuickJumper:!0,showLessItems:!0,showTotal:a=>`总共 ${a} 条`},T=`${$.prefixName}-pagination`,J=n.defineComponent({name:"DTable",props:A(),emits:["update:keys"],setup:function(a,{emit:b,slots:p}){const e=n.ref(a.keys||[]),P=n.computed(()=>a.data),R=n.computed(()=>{var t;return((t=a.config)==null?void 0:t.columns)??[]}),f=n.computed(()=>{var t;return((t=a.config)==null?void 0:t.pagination)??{}}),{tableRef:z,tableRootRef:x,tableHeight:E,onPageChange:O,onRowClassName:H}=q();function q(){const{rowClassName:t,keepSelected:l,selection:h,onPageChange:c}=a.config,r=n.ref(),o=n.ref(null),u=n.ref(),i=n.ref(null),g=v=>{var d,C;try{const m=(d=o==null?void 0:o.value)==null?void 0:d.$el,V=N.useEleHeight(m.getElementsByClassName("ant-table-header")[0]);let k=0;if(a.config.pagination){const _=(C=r.value)==null?void 0:C.getElementsByClassName(T)[0];k=N.useEleHeight(_)??0}u.value=v-(V+k),m.getElementsByClassName("ant-table-body")[0].style.height=u.value-10+"px",i.value=m.getElementsByClassName("ant-table-body")[0]}catch(m){console.warn(m)}};return n.watchEffect(()=>{a.height!==0&&n.nextTick(()=>{g(a.height)})}),{tableRef:o,tableRootRef:r,tableHeight:u,onPageChange:(v,d)=>{c&&c({page:v,size:d}),i.value.scrollTop=0,(h==="S"||!l)&&(e.value=[],b("update:keys",e.value))},onRowClassName:(v,d)=>t?t(v,d):void 0}}const B=j();function j(){const{rowKey:t,config:{selection:l,getCheckboxProps:h}}=a;if(l==="N")return;const c=(o,u)=>{l==="S"?(e.value=[],e.value=u?[o[t]]:[]):e.value=u?e.value.concat(o[t]):e.value.filter(i=>i!==o[t]),b("update:keys",e.value)},r=(o,u,i)=>{const g=i.map(s=>s[t]);e.value=o?e.value.concat(g):e.value.filter(s=>!g.includes(s)),b("update:keys",e.value)};return n.watch(()=>a.keys,o=>{e.value=o}),{selectedRowKeys:e,onSelect:c,onSelectAll:r,fixed:!0,columnTitle:l==="S"?"选择":null,columnWidth:l==="S"?60:40,getCheckboxProps:h}}const D=K();function K(){return t=>{let l;const{rowKey:h,config:{click:c,dbClick:r,selection:o,getCheckboxProps:u}}=a,i=t[h],g=()=>{if(o==="N")return;e.value.some(w=>w===i)?e.value=e.value.filter(w=>w!==i):(o==="S"&&(e.value=[]),e.value.push(i)),b("update:keys",e.value)};return{onClick:()=>{const s=u?u(t):null;s&&s.value===i||(clearTimeout(l),l=setTimeout(()=>{g(),c&&c(t)},200))},onDblclick:()=>{clearTimeout(l),r&&r(t)}}}}return()=>{var t;return n.createVNode("div",{ref:x},[n.createVNode(S.Table,{ref:z,"row-key":a.rowKey,bordered:a.config.bordered,columns:R.value,dataSource:P.value,loading:a.loading,size:((t=a.config)==null?void 0:t.size)??"small",scroll:{scrollToFirstRowOnChange:!0,x:"100%",y:E.value+"px"},pagination:!1,customRow:D,rowSelection:B,rowClassName:H},{bodyCell:({column:l})=>{if(l.slot==="action")return n.createVNode(S.Space,null,{default:()=>[p.action&&p.action()]})}}),n.withDirectives(n.createVNode(S.Pagination,{class:[T],current:f.value.current,"onUpdate:current":l=>f.value.current=l,pageSize:f.value.pageSize,"onUpdate:pageSize":l=>f.value.pageSize=l,disabled:a.loading,"show-size-changer":!0,size:"default","hide-on-single-page":y.hideOnSinglePage,"show-quick-jumper":y.showQuickJumper,"default-page-size":y.defaultPageSize,"page-size-options":y.pageSizeOptions,"show-total":y.showTotal,total:f.value.total,onChange:O},null),[[n.vShow,a.config.pagination]])])}}});exports.default=J;

package/dist/cjs/directive/trim.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const o={mounted(u,e){u.addEventListener("input",()=>{var t,l;const a=u.value.trim().replace(/\s+/g,"");u.value=a,e.value=a,(l=(t=e==null?void 0:e.instance)==null?void 0:t.$emit)==null||l.call(t,"update:modelValue",a)})}};exports.default=o;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const o={mounted(u,e){u.addEventListener("input",()=>{var t,l;const a=u.value.trim().replace(/\s+/g,"");u.value=a,e.value=a,(l=(t=e==null?void 0:e.instance)==null?void 0:t.$emit)==null||l.call(t,"onUpdate:modelValue",a)})}};exports.default=o;

package/dist/esm/components/select/Select.vue.esm.js

@@ -1,10 +1,10 @@
-import { defineComponent as D, ref as p, resolveComponent as _, openBlock as k, createBlock as B, unref as n, isRef as L } from "vue";
-import { useDataDicStore as x } from "../../store/modules/DataDictionary.esm.js";
-import y from "./dic.worker.esm.js";
-const O = {
+import { defineComponent as _, ref as p, watch as h, resolveComponent as k, openBlock as B, createBlock as L, unref as t, isRef as x } from "vue";
+import { useDataDicStore as y } from "../../store/modules/DataDictionary.esm.js";
+import O from "./dic.worker.esm.js";
+const V = {
   name: "DSelect"
-}, M = /* @__PURE__ */ D({
-  ...O,
+}, R = /* @__PURE__ */ _({
+  ...V,
   props: {
     value: { default: null },
     name: { default: "" },
@@ -13,56 +13,66 @@ const O = {
     include: { default: [] }
   },
   emits: ["update:value", "change"],
-  setup(r, { emit: c }) {
-    const t = r, { getDicByKey: h, list: S } = x(), { modelValue: s, data: m, onSearch: v, onSelect: g, onChange: C } = w();
-    function w() {
-      let u = !0, a = [];
-      const l = p(a), o = p(t.value), d = new y();
+  setup(c, { emit: r }) {
+    const l = c, { getDicByKey: v, list: S } = y(), { modelValue: u, data: m, onSearch: g, onSelect: C, onChange: w } = b();
+    function b() {
+      let s = !0, o = [];
+      const n = p(o), a = p(l.value), d = new O();
       d.onerror = () => {
-        u = !1, a = h(t.name);
+        s = !1, o = v(l.name);
       }, d.onmessage = (e) => {
-        l.value = [...e.data];
-      }, i(o.value);
-      const b = (e) => {
-        u ? i(e) : l.value = a.filter((f) => f.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || f.label.toLowerCase().includes(e.toLowerCase())).splice(0, 10);
+        n.value = [...e.data];
+      }, h(
+        () => l.include,
+        () => {
+          i(a.value);
+        }
+      ), h(
+        () => l.value,
+        (e) => {
+          a.value = e;
+        }
+      ), i(a.value);
+      const D = (e) => {
+        s ? i(e) : n.value = o.filter((f) => f.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || f.label.toLowerCase().includes(e.toLowerCase())).splice(0, 10);
       };
       function i(e) {
         d.postMessage({
-          list: JSON.stringify(S[t.name]),
+          list: JSON.stringify(S[l.name]),
           keywords: e,
-          include: JSON.stringify(t.include ?? [])
+          include: JSON.stringify(l.include ?? [])
         });
       }
       return {
-        data: l,
-        modelValue: o,
-        onSearch: b,
+        data: n,
+        modelValue: a,
+        onSearch: D,
         onSelect: (e) => {
-          c("update:value", e);
+          r("update:value", e);
         },
         onChange: () => {
-          c("update:value", o.value), c("change", o.value);
+          r("update:value", a.value), r("change", a.value);
         }
       };
     }
-    return (u, a) => {
-      const l = _("a-select");
-      return k(), B(l, {
-        value: n(s),
-        "onUpdate:value": a[0] || (a[0] = (o) => L(s) ? s.value = o : null),
+    return (s, o) => {
+      const n = k("a-select");
+      return B(), L(n, {
+        value: t(u),
+        "onUpdate:value": o[0] || (o[0] = (a) => x(u) ? u.value = a : null),
         "allow-clear": "",
         "show-search": "",
         "filter-option": !1,
-        options: n(m),
-        placeholder: r.placeholder,
-        disabled: r.disabled,
-        onSelect: n(g),
-        onSearch: n(v),
-        onChange: n(C)
+        options: t(m),
+        placeholder: c.placeholder,
+        disabled: c.disabled,
+        onSelect: t(C),
+        onSearch: t(g),
+        onChange: t(w)
       }, null, 8, ["value", "options", "placeholder", "disabled", "onSelect", "onSearch", "onChange"]);
     };
   }
 });
 export {
-  M as default
+  R as default
 };

package/dist/esm/components/table/Table.esm.js

@@ -46,7 +46,7 @@ const M = () => ({
     emit: w,
     slots: C
   }) {
-    const e = v(a.keys), z = S(() => a.data), P = S(() => {
+    const e = v(a.keys || []), z = S(() => a.data), P = S(() => {
       var t;
       return ((t = a.config) == null ? void 0 : t.columns) ?? [];
     }), f = S(() => {

package/dist/esm/directive/trim.esm.js

@@ -1,4 +1,4 @@
-const s = {
+const o = {
   // mounted(el: HTMLInputElement) {
   //   // 监听 input 事件
   //   el.addEventListener("input", () => {
@@ -10,10 +10,10 @@ const s = {
     a.addEventListener("input", () => {
       var t, l;
       const u = a.value.trim().replace(/\s+/g, "");
-      a.value = u, e.value = u, (l = (t = e == null ? void 0 : e.instance) == null ? void 0 : t.$emit) == null || l.call(t, "update:modelValue", u);
+      a.value = u, e.value = u, (l = (t = e == null ? void 0 : e.instance) == null ? void 0 : t.$emit) == null || l.call(t, "onUpdate:modelValue", u);
     });
   }
 };
 export {
-  s as default
+  o as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditari/bsui",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "files": [
     "dist/**",
     "src"

package/src/components/select/Select.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { useDataDicStore } from "../../store/modules/DataDictionary";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
@@ -56,6 +56,22 @@ function useSelect() {
     data.value = [...e.data];
   };
 
+  // 当include变化的时候，需要重新发送搜索事件 返回对应的下拉数据
+  watch(
+    () => props.include,
+    () => {
+      sendWorkerSearch(modelValue.value);
+    }
+  );
+
+  // 监听value值的变化
+  watch(
+    () => props.value,
+    (val) => {
+      modelValue.value = val;
+    }
+  );
+
   // 首次创建的时候发送
   sendWorkerSearch(modelValue.value);
 

package/src/components/table/Table.tsx

@@ -81,7 +81,7 @@ const DXTable = defineComponent({
   emits: ["update:keys"],
   setup: function (props, { emit, slots }) {
     // 保存选中的唯一id
-    const selectedRowKeys = ref<any>(props.keys);
+    const selectedRowKeys = ref<any>(props.keys || []);
     // 数据源
     const dataSource = computed(() => props.data);
     // 表格列

package/src/directive/trim.ts

@@ -13,7 +13,7 @@ const vTrim = {
       const value = el.value.trim().replace(/\s+/g, "");
       el.value = value;
       binding.value = value;
-      binding?.instance?.$emit?.("update:modelValue", value);
+      binding?.instance?.$emit?.("onUpdate:modelValue", value);
     });
   }
 };