@gct-paas/word 0.1.59 → 0.1.61

package/dist/index.es.js

@@ -94495,12 +94495,14 @@ class SetMaterialConsumeTable extends CommandBase {
       row: endCell.parent?.getCurrentIndex(),
       col: endCell.getCurrentIndex()
     };
+    const { name: name2, valuePath } = this.payload;
+    const props = { table_key_: valuePath };
     this.output = startCell.table.setMaterialConsumeTable({
       start,
       end,
-      name: this.payload.name,
-      valuePath: this.payload.valuePath,
-      widgetMeta: { props: { table_key_: "" } }
+      name: name2,
+      valuePath,
+      widgetMeta: { props }
     });
     return null;
   }
@@ -106413,7 +106415,7 @@ class BomEntriesValidator {
     }
     const util = this.findUtilByProductId(row.product_id_);
     if (!util) {
-      const name2 = row.product_id__lb_ ? JSON.parse(row.product_id__lb_).join(",") : "";
+      const name2 = row.product_id__lb_ || "";
       throw new Error(
         // $t('sys.edhr.mcTable.productNotDefine', {
         //   product: name,
@@ -106952,7 +106954,7 @@ class MaterialConsumeTableController {
   /** 校验有效期 */
   validateExpiration(row) {
     if (row.expiration_date_) {
-      if (dayjs(row.expiration_date_).isBefore(dayjs())) {
+      if (dayjs(row.expiration_date_).isBefore(dayjs().subtract(1, "day").endOf("day"))) {
         throw new Error("有效期不能早于当前日期");
       }
     }
@@ -114596,7 +114598,7 @@ const _sfc_main$2G = /* @__PURE__ */ defineComponent({
       const { isMaterialConsume, isWarehouseInventory, isWarehouseAllocate } = subTableType.value;
       const canCopy = !isWarehouseInventory && !isWarehouseAllocate;
       const canInsertMulti = !isMaterialConsume && !isWarehouseInventory && !isWarehouseAllocate;
-      const canDelete = visibleRows.length > 1;
+      const canDelete = visibleRows.length > 1 && (isMaterialConsume ? props.isLastRow : true);
       const isConfirmed = !!visibleRows[index2]?.is_confirmed_;
       return {
         canCopy,
@@ -114888,7 +114890,7 @@ const _sfc_main$2G = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2G, [["__scopeId", "data-v-2b5fa953"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2G, [["__scopeId", "data-v-2ebdf814"]]);
 const _sfc_main$2F = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -133511,13 +133513,6 @@ function toQuickSearchFieldKey(field) {
   if (!exp) return field.key;
   return field.key.includes(".") ? field.key : `${field.key}.${exp}`;
 }
-function getQuickQueryDataByKeyword(quickSearchField, keyword) {
-  return quickSearchField.reduce((total, fieldKey) => {
-    const expKey = fieldKey.split(".").length > 1 ? fieldKey : `${fieldKey}.iLike`;
-    total[expKey] = keyword;
-    return total;
-  }, {});
-}
 function fillDefaultSearchField(fields2 = []) {
   return Array.from(/* @__PURE__ */ new Set([...DEFAULT_QUICK_SEARCH_FIELDS, ...fields2]));
 }
@@ -133529,6 +133524,42 @@ function buildQuickSearchFieldOptions(fields2 = []) {
     value: toQuickSearchFieldKey(item)
   }));
 }
+function normalizeSearchFieldKey(field) {
+  return field.includes(".") ? field : `${field}.iLike`;
+}
+function joinAnd(keys2) {
+  if (keys2.length === 0) return "";
+  if (keys2.length === 1) return keys2[0];
+  return `AND(${keys2.join(",")})`;
+}
+function joinOr(keys2) {
+  if (keys2.length === 0) return "";
+  if (keys2.length === 1) return keys2[0];
+  return `OR(${keys2.join(",")})`;
+}
+function buildLikeQuery(searchFields, keyword, extraQuery = {}, options) {
+  const queryData = {
+    ...extraQuery
+  };
+  const filterKeys = Object.keys(extraQuery);
+  const searchKeys = [];
+  if (keyword?.trim()) {
+    searchFields.forEach((field) => {
+      const key = normalizeSearchFieldKey(field);
+      queryData[key] = keyword;
+      searchKeys.push(key);
+    });
+  }
+  const filterExp = joinAnd(filterKeys);
+  const likeExp = joinOr(searchKeys);
+  let exp = "";
+  if (filterExp && likeExp) {
+    exp = `AND(${filterExp},${likeExp})`;
+  } else {
+    exp = filterExp || likeExp;
+  }
+  return { queryData, exp };
+}
 function buildDeviceBaseQuery(extraQuery) {
   const queryData = {
     operating_state_: true,
@@ -133541,35 +133572,21 @@ function buildDeviceBaseQuery(extraQuery) {
   return queryData;
 }
 function buildDeviceQuickSearchQuery(quickSearchField, keyword, extraQuery) {
-  const baseQuery = buildDeviceBaseQuery(extraQuery);
-  if (!keyword?.trim()) {
-    return { queryData: baseQuery, exp: "" };
-  }
-  const fields2 = fillDefaultSearchField(quickSearchField);
-  return {
-    queryData: {
-      ...getQuickQueryDataByKeyword(fields2, keyword),
-      ...baseQuery
-    },
-    exp: `OR(${fields2.join(",")})`
-  };
+  return buildLikeQuery(
+    fillDefaultSearchField(quickSearchField),
+    keyword,
+    buildDeviceBaseQuery(extraQuery)
+  );
 }
-function buildRefQuickSearchQuery(searchField, keyword, extraQuery) {
-  const baseQuery = {
-    operating_state_: true,
-    ...extraQuery
-  };
-  if (!keyword?.trim()) {
-    return { queryData: baseQuery, exp: "" };
-  }
-  const fields2 = searchField?.length ? searchField : ["code_.iLike", "name_.iLike"];
-  return {
-    queryData: {
-      ...getQuickQueryDataByKeyword(fields2, keyword),
-      ...baseQuery
-    },
-    exp: `OR(${fields2.join(",")})`
-  };
+function buildRefQuickSearchQuery(searchField, keyword, extraQuery, options) {
+  const fields2 = searchField?.length ? searchField : ["code_", "name_"];
+  return buildLikeQuery(
+    fields2,
+    keyword,
+    {
+      ...extraQuery
+    }
+  );
 }
 const _sfc_main$A = /* @__PURE__ */ defineComponent({
   __name: "quick-search-editor",
@@ -136507,62 +136524,28 @@ function shouldEnableLinkage(doc, clickedFieldType, clickedKey) {
     return key === clickedKey && fieldMeta.fieldType === targetLinkedFieldType;
   });
 }
-function buildLikeQuery(fields2, keyword, query = {}) {
-  const resultQuery = {
-    ...query
-  };
-  const queryExp = Object.keys(query);
-  let likeExp = "";
-  if (keyword?.trim()) {
-    fields2.forEach((field) => {
-      const key = field.includes(".") ? field : `${field}.iLike`;
-      resultQuery[key] = keyword;
-    });
-    likeExp = `OR(${fields2.map((field) => field.includes(".") ? field : `${field}.iLike`).join(",")})`;
-  }
-  const baseExp = queryExp.length ? `OR(${queryExp.join(",")})` : "";
-  let exp = "";
-  if (baseExp && likeExp) {
-    exp = `AND(${baseExp},${likeExp})`;
-  } else {
-    exp = baseExp || likeExp;
-  }
-  return {
-    queryData: resultQuery,
-    exp
-  };
-}
-const selectStrategyMap = {
-  [FIELD_TYPE.MATERIAL_NO]: {
-    columnsKey: "lot-sn",
-    fetcher: "lot2sn",
-    allowManualInput: true,
-    persistOptionId: true,
-    buildQuery({ keyword, extraParams }) {
-      return buildLikeQuery(["name_"], keyword, { "product_id_.isNotNull": null, ...extraParams });
-    },
-    transform: transformLotData
+const LOT2SN_STRATEGY = {
+  columnsKey: "lot-sn",
+  fetcher: "lot2sn",
+  allowManualInput: true,
+  persistOptionId: true,
+  buildQuery({ keyword, extraParams }) {
+    return buildLikeQuery(["name_"], keyword, { "product_id_.isNotNull": null, ...extraParams });
   },
-  [FIELD_TYPE.SCRAP_MATERIAL_NO]: {
-    columnsKey: "lot-sn",
-    fetcher: "lot2sn",
-    allowManualInput: true,
-    persistOptionId: true,
-    buildQuery({ keyword, extraParams }) {
-      return buildLikeQuery(["name_"], keyword, { "product_id_.isNotNull": null, ...extraParams });
-    },
-    transform: transformLotData
-  },
-  [FIELD_TYPE.RELATED_LOT_NO]: {
-    columnsKey: "lot-sn",
-    fetcher: "lot2sn",
-    allowManualInput: true,
-    persistOptionId: true,
-    buildQuery({ keyword, extraParams }) {
-      return buildLikeQuery(["name_"], keyword, { "product_id_.isNotNull": null, ...extraParams });
-    },
-    transform: transformLotData
+  transform: transformLotData
+};
+const REF_STRATEGY = {
+  columnsKey: "ref",
+  fetcher: "ref",
+  buildQuery({ keyword, searchField, extraParams }) {
+    return buildRefQuickSearchQuery(searchField, keyword, extraParams);
   },
+  transform: transformLotData
+};
+const selectStrategyMap = {
+  [FIELD_TYPE.MATERIAL_NO]: LOT2SN_STRATEGY,
+  [FIELD_TYPE.SCRAP_MATERIAL_NO]: LOT2SN_STRATEGY,
+  [FIELD_TYPE.RELATED_LOT_NO]: LOT2SN_STRATEGY,
   [FIELD_TYPE.MFG_ORDER]: {
     columnsKey: "mfg-order",
     fetcher: "ref",
@@ -136718,6 +136701,9 @@ const selectStrategyMap = {
     },
     transform: transformTreeData
   },
+  [FIELD_TYPE.WAREHOUSE]: REF_STRATEGY,
+  [FIELD_TYPE.LOCATION]: REF_STRATEGY,
+  [FIELD_TYPE.REF]: REF_STRATEGY,
   [FIELD_TYPE.PRODUCTION_IDENTIFIER]: {
     columnsKey: "lot-sn",
     fetcher: "ref2lot2sn",
@@ -136728,30 +136714,6 @@ const selectStrategyMap = {
       });
     },
     transform: transformLotData
-  },
-  [FIELD_TYPE.WAREHOUSE]: {
-    columnsKey: "ref",
-    fetcher: "ref",
-    buildQuery({ keyword, searchField, extraParams }) {
-      return buildRefQuickSearchQuery(searchField, keyword, extraParams);
-    },
-    transform: transformLotData
-  },
-  [FIELD_TYPE.LOCATION]: {
-    columnsKey: "ref",
-    fetcher: "ref",
-    buildQuery({ keyword, searchField, extraParams }) {
-      return buildRefQuickSearchQuery(searchField, keyword, extraParams);
-    },
-    transform: transformLotData
-  },
-  [FIELD_TYPE.REF]: {
-    columnsKey: "ref",
-    fetcher: "ref",
-    buildQuery({ keyword, searchField, extraParams }) {
-      return buildRefQuickSearchQuery(searchField, keyword, extraParams);
-    },
-    transform: transformLotData
   }
 };
 function getSelectStrategy(widgetProps, fieldType) {

package/dist/runtime/renderer/dropdowns/components/tables/strategy/selectStrategy.d.ts

@@ -1,4 +1,5 @@
 import { FIELD_TYPE } from '../../../../../../domain/field/field-type';
+import { SelectApiBinding } from '../../../../../../domain/table/types';
 import { Doc } from '../../../../../../core';
 export interface SelectQueryContext {
     keyword: string;
@@ -11,6 +12,10 @@ export interface SelectQueryContext {
     deviceTypeId?: string;
     /** 目前用于 子表字段(带[n]) 额外参数配置 */
     extraParams: any;
+    optionMapping?: {
+        value?: string;
+        label?: string;
+    };
 }
 export interface SelectQueryResult {
     queryData?: Record<string, any>;
@@ -30,6 +35,13 @@ export interface SelectStrategy {
     persistOptionId?: boolean;
     buildQuery?: (ctx: SelectQueryContext) => SelectQueryResult;
     transform: (options: any[], value?: string, currentId?: string) => any;
+    /** 如下拉 value/label 与 fetcher 默认不同 */
+    optionMapping?: {
+        value?: string;
+        label?: string;
+    };
+    /** fetcher 为 biz 时声明业务接口 */
+    api?: SelectApiBinding;
 }
 /**
  * 判断指定字段是否需要开启【报废/不良】分类 ->原因单向数据联动

package/dist/runtime/renderer/dropdowns/components/tables/utils/quick-search.d.ts

@@ -4,11 +4,27 @@ export declare function buildQuickSearchFieldOptions(fields?: FieldMeta[]): {
     label: string;
     value: string;
 }[];
+/**
+ * 统一下拉查询拼装：
+ * - searchFields + keyword → queryData 写入搜索键，exp 为 OR(搜索键)
+ * - extraQuery（过滤条件）→ 原样并入 queryData；默认 AND(过滤键)，可改为 OR
+ * - 两者皆有 → AND(过滤, OR(搜索))
+ */
+export declare function buildLikeQuery(searchFields: string[], keyword: string, extraQuery?: Record<string, any>, options?: {
+    filterCombine?: 'and' | 'or';
+}): {
+    queryData: Record<string, any>;
+    exp: string;
+};
+/** 设备下拉：默认搜 code/name + 设备类型过滤 */
 export declare function buildDeviceQuickSearchQuery(quickSearchField: string[] | undefined, keyword: string, extraQuery?: Record<string, any>): {
     queryData: Record<string, any>;
     exp: string;
 };
-export declare function buildRefQuickSearchQuery(searchField: string[] | undefined, keyword: string, extraQuery?: Record<string, unknown>): {
-    queryData: Record<string, unknown>;
+/** 关联下拉：默认搜 code/name，并带 operating_state_ */
+export declare function buildRefQuickSearchQuery(searchField: string[] | undefined, keyword: string, extraQuery?: Record<string, unknown>, options?: {
+    filterCombine?: 'and' | 'or';
+}): {
+    queryData: Record<string, any>;
     exp: string;
 };

package/dist/word.css

@@ -8849,20 +8849,20 @@ textarea[data-v-e709484b]::placeholder {
 .table-action .row-headers .row-header:last-child .row-add-btn[data-v-c40eef9f] .gct-icon.bottom {
   transform: translateY(-100%);
 }
-.sub-table-action-container[data-v-2b5fa953] {
+.sub-table-action-container[data-v-2ebdf814] {
   position: absolute;
   z-index: 999;
 }
-.sub-table-action-bar[data-v-2b5fa953],
-.sub-table-action-popper[data-v-2b5fa953] {
+.sub-table-action-bar[data-v-2ebdf814],
+.sub-table-action-popper[data-v-2ebdf814] {
   pointer-events: auto;
   user-select: none;
 }
-.sub-table-action-bar[data-v-2b5fa953] {
+.sub-table-action-bar[data-v-2ebdf814] {
   display: flex;
 }
-.sub-table-action-bar .more-btn[data-v-2b5fa953],
-.sub-table-action-bar .confirm-btn[data-v-2b5fa953] {
+.sub-table-action-bar .more-btn[data-v-2ebdf814],
+.sub-table-action-bar .confirm-btn[data-v-2ebdf814] {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -8871,44 +8871,44 @@ textarea[data-v-e709484b]::placeholder {
   cursor: pointer;
   box-sizing: border-box;
 }
-.sub-table-action-bar .more-btn[data-v-2b5fa953] {
+.sub-table-action-bar .more-btn[data-v-2ebdf814] {
   width: 10px;
   background: #026ac8;
   border-radius: 0 4px 4px 0;
 }
-.sub-table-action-bar .confirm-btn[data-v-2b5fa953] {
+.sub-table-action-bar .confirm-btn[data-v-2ebdf814] {
   margin-left: 4px;
   border-radius: 4px;
   border: 1px solid #4ec262;
 }
-.sub-table-action-popper[data-v-2b5fa953] {
+.sub-table-action-popper[data-v-2ebdf814] {
   padding: 2px 8px;
 }
-.sub-table-action-popper .action-menu[data-v-2b5fa953] {
+.sub-table-action-popper .action-menu[data-v-2ebdf814] {
   padding: 4px 0;
   width: 220px;
   user-select: none;
 }
-.sub-table-action-popper .action-menu + .action-menu[data-v-2b5fa953] {
+.sub-table-action-popper .action-menu + .action-menu[data-v-2ebdf814] {
   margin-top: 4px;
   padding-top: 4px;
   border-top: 1px solid #efefef;
 }
-.sub-table-action-popper .action-menu .menu-title[data-v-2b5fa953] {
+.sub-table-action-popper .action-menu .menu-title[data-v-2ebdf814] {
   color: #bcbcbc;
   margin: 4px 0;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-2b5fa953] {
+.sub-table-action-popper .action-menu .menu-item[data-v-2ebdf814] {
   display: flex;
   align-items: center;
   padding: 8px 10px;
   border-radius: 4px;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-2b5fa953]:hover {
+.sub-table-action-popper .action-menu .menu-item[data-v-2ebdf814]:hover {
   cursor: pointer;
   background-color: #f2f5f8;
 }
-.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-2b5fa953] {
+.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-2ebdf814] {
   display: flex;
   align-items: center;
   justify-content: start;
@@ -8916,14 +8916,14 @@ textarea[data-v-e709484b]::placeholder {
   width: 20px;
   height: 20px;
 }
-.sub-table-action-popper .action-menu .menu-item .item-icon.scale-large[data-v-2b5fa953] {
+.sub-table-action-popper .action-menu .menu-item .item-icon.scale-large[data-v-2ebdf814] {
   transform: scale(1.5);
 }
-.sub-table-action-popper .action-menu .menu-item .item-label[data-v-2b5fa953] {
+.sub-table-action-popper .action-menu .menu-item .item-label[data-v-2ebdf814] {
   flex-grow: 1;
   margin-left: 8px;
 }
-.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-2b5fa953] {
+.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-2ebdf814] {
   display: flex;
   justify-content: space-between;
   align-items: center;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.59",
+  "version": "0.1.61",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",