@ditari/bsui 1.0.14 → 1.0.15

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"},k=e.defineComponent({...D,props:{value:{default:null},name:{default:""},disabled:{type:Boolean,default:!1},placeholder:{default:"请填写默认占位符啊！老铁"}},emits:["update:value","change"],setup(l,{emit:d}){const r=l,{getDicByKey:h,list:p}=_.useDataDicStore(),{modelValue:u,data:S,onSearch:v,onSelect:g,onChange:m}=C();function C(){let c=!0,n=[];const o=e.ref(n),t=e.ref(r.value),s=new b.default;s.onerror=()=>{c=!1,n=h(r.name)},s.onmessage=a=>{o.value=[...a.data]},i(t.value);const w=a=>{c?i(a):o.value=n.filter(f=>f.value.toLowerCase().indexOf(a.toLowerCase())!==-1||f.label.toLowerCase().includes(a.toLowerCase())).splice(0,10)};function i(a){s.postMessage({list:JSON.stringify(p[r.name]),keywords:a})}return{data:o,modelValue:t,onSearch:w,onSelect:a=>{d("update:value",a)},onChange:()=>{d("change",t.value)}}}return(c,n)=>{const o=e.resolveComponent("a-select");return e.openBlock(),e.createBlock(o,{value:e.unref(u),"onUpdate:value":n[0]||(n[0]=t=>e.isRef(u)?u.value=t:null),"allow-clear":"","show-search":"","filter-option":!1,options:e.unref(S),placeholder:l.placeholder,disabled:l.disabled,onSelect:e.unref(g),onSearch:e.unref(v),onChange:e.unref(m)},null,8,["value","options","placeholder","disabled","onSelect","onSearch","onChange"])}}});exports.default=k;
+"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"},k=e.defineComponent({...D,props:{value:{default:null},name:{default:""},disabled:{type:Boolean,default:!1},placeholder:{default:"请填写默认占位符啊！老铁"}},emits:["update:value","change"],setup(l,{emit:r}){const u=l,{getDicByKey:p,list:h}=_.useDataDicStore(),{modelValue:c,data:v,onSearch:S,onSelect:g,onChange:m}=C();function C(){let s=!0,n=[];const t=e.ref(n),o=e.ref(u.value),d=new b.default;d.onerror=()=>{s=!1,n=p(u.name)},d.onmessage=a=>{t.value=[...a.data]},i(o.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(h[u.name]),keywords:a})}return{data:t,modelValue:o,onSearch:w,onSelect:a=>{r("update:value",a)},onChange:()=>{r("update:value",o.value),r("change",o.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]=o=>e.isRef(c)?c.value=o:null),"allow-clear":"","show-search":"","filter-option":!1,options:e.unref(v),placeholder:l.placeholder,disabled:l.disabled,onSelect:e.unref(g),onSearch:e.unref(S),onChange:e.unref(m)},null,8,["value","options","placeholder","disabled","onSelect","onSearch","onChange"])}}});exports.default=k;

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,required:!0,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:q}=H();function H(){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:()=>{if(!c)return;const s=u?u(t):null;s&&s.value===i||(clearTimeout(l),l=setTimeout(()=>{g(),c(t)},200))},onDblclick:()=>{r&&(clearTimeout(l),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:q},{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,required:!0,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:q}=H();function H(){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:q},{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/esm/components/select/Select.vue.esm.js

@@ -1,4 +1,4 @@
-import { defineComponent as D, ref as p, resolveComponent as _, openBlock as k, createBlock as B, unref as n, isRef as L } from "vue";
+import { defineComponent as D, ref as f, 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 V from "./dic.worker.esm.js";
 const W = {
@@ -12,42 +12,42 @@ const W = {
     placeholder: { default: "请填写默认占位符啊！老铁" }
   },
   emits: ["update:value", "change"],
-  setup(t, { emit: d }) {
-    const r = t, { getDicByKey: h, list: m } = x(), { modelValue: c, data: S, onSearch: v, onSelect: g, onChange: C } = w();
+  setup(t, { emit: r }) {
+    const c = t, { getDicByKey: h, list: m } = x(), { modelValue: s, data: S, onSearch: v, onSelect: g, onChange: C } = w();
     function w() {
-      let s = !0, a = [];
-      const o = p(a), l = p(r.value), u = new V();
-      u.onerror = () => {
-        s = !1, a = h(r.name);
-      }, u.onmessage = (e) => {
-        o.value = [...e.data];
-      }, i(l.value);
+      let u = !0, a = [];
+      const l = f(a), o = f(c.value), d = new V();
+      d.onerror = () => {
+        u = !1, a = h(c.name);
+      }, d.onmessage = (e) => {
+        l.value = [...e.data];
+      }, i(o.value);
       const b = (e) => {
-        s ? i(e) : o.value = a.filter((f) => f.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || f.label.toLowerCase().includes(e.toLowerCase())).splice(0, 10);
+        u ? i(e) : l.value = a.filter((p) => p.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || p.label.toLowerCase().includes(e.toLowerCase())).splice(0, 10);
       };
       function i(e) {
-        u.postMessage({
-          list: JSON.stringify(m[r.name]),
+        d.postMessage({
+          list: JSON.stringify(m[c.name]),
           keywords: e
         });
       }
       return {
-        data: o,
-        modelValue: l,
+        data: l,
+        modelValue: o,
         onSearch: b,
         onSelect: (e) => {
-          d("update:value", e);
+          r("update:value", e);
         },
         onChange: () => {
-          d("change", l.value);
+          r("update:value", o.value), r("change", o.value);
         }
       };
     }
-    return (s, a) => {
-      const o = _("a-select");
-      return k(), B(o, {
-        value: n(c),
-        "onUpdate:value": a[0] || (a[0] = (l) => L(c) ? c.value = l : null),
+    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),
         "allow-clear": "",
         "show-search": "",
         "filter-option": !1,

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

@@ -145,16 +145,14 @@ const M = () => ({
         };
         return {
           onClick: () => {
-            if (!s)
-              return;
             const u = i ? i(t) : null;
             u && u.value === l || (clearTimeout(n), n = setTimeout(() => {
-              r(), s(t);
+              r(), s && s(t);
             }, 200));
           },
           // 点击行
           onDblclick: () => {
-            c && (clearTimeout(n), c(t));
+            clearTimeout(n), c && c(t);
           }
           // onContextmenu: (event) => {
           //   //TODO

package/package.json

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

package/src/components/select/Select.vue

@@ -86,6 +86,7 @@ function useSelect() {
     }
   };
 
+  // 发送搜索到webworker
   function sendWorkerSearch(keywords: string) {
     worker.postMessage({
       list: JSON.stringify(list[props.name]),
@@ -99,7 +100,9 @@ function useSelect() {
     emits("update:value", value);
   };
 
+  // 监听数据改变
   const onChange = () => {
+    emits("update:value", modelValue.value);
     emits("change", modelValue.value);
   };
   return {

package/src/components/table/Table.tsx

@@ -277,7 +277,6 @@ const DXTable = defineComponent({
 
         return {
           onClick: () => {
-            if (!click) return;
             const rs = getCheckboxProps ? getCheckboxProps(record) : null;
             if (rs && rs.value === id) {
               return;
@@ -287,14 +286,13 @@ const DXTable = defineComponent({
               // 处理单击事件业务
               onClick();
               // 回传数据 自定义单击后的业务
-              click(record);
+              click ? click(record) : undefined;
             }, 200);
           }, // 点击行
           onDblclick: () => {
-            if (!dbClick) return;
             clearTimeout(clickTimeout);
             //  回传数据 自定义单击后的业务
-            dbClick(record);
+            dbClick ? dbClick(record) : undefined;
           }
           // onContextmenu: (event) => {
           //   //TODO