qidian-vue-ui 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/components/config-renderer/index.vue.mjs

@@ -1,7 +1,7 @@
-import { defineComponent, computed, h, resolveComponent, watch, onMounted, createBlock, createCommentVNode, openBlock, resolveDynamicComponent, mergeProps, createSlots, renderList, withCtx } from "vue";
+import { defineComponent, computed, h, resolveComponent, watch, createBlock, createCommentVNode, openBlock, resolveDynamicComponent, mergeProps, createSlots, renderList, withCtx } from "vue";
 import { isEmpty } from "qidian-shared";
 import { qdUseComputeValue } from "./compute.mjs";
-import { wrapFunctionalRenderer, getValueByPath, createVModelBinding } from "./utils.mjs";
+import { wrapFunctionalRenderer, createVModelBinding } from "./utils.mjs";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "QdConfigRenderer"
@@ -10,8 +10,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   props: {
     config: {},
     context: {},
-    syncVModelContext: {},
-    onVModelUpdate: {},
     fnInjectCtx: { type: Boolean },
     crudMode: {}
   },
@@ -20,7 +18,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     let initialized = false;
-    const pendingDefaultEmits = [];
     const currentContext = computed(() => props.config.context || props.context || {});
     const reIfRender = computed(() => {
       const ifRender = props.config.ifRender;
@@ -62,23 +59,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const propName = key.slice(6);
           const defaultKey = "default" + (key === "vModel" ? "ModelValue" : propName.charAt(0).toUpperCase() + key.slice(7));
           const defaultValue = config[defaultKey];
-          const wasEmpty = getValueByPath(currentContext.value, value) === void 0;
           const vModelBinding = createVModelBinding(
             currentContext.value,
             value,
             initialized ? void 0 : defaultValue
           );
-          const syncVModelBinding = props.syncVModelContext ? createVModelBinding(props.syncVModelContext, value) : void 0;
-          const updateModelValue = vModelBinding["onUpdate:modelValue"];
-          vModelBinding["onUpdate:modelValue"] = (modelValue) => {
-            updateModelValue?.(modelValue);
-            syncVModelBinding?.["onUpdate:modelValue"]?.(modelValue);
-            props.onVModelUpdate?.(key, modelValue);
-          };
-          const update = vModelBinding["onUpdate:modelValue"];
-          if (!initialized && key === "vModel" && defaultValue !== void 0 && wasEmpty && update) {
-            pendingDefaultEmits.push(() => update(defaultValue));
-          }
           if (key === "vModel") {
             componentProps2.modelValue = vModelBinding.modelValue;
             componentProps2["onUpdate:modelValue"] = vModelBinding["onUpdate:modelValue"];
@@ -134,9 +119,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       },
       { immediate: true }
     );
-    onMounted(() => {
-      while (pendingDefaultEmits.length) pendingDefaultEmits.shift()?.();
-    });
     return (_ctx, _cache) => {
       return reIfRender.value !== false ? (openBlock(), createBlock(resolveDynamicComponent(resolvedComponent.value), mergeProps({
         key: 0,

package/dist/components/config-renderer/types.d.ts

@@ -36,7 +36,5 @@ export interface QdComponentConfig {
 export interface QdConfigRendererProps extends Pick<QdFormProps, 'crudMode'> {
     config: QdComponentConfig;
     context?: Record<string, unknown>;
-    syncVModelContext?: Record<string, unknown>;
-    onVModelUpdate?: (key: string, value: unknown) => void;
     fnInjectCtx?: boolean;
 }

package/dist/components/config-renderer/utils.mjs

@@ -40,13 +40,7 @@ function resolveVModelBinding(context, vModel, defaultValue) {
   }
   return bindings;
 }
-const RENDERER_INTERNAL_KEYS = /* @__PURE__ */ new Set([
-  "context",
-  "config",
-  "crudMode",
-  "syncVModelContext",
-  "fnInjectCtx"
-]);
+const RENDERER_INTERNAL_KEYS = /* @__PURE__ */ new Set(["context", "config", "crudMode", "fnInjectCtx"]);
 function wrapFunctionalRenderer(fn) {
   return defineComponent({
     name: "QdFunctionalRenderer",

package/dist/components/service/table/edit-cell.d.ts

@@ -12,6 +12,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<TableRowValue>;
         required: true;
     };
+    colKey: {
+        type: StringConstructor;
+        required: true;
+    };
     formItem: {
         type: PropType<QdServiceTableFormItem>;
         required: true;
@@ -35,7 +39,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<TableEditableCellPropsParams<TableRowData>["updateEditedCellValue"]>;
         required: true;
     };
-    syncVModelContext: {
+    sourceRow: {
         type: PropType<TableRowData>;
         default: undefined;
     };
@@ -48,6 +52,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<TableRowValue>;
         required: true;
     };
+    colKey: {
+        type: StringConstructor;
+        required: true;
+    };
     formItem: {
         type: PropType<QdServiceTableFormItem>;
         required: true;
@@ -71,13 +79,13 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<TableEditableCellPropsParams<TableRowData>["updateEditedCellValue"]>;
         required: true;
     };
-    syncVModelContext: {
+    sourceRow: {
         type: PropType<TableRowData>;
         default: undefined;
     };
 }>> & Readonly<{}>, {
     lazy: boolean;
-    syncVModelContext: TableRowData;
     active: boolean;
+    sourceRow: TableRowData;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/components/service/table/edit-cell.mjs

@@ -5,7 +5,68 @@ import { qdUseComputeValue } from "../../config-renderer/compute.mjs";
 import { resolveQdFormItemOptions } from "../../form/utils.mjs";
 import { PROVIDE_FORM_ADD_BEFORE_SUBMIT_QUEUE } from "../../form/config.mjs";
 import _sfc_main from "../../config-renderer/index.vue.mjs";
-import assign from "../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/assign.mjs";
+import unset from "../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/unset.mjs";
+import set from "../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/set.mjs";
+function isProxyable(value) {
+  if (!value || typeof value !== "object") return false;
+  if (Array.isArray(value)) return true;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+function createRowEditContext(sourceRow, getEditedRow, colKey, updateEditedCellValue, onChange) {
+  const proxies = /* @__PURE__ */ new WeakMap();
+  function syncValue(path, value) {
+    const editedRow = getEditedRow();
+    if (editedRow !== sourceRow) set(editedRow, path, value);
+    updateEditedCellValue({
+      isUpdateCurrentRow: true,
+      [path]: value
+    });
+    if (path === colKey) {
+      updateEditedCellValue(value);
+      queueMicrotask(() => {
+        onChange?.(value);
+        set(sourceRow, path, value);
+        if (editedRow !== sourceRow) set(editedRow, path, value);
+      });
+    }
+  }
+  function wrap(target, parentPath = "") {
+    const cachedByPath = proxies.get(target) ?? /* @__PURE__ */ new Map();
+    const cached = cachedByPath.get(parentPath);
+    if (cached) return cached;
+    const proxy = new Proxy(target, {
+      get(currentTarget, key, receiver) {
+        const value = Reflect.get(currentTarget, key, receiver);
+        if (typeof key !== "string" || !isProxyable(value)) return value;
+        return wrap(value, parentPath ? `${parentPath}.${key}` : key);
+      },
+      set(currentTarget, key, value, receiver) {
+        const result = Reflect.set(currentTarget, key, value, receiver);
+        if (!result || typeof key !== "string") return result;
+        syncValue(parentPath ? `${parentPath}.${key}` : key, value);
+        return result;
+      },
+      deleteProperty(currentTarget, key) {
+        const result = Reflect.deleteProperty(currentTarget, key);
+        if (!result || typeof key !== "string") return result;
+        const path = parentPath ? `${parentPath}.${key}` : key;
+        const editedRow = getEditedRow();
+        if (editedRow !== sourceRow) unset(editedRow, path);
+        updateEditedCellValue({
+          isUpdateCurrentRow: true,
+          [path]: void 0
+        });
+        if (path === colKey) updateEditedCellValue(void 0);
+        return result;
+      }
+    });
+    cachedByPath.set(parentPath, proxy);
+    proxies.set(target, cachedByPath);
+    return proxy;
+  }
+  return wrap(sourceRow);
+}
 const QdServiceTableEditCell = /* @__PURE__ */ defineComponent({
   name: "QdServiceTableEditCell",
   inheritAttrs: false,
@@ -18,6 +79,10 @@ const QdServiceTableEditCell = /* @__PURE__ */ defineComponent({
       type: [String, Number],
       required: true
     },
+    colKey: {
+      type: String,
+      required: true
+    },
     formItem: {
       type: Object,
       required: true
@@ -41,7 +106,7 @@ const QdServiceTableEditCell = /* @__PURE__ */ defineComponent({
       type: Function,
       required: true
     },
-    syncVModelContext: {
+    sourceRow: {
       type: Object,
       default: void 0
     }
@@ -49,7 +114,9 @@ const QdServiceTableEditCell = /* @__PURE__ */ defineComponent({
   setup(props, {
     attrs
   }) {
-    const currentContext = computed(() => props.syncVModelContext ?? props.row);
+    const currentContext = computed(() => createRowEditContext(props.sourceRow ?? props.row, () => props.row, props.colKey, props.updateEditedCellValue, (value) => {
+      if (typeof attrs.onChange === "function") attrs.onChange(value);
+    }));
     const {
       t
     } = useConfig("form");
@@ -67,7 +134,7 @@ const QdServiceTableEditCell = /* @__PURE__ */ defineComponent({
     const component = computed(() => {
       const resolved = resolveQdFormItemOptions({
         formItem: props.formItem,
-        context: props.row,
+        context: currentContext.value,
         label: props.label,
         t
       }).component;
@@ -98,42 +165,12 @@ const QdServiceTableEditCell = /* @__PURE__ */ defineComponent({
       delete rendererAttrs.value;
       delete rendererAttrs.status;
       delete rendererAttrs.tips;
-      const hasSecondaryVModel = Object.keys(component.value).some((key) => key !== "vModel" && key.startsWith("vModel"));
-      if (typeof rendererAttrs.onChange === "function") {
-        const onChange = rendererAttrs.onChange;
-        delete rendererAttrs.onChange;
-        const prevUpdate = rendererAttrs["onUpdate:modelValue"];
-        rendererAttrs.onVModelUpdate = (key, value) => {
-          if (key === "vModel") {
-            if (props.syncVModelContext && props.row !== props.syncVModelContext) {
-              assign(props.row, props.syncVModelContext);
-            }
-            if (typeof prevUpdate === "function") prevUpdate(value);
-            onChange(value);
-            return;
-          }
-          if (!hasSecondaryVModel) return;
-          const path = component.value[key];
-          if (typeof path !== "string") return;
-          props.updateEditedCellValue({
-            isUpdateCurrentRow: true,
-            [path]: value
-          });
-        };
-        rendererAttrs["onUpdate:modelValue"] = (value) => {
-          if (props.syncVModelContext && props.row !== props.syncVModelContext) {
-            assign(props.row, props.syncVModelContext);
-          }
-          if (typeof prevUpdate === "function") prevUpdate(value);
-          onChange(value);
-        };
-      }
+      delete rendererAttrs.onChange;
       return h(_sfc_main, {
         ...rendererAttrs,
-        syncVModelContext: props.syncVModelContext,
         class: "qd-service-table__cell-editor",
         config: component.value,
-        context: props.syncVModelContext ?? props.row,
+        context: currentContext.value,
         crudMode: props.formItem.crudMode,
         onFocusin: props.activate
       });

package/dist/components/service/table/index.css

@@ -1,43 +1,46 @@
-.qd-service-table[data-v-9ca50353] {
+.qd-service-table[data-v-c56c6716] {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
-.qd-service-table[data-v-9ca50353] >  .t-table__content {
+.qd-service-table[data-v-c56c6716] >  .t-table__content {
   flex: 1;
 }
-.qd-service-table[data-v-9ca50353] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
+.qd-service-table[data-v-c56c6716] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
   margin-left: calc(var(--td-font-size-body-large) + var(--td-comp-margin-s));
 }
-.qd-service-table[data-v-9ca50353] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
+.qd-service-table[data-v-c56c6716] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
   width: calc(var(--td-font-size-body-large) + var(--td-comp-margin-s));
 }
-.qd-service-table[data-v-9ca50353] .t-affix > .t-table__affixed-header-elm-wrap,
-.qd-service-table[data-v-9ca50353] .t-affix > .t-table__scrollbar--obvious {
-  transform: var(--v6934d2c5);
+.qd-service-table[data-v-c56c6716] .t-affix > .t-table__affixed-header-elm-wrap,
+.qd-service-table[data-v-c56c6716] .t-affix > .t-table__scrollbar--obvious {
+  transform: var(--v05eb2f2a);
 }
-.qd-service-table--horizontal-bar-static[data-v-9ca50353] .t-table__scrollbar--obvious {
+.qd-service-table--horizontal-bar-static[data-v-c56c6716] .t-table__scrollbar--obvious {
   visibility: hidden;
   pointer-events: none;
 }
-.qd-service-table[data-v-9ca50353] .t-table__affixed-header-elm-wrap {
+.qd-service-table[data-v-c56c6716] .t-table__affixed-header-elm-wrap {
   height: auto !important;
 }
-.qd-service-table[data-v-9ca50353] .t-table__affixed-header-elm {
+.qd-service-table[data-v-c56c6716] .t-table__affixed-header-elm {
   position: relative;
   scrollbar-width: none;
 }
-.qd-service-table[data-v-9ca50353] .t-table__affixed-header-elm::-webkit-scrollbar {
+.qd-service-table[data-v-c56c6716] .t-table__affixed-header-elm::-webkit-scrollbar {
   display: none;
   width: 0;
   height: 0;
 }
-.qd-service-table[data-v-9ca50353] .t-table__virtual-scroll-cursor + table {
+.qd-service-table[data-v-c56c6716] .t-table__virtual-scroll-cursor + table {
   border-collapse: separate;
 }
-.qd-service-table[data-v-9ca50353] .t-table__cell-wrap > *:not(.t-switch):not(.t-tag):not(.t-icon):not(.qd-file-icon) {
+.qd-service-table[data-v-c56c6716] .t-table__cell-wrap > *:not(.t-switch):not(.t-tag):not(.t-icon):not(.qd-file-icon) {
   width: 100%;
 }
-.qd-service-table--disable-horizontal-scroll[data-v-9ca50353] colgroup > col {
+.qd-service-table[data-v-c56c6716] .qd-service-table__non-editable-col {
+  background-color: color-mix(in srgb, var(--td-bg-color-secondarycontainer) 50%, transparent);
+}
+.qd-service-table--disable-horizontal-scroll[data-v-c56c6716] colgroup > col {
   width: auto !important;
 }

package/dist/components/service/table/index.vue.mjs

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
-const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9ca50353"]]);
+const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c56c6716"]]);
 export {
   QdServiceTable as default
 };

package/dist/components/service/table/index.vue2.mjs

@@ -318,7 +318,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     emit: __emit
   }) {
     useCssVars((_ctx) => ({
-      "v6934d2c5": affixedHeaderTransform.value
+      "v05eb2f2a": affixedHeaderTransform.value
     }));
     const props = __props;
     const emit = __emit;
@@ -934,9 +934,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const formItem = column.formItem;
       if (!formItem) return false;
       if (formItem.lazy !== void 0) return formItem.lazy;
-      if (getQdFormComponentName(formItem.component).includes("upload")) return false;
+      if (/upload|switch|radio|checkbox/.test(getQdFormComponentName(formItem.component))) {
+        return false;
+      }
       return props.lazyForm;
     }
+    function resolveFormItemIfRender(column, row) {
+      const formItem = column.formItem;
+      const ifRender = formItem?.ifRender;
+      if (!formItem || isEmpty(ifRender)) return true;
+      if (typeof ifRender === "function" && ifRender.__qdCompute) {
+        return ifRender(row, formItem.crudMode);
+      }
+      return ifRender !== false;
+    }
     function resolveFormItemVirtualRender(column) {
       const formItem = column.formItem;
       if (!formItem) return false;
@@ -1437,7 +1448,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             children: wrapFormItemColumns(children)
           } : {}
         };
-        if (!formItem) return reColumn;
+        const columnClassName = reColumn.className === void 0 ? [] : Array.isArray(reColumn.className) ? reColumn.className : [reColumn.className];
+        if (!formItem) {
+          if (!children && formItemColumns.value.length) {
+            reColumn.className = [...columnClassName, (context) => context.type === "td" ? "qd-service-table__non-editable-col" : ""];
+          }
+          return reColumn;
+        }
         const columnAttrs = column.attrs;
         reColumn.attrs = (context) => {
           const attrs = typeof columnAttrs === "function" ? columnAttrs(context) : columnAttrs;
@@ -1454,7 +1471,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }
           };
         };
-        reColumn.className = reColumn.className === void 0 ? "qd-service-table__form-item-col" : [reColumn.className, "qd-service-table__form-item-col"];
+        reColumn.className = [...columnClassName, "qd-service-table__form-item-col", (context) => context.type === "td" && !resolveFormItemIfRender(column, context.row) ? "qd-service-table__non-editable-col" : ""];
         const generatedEdit = {
           component: QdServiceTableEditCell,
           showEditIcon: false,
@@ -1476,9 +1493,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             return {
               row,
               rowValue,
+              colKey: String(colKey),
               formItem,
               label: column.title,
-              syncVModelContext: data.value.find((item) => getRowValue(item) === rowValue) ?? row,
+              sourceRow: props.data?.find((item) => getRowValue(item) === rowValue) ?? data.value.find((item) => getRowValue(item) === rowValue) ?? row,
               updateEditedCellValue: context.updateEditedCellValue,
               lazy: resolveFormItemLazy(column),
               active: !!activeEditingCell.value && isSameEditingCell(activeEditingCell.value, {

package/dist/node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseSlice.mjs

@@ -0,0 +1,20 @@
+function baseSlice(array, start, end) {
+  var index = -1, length = array.length;
+  if (start < 0) {
+    start = -start > length ? 0 : length + start;
+  }
+  end = end > length ? length : end;
+  if (end < 0) {
+    end += length;
+  }
+  length = start > end ? 0 : end - start >>> 0;
+  start >>>= 0;
+  var result = Array(length);
+  while (++index < length) {
+    result[index] = array[index + start];
+  }
+  return result;
+}
+export {
+  baseSlice as default
+};

package/dist/node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseUnset.mjs

@@ -0,0 +1,12 @@
+import castPath from "./_castPath.mjs";
+import last from "./last.mjs";
+import parent from "./_parent.mjs";
+import toKey from "./_toKey.mjs";
+function baseUnset(object, path) {
+  path = castPath(path, object);
+  object = parent(object, path);
+  return object == null || delete object[toKey(last(path))];
+}
+export {
+  baseUnset as default
+};

package/dist/node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_parent.mjs

@@ -0,0 +1,8 @@
+import baseGet from "./_baseGet.mjs";
+import baseSlice from "./_baseSlice.mjs";
+function parent(object, path) {
+  return path.length < 2 ? object : baseGet(object, baseSlice(path, 0, -1));
+}
+export {
+  parent as default
+};

package/dist/node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/last.mjs

@@ -0,0 +1,7 @@
+function last(array) {
+  var length = array == null ? 0 : array.length;
+  return length ? array[length - 1] : void 0;
+}
+export {
+  last as default
+};

package/dist/node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/unset.mjs

@@ -0,0 +1,7 @@
+import baseUnset from "./_baseUnset.mjs";
+function unset(object, path) {
+  return object == null ? true : baseUnset(object, path);
+}
+export {
+  unset as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qidian-vue-ui",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "description": "基于 TDesign 的 QiDian Vue UI 组件库",
   "author": "qidian",
   "license": "MIT",

package/dist/node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/assign.mjs

@@ -1,22 +0,0 @@
-import assignValue from "./_assignValue.mjs";
-import copyObject from "./_copyObject.mjs";
-import createAssigner from "./_createAssigner.mjs";
-import isArrayLike from "./isArrayLike.mjs";
-import isPrototype from "./_isPrototype.mjs";
-import keys from "./keys.mjs";
-var objectProto = Object.prototype;
-var hasOwnProperty = objectProto.hasOwnProperty;
-var assign = createAssigner(function(object, source) {
-  if (isPrototype(source) || isArrayLike(source)) {
-    copyObject(source, keys(source), object);
-    return;
-  }
-  for (var key in source) {
-    if (hasOwnProperty.call(source, key)) {
-      assignValue(object, key, source[key]);
-    }
-  }
-});
-export {
-  assign as default
-};