@gm-pc/business 1.24.7 → 1.24.9-beat.2

package/README.md

@@ -1,3 +1,3 @@
-
-
-DataXXXX 代表有数据的组件，约定 Data 有 onReady(data) 回调
+
+
+DataXXXX 代表有数据的组件，约定 Data 有 onReady(data) 回调

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/business",
-  "version": "1.24.7",
+  "version": "1.24.9-beat.2",
   "description": "观麦科技业务组件库",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -28,8 +28,8 @@
   "dependencies": {
     "@gm-common/hooks": "^2.10.0",
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/react": "^1.24.7",
-    "@gm-pc/table-x": "^1.24.7"
+    "@gm-pc/react": "^1.24.9-beat.2",
+    "@gm-pc/table-x": "^1.24.9-beat.2"
   },
-  "gitHead": "3bada70ae395c8d15bca5579f0ecdbed0bb4b6f8"
+  "gitHead": "307cc3b7b644f03b6591a9ead7408dbb43f37359"
 }

package/src/code_input/code_input.tsx

@@ -1,38 +1,38 @@
-import React, { ChangeEvent, useEffect, forwardRef, useRef } from 'react'
-import { Input, InputProps } from '@gm-pc/react'
-
-import { getCustomizedCode } from './util'
-
-interface CodeInputProps extends Omit<InputProps, 'onChange'> {
-  text?: string
-  onChange?(value: string): void
-  /** 是否需要随text变化 */
-  needTextChange?: boolean
-}
-
-// 一旦本身输入修改，就不再根据外层变动
-const CodeInput = forwardRef<HTMLInputElement, CodeInputProps>(
-  ({ text, onChange, needTextChange = true, ...rest }, ref) => {
-    // 记录当前自身是否编辑
-    const changed = useRef<boolean>(false)
-    const random = useRef<number>(Math.floor(Math.random() * 10000))
-
-    useEffect(() => {
-      if (!changed.current && needTextChange) {
-        const new_value: string = getCustomizedCode(text || '').trim()
-        const code: string = new_value ? `${new_value}${random.current}` : new_value
-        onChange && onChange(code)
-      }
-    }, [text, needTextChange])
-
-    const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
-      changed.current = true
-      onChange && onChange(e.target.value)
-    }
-
-    return <Input {...rest} ref={ref} onChange={handleChange} />
-  }
-)
-
-export default CodeInput
-export type { CodeInputProps }
+import React, { ChangeEvent, useEffect, forwardRef, useRef } from 'react'
+import { Input, InputProps } from '@gm-pc/react'
+
+import { getCustomizedCode } from './util'
+
+interface CodeInputProps extends Omit<InputProps, 'onChange'> {
+  text?: string
+  onChange?(value: string): void
+  /** 是否需要随text变化 */
+  needTextChange?: boolean
+}
+
+// 一旦本身输入修改，就不再根据外层变动
+const CodeInput = forwardRef<HTMLInputElement, CodeInputProps>(
+  ({ text, onChange, needTextChange = true, ...rest }, ref) => {
+    // 记录当前自身是否编辑
+    const changed = useRef<boolean>(false)
+    const random = useRef<number>(Math.floor(Math.random() * 10000))
+
+    useEffect(() => {
+      if (!changed.current && needTextChange) {
+        const new_value: string = getCustomizedCode(text || '').trim()
+        const code: string = new_value ? `${new_value}${random.current}` : new_value
+        onChange && onChange(code)
+      }
+    }, [text, needTextChange])
+
+    const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
+      changed.current = true
+      onChange && onChange(e.target.value)
+    }
+
+    return <Input {...rest} ref={ref} onChange={handleChange} />
+  }
+)
+
+export default CodeInput
+export type { CodeInputProps }

package/src/code_input/index.ts

@@ -1,2 +1,2 @@
-export { default as CodeInput } from './code_input'
-export type { CodeInputProps } from './code_input'
+export { default as CodeInput } from './code_input'
+export type { CodeInputProps } from './code_input'

