@nocobase/client-v2 2.2.9 → 2.2.10

package/src/components/form/ScanInput/zxingWasmDecoder.ts

@@ -0,0 +1,64 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+let decoderPromise: Promise<typeof import('zxing-wasm/reader')> | undefined;
+
+async function loadDecoder() {
+  if (!decoderPromise) {
+    decoderPromise = Promise.all([import('zxing-wasm/reader'), import('zxing-wasm/reader/zxing_reader.wasm')])
+      .then(async ([decoder, { default: wasmUrl }]) => {
+        try {
+          await decoder.prepareZXingModule({
+            fireImmediately: true,
+            overrides: { locateFile: () => wasmUrl },
+          });
+        } catch (error) {
+          decoder.purgeZXingModule();
+          throw error;
+        }
+        return decoder;
+      })
+      .catch((error: unknown) => {
+        decoderPromise = undefined;
+        throw error;
+      });
+  }
+  return decoderPromise;
+}
+
+export async function decodeQrCodeWithZxingWasm(imageData: ImageData) {
+  const decoder = await loadDecoder();
+  const results = await decoder.readBarcodes(imageData, {
+    binarizer: 'GlobalHistogram',
+    downscaleThreshold: 300,
+    formats: ['QRCode'],
+    maxNumberOfSymbols: 1,
+    tryDenoise: true,
+    tryDownscale: true,
+    tryHarder: true,
+    tryInvert: true,
+    tryRotate: true,
+  });
+  if (results[0]?.text) {
+    return results[0].text;
+  }
+
+  const fallbackResults = await decoder.readBarcodes(imageData, {
+    binarizer: 'LocalAverage',
+    downscaleThreshold: 300,
+    formats: ['QRCode'],
+    maxNumberOfSymbols: 1,
+    tryDenoise: true,
+    tryDownscale: true,
+    tryHarder: true,
+    tryInvert: true,
+    tryRotate: true,
+  });
+  return fallbackResults[0]?.text;
+}

package/src/flow/components/FieldAssignValueInput.tsx

