@ctzy-web-client/plugin-component-vue 1.0.22 → 1.0.24

package/lib/progress/progress.js

@@ -8,71 +8,85 @@ var webBaseClientVue = require('@ctzy-web-client/web-base-client-vue');
 var useProgress = require('./use-progress.js');
 var _pluginVue_exportHelper = require('../_virtual/_plugin-vue_export-helper.js');
 
-const __default__ = vue.defineComponent({ name: "BwaProgress" });
-const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
-  props: {
-    max: { type: Number, default: 0 },
-    showLabel: { type: Boolean, default: true },
-    labelWidth: { type: String, default: "auto" }
-  },
+const _sfc_main = {
+  __name: 'progress',
+  props: {
+  max: { type: Number, default: 0 },
+  showLabel: { type: Boolean, default: true },
+  labelWidth: { type: String, default: 'auto' },
+},
   setup(__props) {
-    const props = __props;
-    const { max } = vue.toRefs(props);
-    const ns = webBaseClientVue.useNamespace("progress");
-    const states = useProgress.useProgressState(props);
-    const { percent, handleProgressItemCreate, handleProgressItemDestroy, nextID } = useProgress.useProgress(props, states);
-    vue.provide(
-      webBaseClientVue.progressKey,
-      vue.reactive({ max, handleProgressItemCreate, handleProgressItemDestroy, nextID })
-    );
-    return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createBlock(vue.unref(ElementPlus.ElTooltip), {
-        placement: "bottom-start",
-        effect: "light",
-        "append-to": ".bwa-application"
-      }, {
-        content: vue.withCtx(() => [
-          vue.createElementVNode("div", {
-            class: vue.normalizeClass(vue.unref(ns).be("info", "wrapper"))
-          }, [
-            (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(states).progressItemList, (item) => {
-              return vue.openBlock(), vue.createElementBlock("div", {
-                key: item.id,
-                class: vue.normalizeClass(vue.unref(ns).be("item", "info")),
-                style: vue.normalizeStyle({ "--bwa-progress-item-dot-color": item.color })
-              }, [
-                vue.createElementVNode("span", {
-                  class: vue.normalizeClass(vue.unref(ns).be("item", "label"))
-                }, vue.toDisplayString(item.label), 3),
-                vue.createElementVNode("span", {
-                  class: vue.normalizeClass(vue.unref(ns).be("item", "value"))
-                }, vue.toDisplayString(item.width), 3)
-              ], 6);
-            }), 128))
-          ], 2)
-        ]),
-        default: vue.withCtx(() => [
-          vue.createElementVNode("div", {
-            class: vue.normalizeClass(vue.unref(ns).b())
+
+const props = __props;
+
+defineOptions({ name: 'BwaProgress' });
+
+
+
+const { max } = vue.toRefs(props);
+
+const ns = webBaseClientVue.useNamespace('progress');
+
+const states = useProgress.useProgressState(props);
+const { percent, handleProgressItemCreate, handleProgressItemDestroy, nextID } =
+  useProgress.useProgress(props, states);
+
+vue.provide(
+  webBaseClientVue.progressKey,
+  vue.reactive({ max, handleProgressItemCreate, handleProgressItemDestroy, nextID })
+);
+
+return (_ctx, _cache) => {
+  return (vue.openBlock(), vue.createBlock(vue.unref(ElementPlus.ElTooltip), {
+    placement: "bottom-start",
+    effect: "light",
+    "append-to": ".bwa-application"
+  }, {
+    content: vue.withCtx(() => [
+      vue.createElementVNode("div", {
+        class: vue.normalizeClass(vue.unref(ns).be('info', 'wrapper'))
+      }, [
+        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(states).progressItemList, (item) => {
+          return (vue.openBlock(), vue.createElementBlock("div", {
+            key: item.id,
+            class: vue.normalizeClass(vue.unref(ns).be('item', 'info')),
+            style: vue.normalizeStyle({ '--bwa-progress-item-dot-color': item.color })
           }, [
-            vue.createElementVNode("div", {
-              class: vue.normalizeClass(vue.unref(ns).e("inner")),
-              style: vue.normalizeStyle({ "--bwa-progress-width": vue.unref(max) })
-            }, [
-              vue.renderSlot(_ctx.$slots, "default")
-            ], 6),
-            __props.showLabel ? (vue.openBlock(), vue.createElementBlock("div", {
+            vue.createElementVNode("span", {
+              class: vue.normalizeClass(vue.unref(ns).be('item', 'label'))
+            }, vue.toDisplayString(item.label), 3 /* TEXT, CLASS */),
+            vue.createElementVNode("span", {
+              class: vue.normalizeClass(vue.unref(ns).be('item', 'value'))
+            }, vue.toDisplayString(item.width), 3 /* TEXT, CLASS */)
+          ], 6 /* CLASS, STYLE */))
+        }), 128 /* KEYED_FRAGMENT */))
+      ], 2 /* CLASS */)
+    ]),
+    default: vue.withCtx(() => [
+      vue.createElementVNode("div", {
+        class: vue.normalizeClass(vue.unref(ns).b())
+      }, [
+        vue.createElementVNode("div", {
+          class: vue.normalizeClass(vue.unref(ns).e('inner')),
+          style: vue.normalizeStyle({ '--bwa-progress-width': vue.unref(max) })
+        }, [
+          vue.renderSlot(_ctx.$slots, "default")
+        ], 6 /* CLASS, STYLE */),
+        (__props.showLabel)
+          ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 0,
-              class: vue.normalizeClass(vue.unref(ns).e("percent")),
-              style: vue.normalizeStyle({ "--bwa-progress-label-width": __props.labelWidth })
-            }, vue.toDisplayString(vue.unref(percent)) + "% ", 7)) : vue.createCommentVNode("v-if", true)
-          ], 2)
-        ]),
-        _: 3
-      });
-    };
-  }
-});
-var Progress = /* @__PURE__ */ _pluginVue_exportHelper["default"](_sfc_main, [["__file", "progress.vue"]]);
+              class: vue.normalizeClass(vue.unref(ns).e('percent')),
+              style: vue.normalizeStyle({ '--bwa-progress-label-width': __props.labelWidth })
+            }, vue.toDisplayString(vue.unref(percent)) + "% ", 7 /* TEXT, CLASS, STYLE */))
+          : vue.createCommentVNode("v-if", true)
+      ], 2 /* CLASS */)
+    ]),
+    _: 3 /* FORWARDED */
+  }))
+}
+}
+
+};
+var Progress = /*#__PURE__*/_pluginVue_exportHelper["default"](_sfc_main, [['__file',"progress.vue"]]);
 
 exports["default"] = Progress;