package/src/code_input/stories.tsx

@@ -1,66 +1,66 @@
-import React, { ChangeEvent } from 'react'
-import { observable } from 'mobx'
-import { Input } from '@gm-pc/react'
-
-import CodeInput from './code_input'
-
-const store = observable({
-  value: '',
-  code: '',
-  code_value: '111',
-  setValue(v: string) {
-    this.value = v
-  },
-  setCode(v: string) {
-    this.code = v
-  },
-  setCodeValue(v: string) {
-    this.code_value = v
-  },
-})
-
-export const ComCodeInput = () => {
-  const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
-    store.setValue(e.target.value)
-  }
-
-  const handleCodeChange = (value: string) => {
-    store.setCode(value)
-  }
-
-  const handleCodeValueChange = (value: string) => {
-    store.setCodeValue(value)
-  }
-
-  return (
-    <>
-      <div>编码为空</div>
-      <div>
-        名称：
-        <Input value={store.value} onChange={handleChange} />
-      </div>
-      <div>
-        编码：
-        <CodeInput value={store.code} text={store.value} onChange={handleCodeChange} />
-      </div>
-      <div className='gm-margin-top-20'>编码不为空</div>
-      <div>
-        名称：
-        <Input value={store.value} onChange={handleChange} />
-      </div>
-      <div>
-        编码：
-        <CodeInput
-          needTextChange={false}
-          value={store.code_value}
-          text={store.value}
-          onChange={handleCodeValueChange}
-        />
-      </div>
-    </>
-  )
-}
-
-export default {
-  title: 'Business/CodeInput',
-}
+import React, { ChangeEvent } from 'react'
+import { observable } from 'mobx'
+import { Input } from '@gm-pc/react'
+
+import CodeInput from './code_input'
+
+const store = observable({
+  value: '',
+  code: '',
+  code_value: '111',
+  setValue(v: string) {
+    this.value = v
+  },
+  setCode(v: string) {
+    this.code = v
+  },
+  setCodeValue(v: string) {
+    this.code_value = v
+  },
+})
+
+export const ComCodeInput = () => {
+  const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
+    store.setValue(e.target.value)
+  }
+
+  const handleCodeChange = (value: string) => {
+    store.setCode(value)
+  }
+
+  const handleCodeValueChange = (value: string) => {
+    store.setCodeValue(value)
+  }
+
+  return (
+    <>
+      <div>编码为空</div>
+      <div>
+        名称：
+        <Input value={store.value} onChange={handleChange} />
+      </div>
+      <div>
+        编码：
+        <CodeInput value={store.code} text={store.value} onChange={handleCodeChange} />
+      </div>
+      <div className='gm-margin-top-20'>编码不为空</div>
+      <div>
+        名称：
+        <Input value={store.value} onChange={handleChange} />
+      </div>
+      <div>
+        编码：
+        <CodeInput
+          needTextChange={false}
+          value={store.code_value}
+          text={store.value}
+          onChange={handleCodeValueChange}
+        />
+      </div>
+    </>
+  )
+}
+
+export default {
+  title: 'Business/CodeInput',
+}

package/src/code_input/util.ts

@@ -1,11 +1,11 @@
-import { pinyin } from '@gm-common/tool'
-import _ from 'lodash'
-
-export const getCustomizedCode = (text: string): string => {
-  if (!text) {
-    return ''
-  }
-
-  const code: string = _.map(text, (t) => pinyin(t)[0]).join('')
-  return code
-}
+import { pinyin } from '@gm-common/tool'
+import _ from 'lodash'
+
+export const getCustomizedCode = (text: string): string => {
+  if (!text) {
+    return ''
+  }
+
+  const code: string = _.map(text, (t) => pinyin(t)[0]).join('')
+  return code
+}

