Merge branch 'develop'

king

2024-05-21 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8

 src/menu/components/table/edit-table/columns/tableIn/index.jsx

@@ -225,18 +225,18 @@
    
    let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from  s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`

    _scriptSql = Utils.formatOptions(_scriptSql)
    _scriptSql = Utils.formatOptions(_scriptSql, 'x')

    let _sParam = {
      func: 'sPC_Get_SelectedList',
      LText: _scriptSql,
      obj_name: 'data',
      arr_field: 'funcname,longparam'
      arr_field: 'funcname,longparam',
      exec_type: 'x'
    }
    
    _sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
    _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)

    _sParam.secretkey = Utils.encrypt('', _sParam.timestamp)
    _sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 云端数据验证
    
    Api.getCloudConfig(_sParam).then(res => {
@@ -566,7 +566,8 @@
                      <Select.Option value="line" disabled={config.wrap.commit !== 'change'}>刷新行</Select.Option>
                      <Select.Option value="grid">刷新组件</Select.Option>
                      <Select.Option value="line_grid" disabled={config.wrap.commit !== 'change'}>刷新行 / 组件</Select.Option>
                      <Select.Option value="mainline">上级（行）</Select.Option>
                      <Select.Option value="mainline">刷新上级组件 - 行</Select.Option>
                      <Select.Option value="maingrid">刷新上级组件</Select.Option>
                    </Select>
                  </Form.Item>
                </Col>
@@ -577,7 +578,8 @@
                      <Select.Option value="line" disabled={config.wrap.commit !== 'change'}>刷新行</Select.Option>
                      <Select.Option value="grid">刷新组件</Select.Option>
                      <Select.Option value="line_grid" disabled={config.wrap.commit !== 'change'}>刷新行 / 组件</Select.Option>
                      <Select.Option value="mainline">上级（行）</Select.Option>
                      <Select.Option value="mainline">刷新上级组件 - 行</Select.Option>
                      <Select.Option value="maingrid">刷新上级组件</Select.Option>
                    </Select>
                  </Form.Item>
                </Col>