@@ -71,6 +71,8 @@ interface Props {
   enableDateVariableAsConstant?: boolean;
   /** 是否允许在变量选择器中使用 RunJS。默认 true，保持历史行为。 */
   allowRunJS?: boolean;
+  /** 是否允许在变量选择器中使用内置日期变量。默认 true。 */
+  allowDateVariables?: boolean;
   maxAssociationFieldDepth?: number;
   disabled?: boolean;
   variableConverters?: VariableInputProps['converters'];
@@ -444,6 +446,7 @@ export const FieldAssignValueInput: React.FC<Props> = ({
   preferFormItemFieldModel,
   associationFieldNamesOverride,
   allowRunJS = true,
+  allowDateVariables = true,
   maxAssociationFieldDepth = 2,
   disabled = false,
   variableConverters,
@@ -972,6 +975,7 @@ export const FieldAssignValueInput: React.FC<Props> = ({
       style={{ width: '100%' }}
       clearValue={''}
       allowRunJS={allowRunJS}
+      allowDateVariables={allowDateVariables}
       disabled={disabled}
       converters={variableConverters}
     />

package/src/flow/components/field-value-variable/FieldValueVariableInput.tsx

@@ -71,6 +71,7 @@ export type FieldValueVariableInputProps = Omit<
   isDateLikeField: boolean;
   dateComponentProps: DateVariableComponentProps;
   allowRunJS?: boolean;
+  allowDateVariables?: boolean;
   converters?: VariableInputProps['converters'];
 };
 
@@ -149,6 +150,7 @@ export const FieldValueVariableInput: React.FC<FieldValueVariableInputProps> = (
   isDateLikeField,
   dateComponentProps,
   allowRunJS = true,
+  allowDateVariables = true,
   converters,
   clearValue = '',
   disabled = false,
@@ -168,7 +170,7 @@ export const FieldValueVariableInput: React.FC<FieldValueVariableInputProps> = (
     return Component;
   }, [dateComponentProps, isDateLikeField]);
 
-  const parsedDateConfig = parseCtxDateExpressionConfig(value);
+  const parsedDateConfig = allowDateVariables ? parseCtxDateExpressionConfig(value) : undefined;
   const restoreLegacyNowForPureDate =
     dateComponentProps.exactNormalizeMode === 'date' &&
     parsedDateConfig?.kind === 'preset' &&
@@ -230,14 +232,18 @@ export const FieldValueVariableInput: React.FC<FieldValueVariableInputProps> = (
           paths: ['null'],
           render: (props) => <NullComponent {...props} />,
         },
-        {
-          title: tExpr('Date'),
-          name: 'date',
-          type: 'date',
-          paths: ['date'],
-          selectable: false,
-          children: dateChildren,
-        },
+        ...(allowDateVariables
+          ? [
+              {
+                title: tExpr('Date'),
+                name: 'date',
+                type: 'date',
+                paths: ['date'],
+                selectable: false,
+                children: dateChildren,
+              } satisfies MetaTreeNode,
+            ]
+          : []),
         ...(allowRunJS
           ? [
               {
@@ -257,6 +263,7 @@ export const FieldValueVariableInput: React.FC<FieldValueVariableInputProps> = (
     DateEditor,
     NullComponent,
     RunJSComponent,
+    allowDateVariables,
     allowRunJS,
     baseMetaTree,
     dateComponentProps.exactNormalizeMode,
@@ -294,7 +301,7 @@ export const FieldValueVariableInput: React.FC<FieldValueVariableInputProps> = (
           const firstPath = meta?.paths?.[0];
           if (firstPath === 'constant') return ConstantComponent;
           if (firstPath === 'null') return NullComponent;
-          if (firstPath === 'date') return DateEditor;
+          if (allowDateVariables && firstPath === 'date') return DateEditor;
           if (allowRunJS && firstPath === 'runjs') return RunJSComponent;
           return null;
         },
@@ -304,7 +311,7 @@ export const FieldValueVariableInput: React.FC<FieldValueVariableInputProps> = (
           const firstPath = item?.paths?.[0];
           if (firstPath === 'constant') return '';
           if (firstPath === 'null') return null;
-          if (firstPath === 'date') {
+          if (allowDateVariables && firstPath === 'date') {
             return createInitialDateConfig(item.paths[1], isDateLikeField, dateComponentProps);
           }
           if (allowRunJS && firstPath === 'runjs') return { code: '', version: 'v2' };
@@ -315,7 +322,9 @@ export const FieldValueVariableInput: React.FC<FieldValueVariableInputProps> = (
           if (external !== undefined) return external;
           if (currentValue === null) return ['null'];
           if (allowRunJS && isRunJSValue(currentValue)) return ['runjs'];
-          if (isDateVariableEditConfig(currentValue)) return ['date', getDateNodeName(currentValue)];
+          if (allowDateVariables && isDateVariableEditConfig(currentValue)) {
+            return ['date', getDateNodeName(currentValue)];
+          }
           return typeof currentValue === 'string' && isVariableExpression(currentValue)
             ? parseValueToPath(currentValue)
             : ['constant'];

package/src/flow/components/field-value-variable/__tests__/FieldValueVariableInput.test.tsx

@@ -50,6 +50,7 @@ function renderInput(options?: {
   value?: unknown;
   isDateLikeField?: boolean;
   dateComponentProps?: DateVariableComponentProps;
+  allowDateVariables?: boolean;
 }) {
   const onChange = vi.fn();
   render(
@@ -62,6 +63,7 @@ function renderInput(options?: {
       runJSComponent={RunJSComponent}
       isDateLikeField={options?.isDateLikeField ?? false}
       dateComponentProps={options?.dateComponentProps ?? DEFAULT_DATE_VARIABLE_COMPONENT_PROPS}
+      allowDateVariables={options?.allowDateVariables}
     />,
   );
   return onChange;
@@ -110,6 +112,13 @@ describe('FieldValueVariableInput', () => {
     expect(tree[4].name).toBe('currentUser');
   });
 
+  it('omits the built-in Date variables when they are disabled', async () => {
+    renderInput({ isDateLikeField: true, allowDateVariables: false });
+
+    const tree = await resolveMetaTree();
+    expect(tree.map((node) => node.name)).toEqual(['constant', 'null', 'runjs', 'currentUser']);
+  });
+
   it('does not allow Now for pure date fields', async () => {
     const dateComponentProps: DateVariableComponentProps = {
       ...DEFAULT_DATE_VARIABLE_COMPONENT_PROPS,