package/src/data_category_tree/data_category_tree.tsx

@@ -1,75 +1,75 @@
-import React, { FC, CSSProperties, ReactNode } from 'react'
-import { getCategoryTree, CategoryItem, SpuItem, SkuItem } from './util'
-import { Tree, LoadingChunk, TreeListItem } from '@gm-pc/react'
-import { useAsync } from '@gm-common/hooks'
-import classNames from 'classnames'
-import { ListSkuRequest } from 'gm_api/src/merchandise'
-
-interface DataCategoryTreeProps {
-  className?: string
-  style?: CSSProperties
-  border?: boolean
-  needSku?: boolean
-  skuParams?: Omit<ListSkuRequest, 'paging'>
-  onReady?(data?: CategoryItem[]): void
-  activeValue?: any
-  findPlaceholder?: string
-  onActiveValue?(activeValue: any, item: CategoryItem | SpuItem | SkuItem): void
-  onLeafActiveValue?(activeValue: any, item: SpuItem | SkuItem): void
-  renderLeafItem?: (data: TreeListItem) => ReactNode
-}
-
-const DataCategoryTree: FC<DataCategoryTreeProps> = ({
-  style,
-  border,
-  needSku,
-  onReady,
-  skuParams,
-  className,
-  activeValue,
-  onActiveValue,
-  findPlaceholder,
-  onLeafActiveValue,
-  renderLeafItem,
-}) => {
-  const { data, loading } = useAsync(getCategoryTree, {
-    manual: false,
-    cacheKey: 'GMGetCategoryTree',
-    defaultParams: {
-      needSku,
-      skuParams,
-    },
-    onSuccess(data) {
-      onReady && onReady(data)
-    },
-  })
-
-  const handleActiveValue = (active: any, item: CategoryItem | SpuItem | SkuItem) => {
-    onActiveValue && onActiveValue(active, item)
-    if (!('children' in item && item.children)) {
-      onLeafActiveValue && onLeafActiveValue(active, item as SpuItem | SkuItem)
-    }
-  }
-
-  return (
-    <LoadingChunk
-      loading={loading}
-      className={classNames('gmb-category-tree', className)}
-      style={style}
-    >
-      <Tree
-        list={data || []}
-        border={border}
-        activeValue={activeValue}
-        onActiveValue={handleActiveValue}
-        disabledCheckbox
-        withFilter={false}
-        findPlaceholder={findPlaceholder}
-        renderLeafItem={renderLeafItem}
-        showFind
-      />
-    </LoadingChunk>
-  )
-}
-
-export default React.memo(DataCategoryTree)
+import React, { FC, CSSProperties, ReactNode } from 'react'
+import { getCategoryTree, CategoryItem, SpuItem, SkuItem } from './util'
+import { Tree, LoadingChunk, TreeListItem } from '@gm-pc/react'
+import { useAsync } from '@gm-common/hooks'
+import classNames from 'classnames'
+import { ListSkuRequest } from 'gm_api/src/merchandise'
+
+interface DataCategoryTreeProps {
+  className?: string
+  style?: CSSProperties
+  border?: boolean
+  needSku?: boolean
+  skuParams?: Omit<ListSkuRequest, 'paging'>
+  onReady?(data?: CategoryItem[]): void
+  activeValue?: any
+  findPlaceholder?: string
+  onActiveValue?(activeValue: any, item: CategoryItem | SpuItem | SkuItem): void
+  onLeafActiveValue?(activeValue: any, item: SpuItem | SkuItem): void
+  renderLeafItem?: (data: TreeListItem) => ReactNode
+}
+
+const DataCategoryTree: FC<DataCategoryTreeProps> = ({
+  style,
+  border,
+  needSku,
+  onReady,
+  skuParams,
+  className,
+  activeValue,
+  onActiveValue,
+  findPlaceholder,
+  onLeafActiveValue,
+  renderLeafItem,
+}) => {
+  const { data, loading } = useAsync(getCategoryTree, {
+    manual: false,
+    cacheKey: 'GMGetCategoryTree',
+    defaultParams: {
+      needSku,
+      skuParams,
+    },
+    onSuccess(data) {
+      onReady && onReady(data)
+    },
+  })
+
+  const handleActiveValue = (active: any, item: CategoryItem | SpuItem | SkuItem) => {
+    onActiveValue && onActiveValue(active, item)
+    if (!('children' in item && item.children)) {
+      onLeafActiveValue && onLeafActiveValue(active, item as SpuItem | SkuItem)
+    }
+  }
+
+  return (
+    <LoadingChunk
+      loading={loading}
+      className={classNames('gmb-category-tree', className)}
+      style={style}
+    >
+      <Tree
+        list={data || []}
+        border={border}
+        activeValue={activeValue}
+        onActiveValue={handleActiveValue}
+        disabledCheckbox
+        withFilter={false}
+        findPlaceholder={findPlaceholder}
+        renderLeafItem={renderLeafItem}
+        showFind
+      />
+    </LoadingChunk>
+  )
+}
+
+export default React.memo(DataCategoryTree)