package/lib/where-filter-panel/where-filter-panel.js

@@ -5,17 +5,20 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var _pluginVue_exportHelper = require('../_virtual/_plugin-vue_export-helper.js');
 
-const __default__ = vue.defineComponent({
-  name: "BwaWhereFilterPanel"
-});
-const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
+const _sfc_main = {
+  __name: 'where-filter-panel',
   setup(__props) {
-    ;
-    return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div");
-    };
-  }
-});
-var whereFilterPanel = /* @__PURE__ */ _pluginVue_exportHelper["default"](_sfc_main, [["__file", "where-filter-panel.vue"]]);
+
+defineOptions({
+  name: 'BwaWhereFilterPanel',
+});
+
+return (_ctx, _cache) => {
+  return (vue.openBlock(), vue.createElementBlock("div"))
+}
+}
+
+};
+var whereFilterPanel = /*#__PURE__*/_pluginVue_exportHelper["default"](_sfc_main, [['__file',"where-filter-panel.vue"]]);
 
 exports["default"] = whereFilterPanel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctzy-web-client/plugin-component-vue",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "exports": {
@@ -33,6 +33,7 @@
     "quill": "^1.3.7",
     "rxjs": "^7.6.0",
     "tinymce": "^6.4.2",
+    "pinyin-pro": "^3.28.0",
     "@ctzy-web-client/web-base-client-vue": "^1.0.0"
   },
   "devDependencies": {

package/src/advance-select/advance-option.vue

@@ -5,16 +5,14 @@
       <slot>
         <ElTooltip placement="top" append-to=".bwa-application" :disabled="currentLabel.length < 16">
           <div :class="ns.be('option', 'content-label')" ref="contentText">
-              <ElCheckbox
-                  v-if="source === 'pct' && !showSelectIcon"
-                  @click.prevent
-                  :class="ns.be('filter', 'checkbox')"
-                  :modelValue="itemSelected"
-                  style="height: 26px"
-              >
-                  <div :class="ns.be('option', 'content-label')" style="width: 178px">{{ currentLabel }}</div>
-              </ElCheckbox>
-              <div v-else :class="[ns.be('option', 'content-label'), ns.is('selected',source === 'pct' && itemSelected && showSelectIcon)]">{{ currentLabel }}</div>
+           
+                  <div v-if="!showUserName" :class="ns.be('option', 'content-label')" style="width: 178px">{{ currentLabel }}</div>
+                  <div v-if="showUserName" :class="ns.be('option', 'content-label')" style="width: 178px;display: flex;align-items: center;"  >
+                      <div  class="letter-circle" :style="{ backgroundColor: (processLabel(currentLabel).color) }">
+                {{  processLabel(currentLabel).firstLetter }}
+               </div>
+                <div style="overflow: hidden;text-overflow: ellipsis;flex: 3;">{{ currentLabel }}</div>
+                  </div>
           </div>
           <template #content>
             {{ currentLabel }}
@@ -23,7 +21,7 @@
       </slot>
     </div>
     <ElIcon
-      v-if="itemSelected && showSelectIcon"
+      v-if="itemSelected "
       :class="ns.be('option', 'selected')"
     >
       <Select />
@@ -37,7 +35,7 @@ import { getCurrentInstance, toRefs, ref, nextTick, onMounted, onUnmounted } fro
 import { useNamespace } from '@ctzy-web-client/web-base-client-vue';
 import { useEvent } from './events-helpers';
 import { useAdvanceOption } from './use-advance-option';
-
+import { pinyin } from 'pinyin-pro';
 export default {
   name: 'BwaAdvanceOption',
   props: {
@@ -61,6 +59,7 @@ export default {
 
     const show = ref(true)
     const clickFlag = ref(true)
+    const showUserName = ref(true)
 
     const contentText = ref()
 
@@ -83,7 +82,43 @@ export default {
         }
       }
     }
+     const COLOR_POOL = ['#2DC86D', '#19BBFF', '#FFA901'];
+      /**
+ * 接收完整label，提取姓名首字母（大写）并匹配颜色
+ * @param {string} label - 完整label（如：石玉涵(dw_shiyuhan)）
+ * @returns {object} { firstLetter: 大写首字母, color: 圆点颜色, valid: 是否符合规则 }
+ */
+function processLabel(label) {
+  // 1. 第一步：拆分label，提取姓名（核心修复点）
+  const labelMatch = label.match(/^(.*)\((.*)\)$/);
+  if (!labelMatch) {
+    return { valid: false, firstLetter: '#', color: COLOR_POOL[0] };
+  }
+  const [, name] = labelMatch; // 提取纯姓名：如"石玉涵"
+  const firstChar = name.charAt(0); // 取姓名第一个字
+
+  // 2. 第二步：获取首字母（强制大写，彻底解决小写问题）
+  let firstLetter = '#';
+  if (/^[\u4e00-\u9fa5]$/.test(firstChar)) {
+    // 拼音库取首字母 + 手动toUpperCase（无视库版本差异）
+    firstLetter = pinyin(firstChar, { pattern: 'first' }).toUpperCase();
+  } else if (/^[a-zA-Z]$/.test(firstChar)) {
+    firstLetter = firstChar.toUpperCase();
+  }
 
+  // 3. 第三步：计算颜色（按你指定的规则）
+  let color = COLOR_POOL[0];
+  if (/^[A-Z]$/.test(firstLetter)) {
+    const letterCode = firstLetter.charCodeAt(0) - 'A'.charCodeAt(0);
+    color = COLOR_POOL[letterCode % 3];
+  }
+
+  return {
+ 
+    firstLetter: firstLetter, // 确保是大写
+    color: color
+  };
+}
     const listenerClickFunction = () => {
       setTimeout(() => {
         isShow();
@@ -104,13 +139,29 @@ export default {
       show,
       ns,
       currentLabel,
+      showUserName,
       itemSelected,
       showSelectIcon,
       filterOptionClick,
       handleOptionMouseEnter,
-        source
+        source,
+        processLabel
     };
   },
 };
 </script>
+<style scoped>
+.letter-circle {
+
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  margin-right: 8px;
+}
+</style>
 

package/src/data-form/form-components/bwa-rich-text-tinymce.vue

@@ -535,7 +535,7 @@ onMounted(async () => {
 
   //           var range = editor.getSelection();
   //           if (range && fileData) {
-  //             //  在当前光标位置插入图�?
+  //             //  在当前光标位置插入图�?
   //             editor.insertEmbed(range.index, 'image', fileData.path);
   //             editor.formatText(range.index, 1, {
   //               alt: fileData.id,

package/src/datatable-settings/datatable-settings.vue

@@ -33,7 +33,7 @@
 
             <span
               :class="[ns.e('tools-item'), ns.e('close')]"
-              @click="value = false"
+              @click="handleClose"
             >
               <ElTooltip content="关闭" append-to=".bwa-application">
                 <ElIcon>
@@ -71,9 +71,10 @@
                       </span>
                       <ElSwitch
                         v-model="item.visible"
-                        size="small"
+                        
                         :disabled="item.settings.disabled"
                         @mousedown.stop
+                        @change="(val) => handleColumnVisibleChange(item, val)"
                       />
                     </div>
                   </div>
@@ -101,8 +102,9 @@
                   </span>
                   <ElSwitch
                     v-model="column.visible"
-                    size="small"
+                    
                     :disabled="column.settings.disabled"
+                    @change="(val) => handleColumnVisibleChange(column, val)"
                   />
                 </div>
               </div>
@@ -136,6 +138,7 @@ import {
   ref,
   unref,
   useAttrs,
+  watch,
   withCtx,
 } from 'vue';
 import BwaDraglist from '../drag-list';
@@ -151,12 +154,35 @@ const props = defineProps({
   },
 });
 
+const emit = defineEmits([
+  'reset-columns',
+  'sort-change',
+  'close',
+  'visible-change',
+  'column-visible-change'
+]);
+
 const attrs = useAttrs();
 
 const ns = useNamespace('datatable-settings');
 
 const value = ref(false);
 
+const handleClose = () => {
+  value.value = false;
+  emit('close');
+};
+
+const handleColumnVisibleChange = (column, visible) => {
+  const  tableColumns = [...displaySearchedColumns.value,...hiddenSearchedColumns.value ]
+  emit('column-visible-change', tableColumns);
+};
+
+// 监听value变化，emit visible-change事件
+watch(value, (newValue) => {
+  emit('visible-change', newValue);
+});
+
 const appName = useValue('AppName');
 const userService = useService('UserService');
 
@@ -244,6 +270,7 @@ const resetColumns = () => {
   const _dataTable = props.dataTable;
 
   _dataTable.resetColumnSort();
+  emit('reset-columns');
 };
 
 const allSearchedColumns = computed(() => {
@@ -273,6 +300,9 @@ const handleSortChange = (sort) => {
     .filter(Boolean);
 
   props.dataTable.setDisplayColumns(displayColumns);
+    const tableColumns = [...displaySearchedColumns.value,...hiddenSearchedColumns.value ]
+  emit('column-visible-change', tableColumns);
+  emit('sort-change', sort, displayColumns);
 };
 
 const scope = getCurrentScope();

package/src/date-range/date-picker.vue

@@ -23,7 +23,7 @@
       <ElPanelDatePicker type="date" :parsed-value="parsedValue" @pick="onPick" :teleported="false">
         <template #sidebar>
           <div :class="ns.e('sidebar')">
-            <ElButton size="small" @click="onClear">清空</ElButton>
+            <ElButton  @click="onClear">清空</ElButton>
           </div>
         </template>
       </ElPanelDatePicker>

package/src/date-range/date-range.vue

@@ -44,13 +44,13 @@
     </template>
 
     <template #content>
-      <PanelDateRange
+      <!-- <PanelDateRange
         :parsed-value="parsedValue"
         type="daterange"
         :visible="pickerVisivle"
         @pick="onPick"
         :teleported="false"
-      />
+      /> -->
     </template>
   </ElTooltip>
 </template>
@@ -63,7 +63,7 @@ import {
   useGlobalConfig,
 } from '@ctzy-web-client/web-base-client-vue';
 import { dayjs } from 'element-plus';
-import PanelDateRange from 'element-plus/es/components/date-picker-panel/src/panel-date-range';
+// import PanelDateRange from 'element-plus/es/components/date-picker-panel/src/panel-date-range';
 import { timePickerDefaultProps } from 'element-plus';
 import { ROOT_PICKER_INJECTION_KEY } from 'element-plus';
 import { useNamespace as useElementPlusNamesplace } from 'element-plus';

package/src/filter-panel/filter-panel.vue

@@ -55,7 +55,7 @@
     <ElInput
       v-if="showSearch"
       prefix-icon="Search"
-      size="small"
+      
       clearable
       v-model="searchValue"
       :placeholder="searchPlaceholder"
@@ -64,7 +64,7 @@
 
     <ElButton
       v-if="isChange"
-      size="small"
+      
       :class="ns.e('reset')"
       @click="handleReset"
     >

package/src/pct-filter-panel/pct-compents/pct-Input-condition.vue

@@ -1,64 +1,64 @@
-<template>
-    <div :class="ns.e('inputCon')">
-        <span v-if="showTitle" :class="ns.e('title')">{{column.title}}</span>
-        <el-input
-            :prefix-icon="showIcon ? prefixIcon : ''"
-            size="small"
-            clearable
-            :class="ns.e('search')"
-            :placeholder="placeholderStr"
-            v-model="modelValue"
-        />
-    </div>
-</template>
-
-<script setup>
-import { useNamespace, filterPanelItemKey } from '@ctzy-web-client/web-base-client-vue';
-import {computed, defineEmits, inject, useAttrs} from 'vue';
-import {dataProps} from "../../hooks/use-data";
-const ns = useNamespace('pct-input');
-const emit = defineEmits(['update:modelValue']);
-defineOptions({
-    name: 'BwaPctInputCondition',
-    __conditionTitle__: '输入框',
-    __conditionDefault__: () => [],
-});
-
-const props = defineProps({
-    ...dataProps,
-    modelValue: {
-        type: null,
-    },
-    placeholder: {
-        type: String,
-        default: '请输入',
-    },
-    prefixIcon: {
-        type: String,
-        default: 'Search',
-    },
-    showIcon: {
-        type: Boolean,
-        default: false,
-    }
-})
-
-const filterPanelItem = inject(filterPanelItemKey, null);
-const column = computed(() => filterPanelItem?.column ?? null);
-
-const placeholderStr = computed(() => showTitle.value ? props.placeholder : column.value.title)
-
-const attrs = useAttrs();
-const showTitle = computed(() => attrs.showTitle)
-
-
-const modelValue = computed({
-    get: () =>  props.modelValue,
-    set: (v) => emit('update:modelValue', v),
-});
-</script>
-
-<style scoped>
-
-</style>
-
+<template>
+    <div :class="ns.e('inputCon')">
+        <span v-if="showTitle" :class="ns.e('title')">{{column.title}}</span>
+        <el-input
+            :prefix-icon="showIcon ? prefixIcon : ''"
+            
+            clearable
+            :class="ns.e('search')"
+            :placeholder="placeholderStr"
+            v-model="modelValue"
+        />
+    </div>
+</template>
+
+<script setup>
+import { useNamespace, filterPanelItemKey } from '@ctzy-web-client/web-base-client-vue';
+import {computed, defineEmits, inject, useAttrs} from 'vue';
+import {dataProps} from "../../hooks/use-data";
+const ns = useNamespace('pct-input');
+const emit = defineEmits(['update:modelValue']);
+defineOptions({
+    name: 'BwaPctInputCondition',
+    __conditionTitle__: '输入框',
+    __conditionDefault__: () => [],
+});
+
+const props = defineProps({
+    ...dataProps,
+    modelValue: {
+        type: null,
+    },
+    placeholder: {
+        type: String,
+        default: '请输入',
+    },
+    prefixIcon: {
+        type: String,
+        default: 'Search',
+    },
+    showIcon: {
+        type: Boolean,
+        default: false,
+    }
+})
+
+const filterPanelItem = inject(filterPanelItemKey, null);
+const column = computed(() => filterPanelItem?.column ?? null);
+
+const placeholderStr = computed(() => showTitle.value ? props.placeholder : column.value.title)
+
+const attrs = useAttrs();
+const showTitle = computed(() => attrs.showTitle)
+
+
+const modelValue = computed({
+    get: () =>  props.modelValue,
+    set: (v) => emit('update:modelValue', v),
+});
+</script>
+
+<style scoped>
+
+</style>
+