package/src/data_category_tree/index.ts

@@ -1 +1 @@
-export { default as DataCategoryTree } from './data_category_tree'
+export { default as DataCategoryTree } from './data_category_tree'

package/src/data_category_tree/stories.tsx

@@ -1,46 +1,46 @@
-import React from 'react'
-import { DataCategoryTree } from './index'
-
-export const ComDataCategoryTree = () => {
-  return (
-    <DataCategoryTree
-      style={{ width: '250px', height: '500px', padding: '10px' }}
-      onReady={(data) => {
-        console.log(data)
-      }}
-      onActiveValue={(value, item) => {
-        console.log(value, item)
-      }}
-      onLeafActiveValue={(value, item) => {
-        console.log(value, item)
-      }}
-    />
-  )
-}
-
-export const ComDataCategoryTreeNeedSku = () => {
-  return (
-    <div style={{ width: '250px', padding: '10px' }}>
-      <DataCategoryTree
-        border={false}
-        needSku
-        style={{ height: '500px' }}
-        onReady={(data) => {
-          console.log(data)
-        }}
-        onActiveValue={(value, item) => {
-          console.log(value, item)
-        }}
-        onLeafActiveValue={(value, item) => {
-          console.log('onLeafActiveValue', value, item)
-        }}
-        findPlaceholder='输入sku名称'
-        skuParams={{ process: 1, sku_type: 2 }}
-      />
-    </div>
-  )
-}
-
-export default {
-  title: 'Business/DataCategoryTree',
-}
+import React from 'react'
+import { DataCategoryTree } from './index'
+
+export const ComDataCategoryTree = () => {
+  return (
+    <DataCategoryTree
+      style={{ width: '250px', height: '500px', padding: '10px' }}
+      onReady={(data) => {
+        console.log(data)
+      }}
+      onActiveValue={(value, item) => {
+        console.log(value, item)
+      }}
+      onLeafActiveValue={(value, item) => {
+        console.log(value, item)
+      }}
+    />
+  )
+}
+
+export const ComDataCategoryTreeNeedSku = () => {
+  return (
+    <div style={{ width: '250px', padding: '10px' }}>
+      <DataCategoryTree
+        border={false}
+        needSku
+        style={{ height: '500px' }}
+        onReady={(data) => {
+          console.log(data)
+        }}
+        onActiveValue={(value, item) => {
+          console.log(value, item)
+        }}
+        onLeafActiveValue={(value, item) => {
+          console.log('onLeafActiveValue', value, item)
+        }}
+        findPlaceholder='输入sku名称'
+        skuParams={{ process: 1, sku_type: 2 }}
+      />
+    </div>
+  )
+}
+
+export default {
+  title: 'Business/DataCategoryTree',
+}